Merge branch 'master' of github.com:jquery/jquery-ui

jquery · Mar 20, 2010 · 0e24849 · 0e24849
2 parents 1ddd4f5 + 3d5adba
commit 0e24849
Show file tree

Hide file tree

Showing 9 changed files with 802 additions and 782 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -35,7 +35,7 @@
 
 	<property name="core.files" value="jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.effects.core.js" />
 
-	<property description="YUI Compressor" name="yui-jar" value="${build.dir}/yuicompressor-2.4.2.jar" />
+	<property description="Google Closure" name="closure-jar" value="${build.dir}/google-compiler-20091218.jar" />
 
 	<target name="deploy-release" depends="docs-download, concatenate, minify, copy, replace-version, prepend-header, zip" description="Release builder">
 	</target>
@@ -112,34 +112,42 @@
 		<mkdir dir="${min.folder}" />
 		<delete dir="${min.folder}/i18n/" />
 		<mkdir dir="${min.folder}/i18n/" />
-
+		
 		<apply executable="java" parallel="false">
-			<filelist dir="${dist.dir}/ui/" files="${concatenated}.js" />
 			<fileset dir="${src.dir}/" includes="jquery.ui.*.js, jquery.effects.*.js" />
 			<arg line="-jar" />
-			<arg path="${yui-jar}" />
-			<arg value="--charset" />  
-			<arg value="UTF-8" />  
-			<srcfile />
-			<arg line="-o" />
-			<mapper type="glob" from="*.js" to="${min.folder}/*.min.js" />
+			<arg path="build/google-compiler-20091218.jar" />
+			<arg value="--warning_level" />
+			<arg value="QUIET" />
+			<arg value="--js_output_file" />
 			<targetfile />
+			<arg value="--js" />
+			<mapper type="glob" from="*.js" to="${min.folder}/*.min.js" />
 		</apply>
-		<echo message="Minified ui/ built." />
-
-		<apply executable="java" parallel="false">
-			<filelist dir="${dist.dir}/ui/i18n/" files="${concatenated.i18n}.js" />
-			<fileset dir="${src.dir}/i18n/" includes="jquery.ui.*.js" />
+
+		<apply executable="java" parallel="false" verbose="true" dest="${dist.dir}">
+			<filelist dir="${dist.dir}/ui/" files="${concatenated}.js" />
 			<arg line="-jar" />
-			<arg path="${yui-jar}" />
-			<arg value="--charset" />  
-			<arg value="UTF-8" />  
-			<srcfile />
-			<arg line="-o" />
-			<mapper type="glob" from="*.js" to="${min.folder}/i18n/*.min.js" />
+			<arg path="build/google-compiler-20091218.jar" />
+			<arg value="--warning_level" />
+			<arg value="QUIET" />
+			<arg value="--js_output_file" />
 			<targetfile />
+			<arg value="--js" />
+			<mapper type="glob" from="${concatenated}.js" to="tmpmin" />
 		</apply>
-		<echo message="Minified ui/i18n/ built." />
+		<concat destfile="${min.folder}/jquery-ui.min.js">
+			<filelist files="${src.dir}/jquery.ui.core.js, ${dist.dir}/tmpmin"/>
+			<filterchain>
+				<headfilter lines="9"/>
+			</filterchain>
+		</concat>
+		<concat destfile="${min.folder}/jquery-ui.min.js" append="yes">
+			<filelist files="${dist.dir}/tmpmin"/>
+		</concat>
+		<delete file="${dist.dir}/tmpmin"/>
+
+		<echo message="Minified ui/ built." />
 	</target>
 
 	<target description="Copy needed folders" name="copy">