finalized JS minifying with Closure Compiler

Tero Piirainen · Tero Piirainen · commit 9f6fb538428a · 2009-12-13T05:44:39.000Z
diff --git a/build.properties b/build.properties
@@ -1,4 +1,7 @@
 
+# webapp root
+www 								= /opt/flowplayer/webapp/tools
+
 # jQuery Tools version numbers
 
 jquery							= 1.3.2
@@ -32,5 +35,3 @@ tooltip 							= 1.2.0
 tooltip.dynamic				= 1.2.0
 tooltip.slide					= 1.2.0
 
-
-
diff --git a/build.xml b/build.xml
@@ -1,11 +1,11 @@
 <project name="jQuery.Tools" default="min">
 
 	<taskdef resource="net/sf/antcontrib/antlib.xml"/> 
-	<property file="version.properties" prefix="v"/>
+	<property file="build.properties" prefix="v"/>
+	
+	<property name="www" value="${v.www}-${v.tools}"/>
+	<property name="js" value="${www}/js"/>
 	
-	<!-- hardcoded -->
-	<property name="www" value="/opt/flowplayer/webapp/tools-${v.tools}"/>
-	<property name="js" value="/opt/flowplayer/webapp/js/tools/${v.tools}"/>
 	
 	<!-- minify with Closure Compiler (default mode) --> 
 	<target name="min">                                                   
@@ -31,7 +31,7 @@
 			 <arg line="--js"/>
 			 <srcfile/>
 			 <arg line="--js_output_file"/>
-			 <mapper type="glob" from="*.js" to="../build/*.min.js"/>
+			 <mapper type="glob" from="*.js" to="../build/${v.tools}/*.min.js"/>
 			 <targetfile/>
 		</apply>
 		
diff --git a/src/form/form.datepick.js b/src/form/form.datepick.js
@@ -1,4 +1,5 @@
-/* @license                                     
+/**
+ * @license                                     
  * form.datepicker @VERSION - Pick your (HTML5) day.
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/form/form.slider.js b/src/form/form.slider.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * form.slider @VERSION - HTML5 slider. Implemented.
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/form/form.styleable.js b/src/form/form.styleable.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * form.styleable @VERSION - You waited. Here it is.
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/form/form.validator.js b/src/form/form.validator.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * form.validator @VERSION - HTML5 is here. Now use it.
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/overlay/overlay.apple.js b/src/overlay/overlay.apple.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * overlay.apple @VERSION - Commercial bling bling for all of us
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/overlay/overlay.js b/src/overlay/overlay.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * tools.overlay @VERSION - Overlay base. Extend it.
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/scrollable/scrollable.autoscroll.js b/src/scrollable/scrollable.autoscroll.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * scrollable.autoscroll @VERSION 
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/scrollable/scrollable.circular.js b/src/scrollable/scrollable.circular.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * scrollable.circular @VERSION - Not production ready yet.
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/scrollable/scrollable.js b/src/scrollable/scrollable.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * tools.scrollable @VERSION - New wave UI component
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/scrollable/scrollable.navigator.js b/src/scrollable/scrollable.navigator.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * scrollable.navigator @VERSION
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/tabs/tabs.js b/src/tabs/tabs.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * tools.tabs @VERSION - The basics of UI design.
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/tabs/tabs.slideshow.js b/src/tabs/tabs.slideshow.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * tabs.slideshow @VERSION - 
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/toolbox/toolbox.drag.js b/src/toolbox/toolbox.drag.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * toolbox.drag @VERSION - Drag is an event
  * 
  * based on jquery.event.drag.js ~ v1.5 ~ 
diff --git a/src/toolbox/toolbox.flashembed.js b/src/toolbox/toolbox.flashembed.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * tools.flashembed @VERSION - The future of Flash embedding.
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/toolbox/toolbox.history.js b/src/toolbox/toolbox.history.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * toolbox.history @VERSION - Back button for AJAX apps.
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/toolbox/toolbox.lazyload.js b/src/toolbox/toolbox.lazyload.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * toolbox.mask @VERSION - We need a faster web
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/toolbox/toolbox.mask.js b/src/toolbox/toolbox.mask.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * toolbox.mask @VERSION - Dim the lights.
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/toolbox/toolbox.mousewheel.js b/src/toolbox/toolbox.mousewheel.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * toolbox.mousewheel @VERSION - Mousewheel is an event.
  * 
  * based on jquery.event.wheel.js ~ rev 1 ~ 
diff --git a/src/tooltip/tooltip.dynamic.js b/src/tooltip/tooltip.dynamic.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * tooltip.dynamic @VERSION - Always visible tips
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * jQuery Tools Tooltip @VERSION 
  * 
  * Copyright (c) 2010 Tero Piirainen
diff --git a/src/tooltip/tooltip.slide.js b/src/tooltip/tooltip.slide.js
@@ -1,4 +1,5 @@
-/* @license
+/**
+ * @license 
  * tooltip.slide effect @VERSION
  * 
  * Copyright (c) 2010 Tero Piirainen

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-/* @license`
	`1`	`+/**`
	`2`	`+ * @license`
`2`	`3`	`* form.datepicker @VERSION - Pick your (HTML5) day.`
`3`	`4`	`*`
`4`	`5`	`* Copyright (c) 2010 Tero Piirainen`