Merge remote/master into gh-pages

Author: niklasvh

.gitignore

@@ -0,0 +1,13 @@
+/nbproject/
+/images/
+/external/
+/tests/templates/
+/tests/cache/
+/tests/flashcanvas.html
+/lib/
+/dist/
+/build/*.js
+index.html
+image.jpg
+screenshots.html
+screenshots_local.html

LICENSE

@@ -0,0 +1,21 @@
+/*
+  The MIT License
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+ */

build.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="html2canvas" basedir="." default="build">
+    <property name="src.dir" location="src"/>
+    <property name="lib.dir" location="../lib"/>
+    <property name="build.dir" location="build"/>
+    <property name="dist"  location="dist"/>
+    <property name="jquery-externs" value="jquery-1.4.4.externs.js"/>
+
+    <property name="JS_NAME" value="html2canvas.js"/>
+    <property name="JS_NAME_MIN" value="html2canvas.min.js"/>
+    <property name="JQUERY_PLUGIN_NAME" value="jquery.plugin.html2canvas.js"/>
+    <loadfile property="version" srcfile="version.txt" />
+
+    <fileset id="sourcefiles" dir="${src.dir}">
+        <include name="LICENSE"/>
+        <include name="Core.js"/>
+        <include name="Generate.js"/>
+        <include name="Parse.js"/>
+        <include name="Preload.js"/>
+        <include name="Queue.js"/>
+        <include name="Renderer.js"/>
+    </fileset>
+
+    <path id="jquery-plugin">
+        <fileset dir="${src.dir}" includes="LICENSE"/>
+        <fileset dir="${src.dir}/plugins" includes="${JQUERY_PLUGIN_NAME}"/>    
+    </path>
+
+    <target name="plugins">
+        <concat fixlastline="yes" destfile="${build.dir}/${JQUERY_PLUGIN_NAME}">
+            <path refid="jquery-plugin"/>
+        </concat>
+        <replaceregexp match="@VERSION@" replace="${version}" flags="g" byline="true" file="${build.dir}/${JQUERY_PLUGIN_NAME}" />
+    </target>
+
+
+    <target name="build" depends="plugins">
+        <concat fixlastline="yes" destfile="${build.dir}/${JS_NAME}">
+            <fileset refid="sourcefiles"/>
+        </concat>
+        <replaceregexp match="@VERSION@" replace="${version}" flags="g" byline="true" file="${build.dir}/${JS_NAME}" />
+    </target>
+
+
+    <taskdef name="jscomp" classname="com.google.javascript.jscomp.ant.CompileTask"
+           classpath="${lib.dir}/compiler.jar" onerror="report"/>
+
+    <target name="release" depends="build">
+        <jscomp compilationLevel="simple" warning="verbose"
+            debug="false"
+            output="${build.dir}/${JS_NAME_MIN}">
+            <externs dir="${lib.dir}">
+                 <file name="${jquery-externs}"/>
+            </externs>
+            <sources dir="${src.dir}">
+                <!-- need to write them again here since the closure compiler doesn't understand filesets,... -->
+                <file name="LICENSE"/>
+                <file name="Core.js"/>
+                <file name="Generate.js"/>
+                <file name="Parse.js"/>
+                <file name="Preload.js"/>
+                <file name="Queue.js"/>
+                <file name="Renderer.js"/>
+            </sources>
+        </jscomp>
+        <replaceregexp match="@VERSION@" replace="${version}" flags="g" byline="true" file="${build.dir}/${JS_NAME_MIN}" />
+    </target>
+
+    <target name="clean">
+        <delete file="${build.dir}/${JS_NAME}"></delete>
+        <delete file="${build.dir}/${JS_NAME_MIN}"></delete>
+        <delete file="${build.dir}/${JQUERY_PLUGIN_NAME}"></delete>
+    </target>
+</project>
+