|
39 | 39 | <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" />
|
40 | 40 | <property name="core.files.min" value="jquery.ui.core.min.js, jquery.ui.widget.min.js, jquery.ui.mouse.min.js, jquery.ui.draggable.min.js, jquery.ui.droppable.min.js, jquery.ui.resizable.min.js, jquery.ui.selectable.min.js, jquery.ui.sortable.min.js, jquery.effects.core.min.js" />
|
41 | 41 |
|
42 |
| - <property description="Google Closure" name="closure-jar" value="${build.dir}/google-compiler-20110320.jar" /> |
43 | 42 | <property description="YUI Compressor" name="yuicompressor-jar" value="${build.dir}/yuicompressor-2.4.2.jar" />
|
44 | 43 |
|
45 | 44 | <target name="deploy-release" depends="clean, docs-download, copy, minify, replace-version, prepend-header, zip" description="Release builder">
|
|
55 | 54 | </target>
|
56 | 55 |
|
57 | 56 | <target name="prepend-header">
|
58 |
| - <copy todir="${dist.dir}/headers/"> |
59 |
| - <fileset dir="${dist.dir}/ui/" includes="*.js" /> |
60 |
| - </copy> |
61 |
| - <replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s"> |
62 |
| - <fileset dir="${dist.dir}/headers/" includes="*.js"/> |
63 |
| - </replaceregexp> |
64 |
| - <for param="file"> |
65 |
| - <path><fileset dir="${min.dir}/" includes="*.js" /></path> |
66 |
| - <sequential> |
67 |
| - <propertyregex override="yes" property="target" input="@{file}" regexp=".*[\\/](.+)\.min\.js$" replace="\1"/> |
68 |
| - <concat destfile="${dist.dir}/ui-headered/${target}.min.js"> |
69 |
| - <header file="${dist.dir}/headers/${target}.js" /> |
70 |
| - <fileset file="@{file}" /> |
71 |
| - </concat> |
72 |
| - </sequential> |
73 |
| - </for> |
74 |
| - <copy todir="${min.dir}" overwrite="true"> |
75 |
| - <fileset dir="${dist.dir}/ui-headered/" includes="*.js" /> |
76 |
| - </copy> |
77 |
| - |
78 | 57 | <copy todir="${dist.dir}/headers/">
|
79 | 58 | <fileset dir="${dist.dir}/themes/base" includes="*.css" />
|
80 | 59 | </copy>
|
|
95 | 74 | <fileset dir="${dist.dir}/ui-headered/" includes="*.css" />
|
96 | 75 | </copy>
|
97 | 76 |
|
98 |
| - <!-- once more for the i18n files --> |
99 |
| - <!-- need to clean up headers in those files first |
100 |
| - <copy todir="${dist.dir}/headers/i18n/"> |
101 |
| - <fileset dir="${dist.dir}/ui/i18n/" includes="*.js" /> |
102 |
| - </copy> |
103 |
| - <replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s"> |
104 |
| - <fileset dir="${dist.dir}/headers/i18n/" includes="*.js"/> |
105 |
| - </replaceregexp> |
106 |
| - <for param="file"> |
107 |
| - <path><fileset dir="${min.dir}/i18n/" includes="*.js" /></path> |
108 |
| - <sequential> |
109 |
| - <propertyregex override="yes" property="target" input="@{file}" regexp=".*[\\/](.+)\.min\.js$" replace="\1"/> |
110 |
| - <concat destfile="${dist.dir}/ui-headered/i18n/${target}.min.js"> |
111 |
| - <header file="${dist.dir}/headers/i18n/${target}.js" /> |
112 |
| - <fileset file="@{file}" /> |
113 |
| - </concat> |
114 |
| - </sequential> |
115 |
| - </for> |
116 |
| - <copy todir="${min.dir}/i18n/"> |
117 |
| - <fileset dir="${dist.dir}/ui-headered/i18n/" includes="*.js" /> |
118 |
| - </copy> |
119 |
| - --> |
120 |
| - |
121 | 77 | <delete dir="${dist.dir}/headers/" />
|
122 | 78 | <delete dir="${dist.dir}/ui-headered/" />
|
123 | 79 | </target>
|
|
161 | 117 | <mkdir dir="${min.dir}/i18n/" />
|
162 | 118 | <mkdir dir="${dist.dir}/themes/base/minified" />
|
163 | 119 | <parallel threadsperprocessor="1">
|
164 |
| - <apply executable="java" parallel="false"> |
165 |
| - <fileset dir="${dist.dir}/ui" includes="*.js" /> |
166 |
| - <arg line="-jar" /> |
167 |
| - <arg path="${closure-jar}" /> |
168 |
| - <arg value="--warning_level" /> |
169 |
| - <arg value="QUIET" /> |
170 |
| - <arg value="--js_output_file" /> |
171 |
| - <targetfile /> |
172 |
| - <arg value="--js" /> |
| 120 | + <apply executable="build/minify-js.sh"> |
| 121 | + <fileset dir="${dist.dir}/ui" includes="**.js" /> |
| 122 | + <srcfile /> |
173 | 123 | <mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
|
174 |
| - </apply> |
175 |
| - <apply executable="java" parallel="false"> |
176 |
| - <fileset dir="${dist.dir}/ui/i18n" includes="*.js" /> |
177 |
| - <arg line="-jar" /> |
178 |
| - <arg path="${closure-jar}" /> |
179 |
| - <arg value="--warning_level" /> |
180 |
| - <arg value="QUIET" /> |
181 |
| - <arg value="--js_output_file" /> |
182 |
| - <targetfile /> |
183 |
| - <arg value="--js" /> |
184 |
| - <mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" /> |
| 124 | + <targetfile/> |
185 | 125 | </apply>
|
186 | 126 | <apply executable="java" parallel="false">
|
187 | 127 | <fileset dir="${dist.dir}/themes/base" includes="*.css" />
|
|
0 commit comments