Separate www and jquerytools build. Removed individual version numbers from tools. Only the main version number (ie 1.2.0) is used. Simpler.

Tero Piirainen · Tero Piirainen · commit a41ebc748174 · 2009-12-25T04:16:20.000Z
diff --git a/build.properties b/build.properties
@@ -1,38 +1,5 @@
 
-# webapp root
-www 								= /opt/flowplayer/webapp/tools
-
-jquery							= 1.3.2
-sizzle							= 0.9.3
-
-# jQuery Tools version numbers
-
-tools 							= 1.2.0
-
-form.datepicker				= 0.9.0
-form.slider						= 0.9.0
-form.styleable					= 0.9.0
-form.validator					= 0.9.1
-
-overlay 							= 1.2.0
-overlay.apple  				= 1.2.0
-
-scrollable 						= 1.2.0
-scrollable.autoscroll		= 1.2.0
-scrollable.circular			= 0.9.1
-scrollable.navigator 		= 1.2.0
-
-tabs 								= 1.2.0
-tabs.slideshow					= 1.2.0
-
-toolbox.drag					= 1.0.0
-toolbox.flashembed			= 1.2.0
-toolbox.history				= 1.2.0
-toolbox.lazyload				= 0.9.0
-toolbox.mask					= 1.0.0
-toolbox.mousewheel			= 1.0.0
-
-tooltip 							= 1.2.0
-tooltip.dynamic				= 1.2.0
-tooltip.slide					= 1.2.0
-
+# version numbers
+tools 		= 1.2.0
+jquery		= 1.3.2
+sizzle		= 0.9.3
diff --git a/build.xml b/build.xml
@@ -2,9 +2,6 @@
 
 	<taskdef resource="net/sf/antcontrib/antlib.xml"/> 
 	<property file="build.properties" prefix="v"/>
-	
-	<property name="www" value="${v.www}-${v.tools}"/>
-	<property name="js" value="${www}/js"/>
 	<property name="build" value="build/${v.tools}"/>
 	
 	<!-- replace @VERSION and @DATE tags -->
@@ -25,22 +22,15 @@
 		
 		  <sequential>
 		  
-		  		<!-- version number -->
-				<propertyregex property="tool" input="@{file}" override="yes" replace="\1" 
- 					regexp=".+/(.*)\.js"/> 
-						
-				<propertycopy name="version" from="v.${tool}" override="yes"/>
-
-				<replaceregexp match="@VERSION" replace="${version}" flags="g" byline="true"
-					file="@{file}" />
-					
+		  		<!-- version number -->                             
+				<replaceregexp match="@VERSION" replace="${v.tools}" byline="true" file="@{file}" /> 
 			
 				<!-- last modified (via <git log> command) -->
 				<propertyregex property="source" input="@{file}" override="yes" replace="\1" 
  					regexp=".+/\d.\d.\d/(.*)\.js"/>  
  				
 				<exec executable="git" outputproperty="git.log" >  
-					<arg line="log src/${source}.js"/>  
+					<arg line="log -1 src/${source}.js"/>  
 				</exec> 			
 				
 				<propertyregex property="date" input="${git.log}" select="\1">  
@@ -76,37 +66,6 @@
 		
 	</target>
 	
-	<!-- copy stuff under web folder -->
-	<target name="www">
-	
-		<!-- documentation -->
-		<mkdir dir="${www}"/>
-		<copy todir="${www}">
-			<fileset dir="www"/>
-		</copy>
-		
-	</target>
-	
-	<!-- deploy -->
-	<target name="deploy" depends="www">
-		
-		<!-- zip -->
-		<zip destfile="${build}/tools-${v.tools}.zip"
-		     basedir="${build}"
-		     excludes="*.zip" />		
-		  
-		<!-- javascript -->
-		<mkdir dir="${js}"/> 
-		<copy todir="${js}">
-			<fileset dir="${build}"/>
-		</copy>
-		
-		<!-- properties -->
-		<copy file="build.properties" tofile="${www}/../WEB-INF/tools.properties"/>
-		
-	</target>
-
-	
 </project>
 
 
diff --git a/src/form/form.datepicker.js b/src/form/form.datepicker.js
@@ -1,14 +1,14 @@
 /**
  * @license                                     
- * form.datepickerer @VERSION - Pick your (HTML5) day.
+ * jQuery Tools @VERSION Datepicker - Compact HTML5 date picking.
  * 
  * Copyright (c) 2010 Tero Piirainen
- * http://flowplayer.org/tools/form/datepickerer/
+ * http://flowplayer.org/tools/form/datepicker/
  *
  * Dual licensed under MIT and GPL 2+ licenses
  * http://www.opensource.org/licenses
  *
- * Since: jQuery Tools 1.2.0 (Mar 2010)
+ * Since: Mar 2010
  * Date: @DATE 
  */
 
diff --git a/src/form/form.slider.js b/src/form/form.slider.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * form.slider @VERSION - HTML5 slider. Implemented.
+ * jQuery Tools @VERSION Slider - A HTML5 slider component
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/form/slider/
@@ -10,7 +10,7 @@
  * 
  * Requires toolbox.drag.js
  *
- * Since: jQuery Tools 1.2.0 (Mar 2010)
+ * Since: Mar 2010
  * Date: @DATE 
  */
  
diff --git a/src/form/form.styleable.js b/src/form/form.styleable.js
@@ -1,14 +1,14 @@
 /**
  * @license 
- * form.styleable @VERSION - You waited. Here it is.
- * 
+ * jQuery Tools @VERSION Styleable - Forms + CSS. Finally.
+ *                                                      
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/form/styleable/
  *
  * Dual licensed under MIT and GPL 2+ licenses
  * http://www.opensource.org/licenses
  *
- * Since: jQuery Tools 1.2.0 (Mar 2010)
+ * Since: Mar 2010
  * Date: @DATE 
  */
 (function($) { 
diff --git a/src/form/form.validator.js b/src/form/form.validator.js
@@ -8,7 +8,7 @@
  * Dual licensed under MIT and GPL 2+ licenses
  * http://www.opensource.org/licenses
  * 
- * Since: jQuery Tools 1.2.0 (Mar 2010)
+ * Since: Mar 2010
  * Date: @DATE 
  */
  
diff --git a/src/overlay/overlay.apple.js b/src/overlay/overlay.apple.js
@@ -1,6 +1,7 @@
 /**
  * @license 
- * overlay.apple @VERSION - Commercial bling bling for all of us
+ * jQuery Tools @VERSION / Overlay Apple effect. 
+ * Commercial bling bling for all of us
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/overlay/apple.html
diff --git a/src/overlay/overlay.js b/src/overlay/overlay.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * tools.overlay @VERSION - Overlay base. Extend it.
+ * jQuery Tools @VERSION Overlay - Overlay base. Extend it.
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/overlay/
diff --git a/src/scrollable/scrollable.autoscroll.js b/src/scrollable/scrollable.autoscroll.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * scrollable.autoscroll @VERSION 
+ * jQuery Tools @VERSION / Scrollable Autoscroll
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/scrollable/autoscroll.html
diff --git a/src/scrollable/scrollable.circular.js b/src/scrollable/scrollable.circular.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * scrollable.circular @VERSION - Not production ready yet.
+ * jQuery Tools @VERSION / Scrollable Circular (beta)
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/scrollable/circular.html
diff --git a/src/scrollable/scrollable.js b/src/scrollable/scrollable.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * tools.scrollable @VERSION - New wave UI component
+ * jQuery Tools @VERSION Scrollable - New wave UI design
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/scrollable.html
diff --git a/src/scrollable/scrollable.navigator.js b/src/scrollable/scrollable.navigator.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * scrollable.navigator @VERSION
+ * jQuery Tools @VERSION / Scrollable Navigator
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/scrollable/navigator.html
diff --git a/src/tabs/tabs.js b/src/tabs/tabs.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * tools.tabs @VERSION - The basics of UI design.
+ * jQuery Tools @VERSION Tabs- The basics of UI design.
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/tabs/
diff --git a/src/tabs/tabs.slideshow.js b/src/tabs/tabs.slideshow.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * tabs.slideshow @VERSION - 
+ * jQuery Tools @VERSION Slideshow - Extend it.
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/tabs/slideshow.html
diff --git a/src/toolbox/toolbox.drag.js b/src/toolbox/toolbox.drag.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * toolbox.drag @VERSION - Drag is an event
+ * jQuery Tools @VERSION / Toolbox:Drag - Drag is an event
  * 
  * based on jquery.event.drag.js ~ v1.5 ~ 
  * Copyright (c) 2008, Three Dub Media
@@ -9,7 +9,7 @@
  * Dual licensed under MIT and GPL 2+ licenses
  * http://www.opensource.org/licenses
  *
- * Since: jQuery Tools 1.2.0 (Mar 2010)
+ * Since: Mar 2010
  * Date: @DATE 
  */
 ;(function($){ // secure $ jQuery alias
@@ -144,4 +144,6 @@ function selectable ( elem, bool ){
 	};	
 	
 /*******************************************************************************************/
-})( jQuery ); // confine scope
+})( jQuery ); // confine scope
+
+
diff --git a/src/toolbox/toolbox.flashembed.js b/src/toolbox/toolbox.flashembed.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * tools.flashembed @VERSION - The future of Flash embedding.
+ * jQuery Tools @VERSION / Toolbox:Flashembed - The future of Flash embedding.
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/flash-embed.html
diff --git a/src/toolbox/toolbox.history.js b/src/toolbox/toolbox.history.js
@@ -1,14 +1,14 @@
 /**
  * @license 
- * toolbox.history @VERSION - Back button for AJAX apps.
+ * jQuery Tools @VERSION / Toolbox:History - Back button for AJAX apps.
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/toolbox/history.html
  * 
  * Dual licensed under MIT and GPL 2+ licenses
  * http://www.opensource.org/licenses
  *
- * Since: jQuery Tools 1.2.0 (Mar 2010)
+ * Since: Mar 2010
  * Date: @DATE 
  */
 (function($) {
diff --git a/src/toolbox/toolbox.lazyload.js b/src/toolbox/toolbox.lazyload.js
@@ -1,14 +1,14 @@
 /**
  * @license 
- * toolbox.mask @VERSION - We need a faster web
+ * jQuery Tools @VERSION / Toolbox:Lazyload - We need a faster web
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/toolbox/lazyload.html
  * 
  * Dual licensed under MIT and GPL 2+ licenses
  * http://www.opensource.org/licenses
  *
- * Since: jQuery Tools 1.2.0 (Mar 2010)
+ * Since: Mar 2010
  * Date: @DATE 
  */
  
diff --git a/src/toolbox/toolbox.mask.js b/src/toolbox/toolbox.mask.js
@@ -1,14 +1,14 @@
 /**
  * @license 
- * toolbox.mask @VERSION - Dim the lights.
+ * jQuery Tools @VERSION / Toolbox:Mask - Dim the lights.
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/toolbox/mask.html
  * 
  * Dual licensed under MIT and GPL 2+ licenses
  * http://www.opensource.org/licenses
  *
- * Since: jQuery Tools 1.2.0 (Mar 2010)
+ * Since: Mar 2010
  * Date: @DATE 
  */
 (function($) { 	
diff --git a/src/toolbox/toolbox.mousewheel.js b/src/toolbox/toolbox.mousewheel.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * toolbox.mousewheel @VERSION - Mousewheel is an event.
+ * jQuery Tools @VERSION / Toolbox:Mousewheel - Mousewheel is an event.
  * 
  * based on jquery.event.wheel.js ~ rev 1 ~ 
  * Copyright (c) 2008, Three Dub Media
@@ -10,7 +10,7 @@
  * Dual licensed under MIT and GPL 2+ licenses
  * http://www.opensource.org/licenses
  *
- * Since: jQuery Tools 1.2.0 (Mar 2010)
+ * Since: Mar 2010
  * Date: @DATE 
  */
 (function($) { 
diff --git a/src/tooltip/tooltip.dynamic.js b/src/tooltip/tooltip.dynamic.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * tooltip.dynamic @VERSION - Always visible tips
+ * jQuery Tools @VERSION / Tooltip Dynamic Positioning
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/tooltip/dynamic.html
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * jQuery Tools Tooltip @VERSION 
+ * jQuery Tools @VERSION Tooltip - Basics of UI design
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/tooltip/
diff --git a/src/tooltip/tooltip.slide.js b/src/tooltip/tooltip.slide.js
@@ -1,6 +1,6 @@
 /**
  * @license 
- * tooltip.slide effect @VERSION
+ * jQuery Tools @VERSION / Tooltip Slide Effect
  * 
  * Copyright (c) 2010 Tero Piirainen
  * http://flowplayer.org/tools/tooltip/slide.html

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`/**`
`2`	`2`	`* @license`
`3`		`- * form.datepickerer @VERSION - Pick your (HTML5) day.`
	`3`	`+ * jQuery Tools @VERSION Datepicker - Compact HTML5 date picking.`
`4`	`4`	`*`
`5`	`5`	`* Copyright (c) 2010 Tero Piirainen`
`6`		`- * http://flowplayer.org/tools/form/datepickerer/`
	`6`	`+ * http://flowplayer.org/tools/form/datepicker/`
`7`	`7`	`*`
`8`	`8`	`* Dual licensed under MIT and GPL 2+ licenses`
`9`	`9`	`* http://www.opensource.org/licenses`
`10`	`10`	`*`
`11`		`- * Since: jQuery Tools 1.2.0 (Mar 2010)`
	`11`	`+ * Since: Mar 2010`
`12`	`12`	`* Date: @DATE`
`13`	`13`	`*/`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/**`
`2`	`2`	`* @license`
`3`		`- * form.slider @VERSION - HTML5 slider. Implemented.`
	`3`	`+ * jQuery Tools @VERSION Slider - A HTML5 slider component`
`4`	`4`	`*`
`5`	`5`	`* Copyright (c) 2010 Tero Piirainen`
`6`	`6`	`* http://flowplayer.org/tools/form/slider/`
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* Requires toolbox.drag.js`
`12`	`12`	`*`
`13`		`- * Since: jQuery Tools 1.2.0 (Mar 2010)`
	`13`	`+ * Since: Mar 2010`
`14`	`14`	`* Date: @DATE`
`15`	`15`	`*/`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Dual licensed under MIT and GPL 2+ licenses`
`9`	`9`	`* http://www.opensource.org/licenses`
`10`	`10`	`*`
`11`		`- * Since: jQuery Tools 1.2.0 (Mar 2010)`
	`11`	`+ * Since: Mar 2010`
`12`	`12`	`* Date: @DATE`
`13`	`13`	`*/`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`* @license`
`3`		`- * overlay.apple @VERSION - Commercial bling bling for all of us`
	`3`	`+ * jQuery Tools @VERSION / Overlay Apple effect.`
	`4`	`+ * Commercial bling bling for all of us`
`4`	`5`	`*`
`5`	`6`	`* Copyright (c) 2010 Tero Piirainen`
`6`	`7`	`* http://flowplayer.org/tools/overlay/apple.html`