From 16c74d1f8c155721d2eb30a6486ddef4874b529e Mon Sep 17 00:00:00 2001
From: Obexer Christoph <cobexer@gmail.com>
Date: Wed, 16 Nov 2011 00:25:02 +0100
Subject: [PATCH] Improve build system: read version from version.txt, fix
 build without compiler

 * read the version from version.txt
 * set default target to build
 * added dependencies to all targets
 * allow the build to run without a local copy of the closure compiler
 * updated license header with @VERSION@ which will be replaced during the build
 * added the license header to all files (that one will be stripped out by the closure compiler)
---
 .gitignore        |  5 ++-
 build.xml         | 88 +++++++++++++++++++++++------------------------
 build/.gitkeepdir |  0
 src/Core.js       | 10 +++++-
 src/Generate.js   |  8 +++++
 src/LICENSE       | 10 +++---
 src/Parse.js      |  8 +++++
 src/Preload.js    |  8 +++++
 src/Queue.js      |  7 ++++
 src/Renderer.js   |  7 ++++
 src/Util.js       |  7 ++++
 version.txt       |  1 +
 12 files changed, 105 insertions(+), 54 deletions(-)
 create mode 100644 build/.gitkeepdir
 create mode 100644 version.txt

diff --git a/.gitignore b/.gitignore
index cd8e7e4..809195d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,8 @@
 /tests/flashcanvas.html
 /lib/
 /dist/
-/build/tmp.js
-/build/html2canvas.min.js
+/build/*.js
 index.html
 image.jpg
 screenshots.html
-screenshots_local.html
\ No newline at end of file
+screenshots_local.html
diff --git a/build.xml b/build.xml
index af799cd..742b709 100644
--- a/build.xml
+++ b/build.xml
@@ -1,77 +1,75 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="html2canvas" basedir=".">
+<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" />
 
-    <path id="sourcefiles">
-        <fileset dir="${src.dir}" includes="LICENSE"/>
-        <fileset dir="." includes="LICENSE"/>
-        <fileset dir="${src.dir}" includes="Core.js"/>  
-        <fileset dir="${src.dir}" includes="Generate.js"/>
-        <fileset dir="${src.dir}" includes="Parse.js"/>
-        <fileset dir="${src.dir}" includes="Preload.js"/>
-        <fileset dir="${src.dir}" includes="Queue.js"/>
-        <fileset dir="${src.dir}" includes="Renderer.js"/>    
+    <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>
-    
     <path id="jquery-plugin">
         <fileset dir="${src.dir}" includes="LICENSE"/>
-        <fileset dir="." includes="LICENSE"/>
         <fileset dir="${src.dir}/plugins" includes="${JQUERY_PLUGIN_NAME}"/>    
     </path>
- 
-    <path id="minified">
-        <fileset dir="${src.dir}" includes="LICENSE"/>
-        <fileset dir="${build.dir}" includes="tmp.js"/>    
-    </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">
+
+
+    <target name="build" depends="plugins">
         <concat fixlastline="yes" destfile="${build.dir}/${JS_NAME}">
-            <path refid="sourcefiles"/>
+            <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"/>
-  
-    <target name="release">
-            
-        <jscomp compilationLevel="simple" warning="verbose" 
-            debug="false" 
-            output="${build.dir}/tmp.js">
+           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}"/>
+                 <file name="${jquery-externs}"/>
             </externs>
-            <sources dir="${build.dir}">
-                <file name="${JS_NAME}" />
+            <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>
-        
-        <concat fixlastline="yes" destfile="${build.dir}/${JS_NAME_MIN}">
-            <path refid="minified"/>
-        </concat>  
+        <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>
 
diff --git a/build/.gitkeepdir b/build/.gitkeepdir
new file mode 100644
index 0000000..e69de29
diff --git a/src/Core.js b/src/Core.js
index e5ccaad..1e8478a 100644
--- a/src/Core.js
+++ b/src/Core.js
@@ -1,3 +1,11 @@
+/*
+  html2canvas @VERSION@ <http://html2canvas.hertzen.com>
+  Copyright (c) 2011 Niklas von Hertzen. All rights reserved.
+  http://www.twitter.com/niklasvh
+
+  Released under MIT License
+*/
+
 var html2canvas = {};
 
 html2canvas.logging = true;
@@ -121,4 +129,4 @@ html2canvas.Util.Extend = function (options, defaults) {
 html2canvas.Util.Children = function(el) {
     // $(el).contents() !== el.childNodes, Opera / IE have issues with that
     return $(el).contents();
-}
\ No newline at end of file
+}
diff --git a/src/Generate.js b/src/Generate.js
index aff0f14..3545a44 100644
--- a/src/Generate.js
+++ b/src/Generate.js
@@ -1,3 +1,11 @@
+/*
+  html2canvas @VERSION@ <http://html2canvas.hertzen.com>
+  Copyright (c) 2011 Niklas von Hertzen. All rights reserved.
+  http://www.twitter.com/niklasvh
+
+  Released under MIT License
+*/
+
 html2canvas.Generate = {};
 
 
diff --git a/src/LICENSE b/src/LICENSE
index 5e34fe0..458faef 100644
--- a/src/LICENSE
+++ b/src/LICENSE
@@ -1,7 +1,7 @@
-/* 
-  html2canvas v0.30 <http://html2canvas.hertzen.com>
+/**
+  @license html2canvas @VERSION@ <http://html2canvas.hertzen.com>
   Copyright (c) 2011 Niklas von Hertzen. All rights reserved.
-  http://www.twitter.com/niklasvh 
-  
+  http://www.twitter.com/niklasvh
+
   Released under MIT License
-*/
+ */
\ No newline at end of file
diff --git a/src/Parse.js b/src/Parse.js
index aee83f6..63c6831 100644
--- a/src/Parse.js
+++ b/src/Parse.js
@@ -1,3 +1,11 @@
+/*
+  html2canvas @VERSION@ <http://html2canvas.hertzen.com>
+  Copyright (c) 2011 Niklas von Hertzen. All rights reserved.
+  http://www.twitter.com/niklasvh
+
+  Released under MIT License
+*/
+
 /*
  *  New function for traversing elements
  */
diff --git a/src/Preload.js b/src/Preload.js
index 1465b25..869a1a5 100644
--- a/src/Preload.js
+++ b/src/Preload.js
@@ -1,3 +1,11 @@
+/*
+  html2canvas @VERSION@ <http://html2canvas.hertzen.com>
+  Copyright (c) 2011 Niklas von Hertzen. All rights reserved.
+  http://www.twitter.com/niklasvh
+
+  Released under MIT License
+*/
+
 html2canvas.Preload = function(element, opts){
     
     var options = {
diff --git a/src/Queue.js b/src/Queue.js
index 0a0833d..2936f87 100644
--- a/src/Queue.js
+++ b/src/Queue.js
@@ -1,3 +1,10 @@
+/*
+  html2canvas @VERSION@ <http://html2canvas.hertzen.com>
+  Copyright (c) 2011 Niklas von Hertzen. All rights reserved.
+  http://www.twitter.com/niklasvh
+
+  Released under MIT License
+*/
 html2canvas.canvasContext = function (width, height) {
     this.storage = [];
     this.width = width;
diff --git a/src/Renderer.js b/src/Renderer.js
index 5b84bbf..e6e6092 100644
--- a/src/Renderer.js
+++ b/src/Renderer.js
@@ -1,3 +1,10 @@
+/*
+  html2canvas @VERSION@ <http://html2canvas.hertzen.com>
+  Copyright (c) 2011 Niklas von Hertzen. All rights reserved.
+  http://www.twitter.com/niklasvh
+
+  Released under MIT License
+*/
 html2canvas.Renderer = function(parseQueue, opts){
 
 
diff --git a/src/Util.js b/src/Util.js
index e69de29..2f0e01e 100644
--- a/src/Util.js
+++ b/src/Util.js
@@ -0,0 +1,7 @@
+/*
+  html2canvas @VERSION@ <http://html2canvas.hertzen.com>
+  Copyright (c) 2011 Niklas von Hertzen. All rights reserved.
+  http://www.twitter.com/niklasvh
+
+  Released under MIT License
+*/
\ No newline at end of file
diff --git a/version.txt b/version.txt
new file mode 100644
index 0000000..91ecaa6
--- /dev/null
+++ b/version.txt
@@ -0,0 +1 @@
+v0.30
\ No newline at end of file