Skip to content

Commit 062f034

Browse files
committed
Moved to using Google Closure from YUI Compressor.
1 parent e70743c commit 062f034

File tree

5 files changed

+29
-782
lines changed

5 files changed

+29
-782
lines changed

build/build.xml

+29-21
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<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" />
3737

38-
<property description="YUI Compressor" name="yui-jar" value="${build.dir}/yuicompressor-2.4.2.jar" />
38+
<property description="Google Closure" name="closure-jar" value="${build.dir}/google-compiler-20091218.jar" />
3939

4040
<target name="deploy-release" depends="docs-download, concatenate, minify, copy, replace-version, prepend-header, zip" description="Release builder">
4141
</target>
@@ -112,34 +112,42 @@
112112
<mkdir dir="${min.folder}" />
113113
<delete dir="${min.folder}/i18n/" />
114114
<mkdir dir="${min.folder}/i18n/" />
115-
115+
116116
<apply executable="java" parallel="false">
117-
<filelist dir="${dist.dir}/ui/" files="${concatenated}.js" />
118117
<fileset dir="${src.dir}/" includes="jquery.ui.*.js, jquery.effects.*.js" />
119118
<arg line="-jar" />
120-
<arg path="${yui-jar}" />
121-
<arg value="--charset" />
122-
<arg value="UTF-8" />
123-
<srcfile />
124-
<arg line="-o" />
125-
<mapper type="glob" from="*.js" to="${min.folder}/*.min.js" />
119+
<arg path="build/google-compiler-20091218.jar" />
120+
<arg value="--warning_level" />
121+
<arg value="QUIET" />
122+
<arg value="--js_output_file" />
126123
<targetfile />
124+
<arg value="--js" />
125+
<mapper type="glob" from="*.js" to="${min.folder}/*.min.js" />
127126
</apply>
128-
<echo message="Minified ui/ built." />
129-
130-
<apply executable="java" parallel="false">
131-
<filelist dir="${dist.dir}/ui/i18n/" files="${concatenated.i18n}.js" />
132-
<fileset dir="${src.dir}/i18n/" includes="jquery.ui.*.js" />
127+
128+
<apply executable="java" parallel="false" verbose="true" dest="${dist.dir}">
129+
<filelist dir="${dist.dir}/ui/" files="${concatenated}.js" />
133130
<arg line="-jar" />
134-
<arg path="${yui-jar}" />
135-
<arg value="--charset" />
136-
<arg value="UTF-8" />
137-
<srcfile />
138-
<arg line="-o" />
139-
<mapper type="glob" from="*.js" to="${min.folder}/i18n/*.min.js" />
131+
<arg path="build/google-compiler-20091218.jar" />
132+
<arg value="--warning_level" />
133+
<arg value="QUIET" />
134+
<arg value="--js_output_file" />
140135
<targetfile />
136+
<arg value="--js" />
137+
<mapper type="glob" from="${concatenated}.js" to="tmpmin" />
141138
</apply>
142-
<echo message="Minified ui/i18n/ built." />
139+
<concat destfile="${min.folder}/jquery-ui.min.js">
140+
<filelist files="${src.dir}/jquery.ui.core.js, ${dist.dir}/tmpmin"/>
141+
<filterchain>
142+
<headfilter lines="9"/>
143+
</filterchain>
144+
</concat>
145+
<concat destfile="${min.folder}/jquery-ui.min.js" append="yes">
146+
<filelist files="${dist.dir}/tmpmin"/>
147+
</concat>
148+
<delete file="${dist.dir}/tmpmin"/>
149+
150+
<echo message="Minified ui/ built." />
143151
</target>
144152

145153
<target description="Copy needed folders" name="copy">

0 commit comments

Comments
 (0)