Skip to content

Commit 2a3d6a0

Browse files
niklasvhniklasvh
committed
Merge pull request niklasvh#30 from cobexer/build-improvements
Build improvements
2 parents 74c7373 + 03495f8 commit 2a3d6a0

15 files changed

Lines changed: 105 additions & 2544 deletions

‎.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
/tests/flashcanvas.html
77
/lib/
88
/dist/
9-
/build/tmp.js
10-
/build/html2canvas.min.js
9+
/build/*.js
1110
index.html
1211
image.jpg
1312
screenshots.html
14-
screenshots_local.html
13+
screenshots_local.html

‎build.xml‎

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,75 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<project name="html2canvas" basedir=".">
2+
<project name="html2canvas" basedir="." default="build">
33
<property name="src.dir" location="src"/>
44
<property name="lib.dir" location="../lib"/>
55
<property name="build.dir" location="build"/>
66
<property name="dist" location="dist"/>
7-
8-
97
<property name="jquery-externs" value="jquery-1.4.4.externs.js"/>
10-
11-
8+
129
<property name="JS_NAME" value="html2canvas.js"/>
1310
<property name="JS_NAME_MIN" value="html2canvas.min.js"/>
1411
<property name="JQUERY_PLUGIN_NAME" value="jquery.plugin.html2canvas.js"/>
15-
12+
<loadfile property="version" srcfile="version.txt" />
1613

17-
<path id="sourcefiles">
18-
<fileset dir="${src.dir}" includes="LICENSE"/>
19-
<fileset dir="." includes="LICENSE"/>
20-
<fileset dir="${src.dir}" includes="Core.js"/>
21-
<fileset dir="${src.dir}" includes="Generate.js"/>
22-
<fileset dir="${src.dir}" includes="Parse.js"/>
23-
<fileset dir="${src.dir}" includes="Preload.js"/>
24-
<fileset dir="${src.dir}" includes="Queue.js"/>
25-
<fileset dir="${src.dir}" includes="Renderer.js"/>
14+
<fileset id="sourcefiles" dir="${src.dir}">
15+
<include name="LICENSE"/>
16+
<include name="Core.js"/>
17+
<include name="Generate.js"/>
18+
<include name="Parse.js"/>
19+
<include name="Preload.js"/>
20+
<include name="Queue.js"/>
21+
<include name="Renderer.js"/>
22+
</fileset>
2623

27-
28-
</path>
29-
3024
<path id="jquery-plugin">
3125
<fileset dir="${src.dir}" includes="LICENSE"/>
32-
<fileset dir="." includes="LICENSE"/>
3326
<fileset dir="${src.dir}/plugins" includes="${JQUERY_PLUGIN_NAME}"/>
3427
</path>
35-
36-
<path id="minified">
37-
<fileset dir="${src.dir}" includes="LICENSE"/>
38-
<fileset dir="${build.dir}" includes="tmp.js"/>
39-
</path>
40-
28+
4129
<target name="plugins">
4230
<concat fixlastline="yes" destfile="${build.dir}/${JQUERY_PLUGIN_NAME}">
4331
<path refid="jquery-plugin"/>
4432
</concat>
33+
<replaceregexp match="@VERSION@" replace="${version}" flags="g" byline="true" file="${build.dir}/${JQUERY_PLUGIN_NAME}" />
4534
</target>
46-
47-
48-
<target name="build">
35+
36+
37+
<target name="build" depends="plugins">
4938
<concat fixlastline="yes" destfile="${build.dir}/${JS_NAME}">
50-
<path refid="sourcefiles"/>
39+
<fileset refid="sourcefiles"/>
5140
</concat>
41+
<replaceregexp match="@VERSION@" replace="${version}" flags="g" byline="true" file="${build.dir}/${JS_NAME}" />
5242
</target>
53-
54-
43+
44+
5545
<taskdef name="jscomp" classname="com.google.javascript.jscomp.ant.CompileTask"
56-
classpath="${lib.dir}/compiler.jar"/>
57-
58-
<target name="release">
59-
60-
<jscomp compilationLevel="simple" warning="verbose"
61-
debug="false"
62-
output="${build.dir}/tmp.js">
46+
classpath="${lib.dir}/compiler.jar" onerror="report"/>
47+
48+
<target name="release" depends="build">
49+
<jscomp compilationLevel="simple" warning="verbose"
50+
debug="false"
51+
output="${build.dir}/${JS_NAME_MIN}">
6352
<externs dir="${lib.dir}">
64-
<file name="${jquery-externs}"/>
53+
<file name="${jquery-externs}"/>
6554
</externs>
66-
<sources dir="${build.dir}">
67-
<file name="${JS_NAME}" />
55+
<sources dir="${src.dir}">
56+
<!-- need to write them again here since the closure compiler doesn't understand filesets,... -->
57+
<file name="LICENSE"/>
58+
<file name="Core.js"/>
59+
<file name="Generate.js"/>
60+
<file name="Parse.js"/>
61+
<file name="Preload.js"/>
62+
<file name="Queue.js"/>
63+
<file name="Renderer.js"/>
6864
</sources>
6965
</jscomp>
70-
71-
<concat fixlastline="yes" destfile="${build.dir}/${JS_NAME_MIN}">
72-
<path refid="minified"/>
73-
</concat>
66+
<replaceregexp match="@VERSION@" replace="${version}" flags="g" byline="true" file="${build.dir}/${JS_NAME_MIN}" />
67+
</target>
7468

69+
<target name="clean">
70+
<delete file="${build.dir}/${JS_NAME}"></delete>
71+
<delete file="${build.dir}/${JS_NAME_MIN}"></delete>
72+
<delete file="${build.dir}/${JQUERY_PLUGIN_NAME}"></delete>
7573
</target>
7674
</project>
7775

‎build/.gitkeepdir‎

Whitespace-only changes.

0 commit comments

Comments
 (0)