Skip to content

Commit d2764d8

Browse files
gnarfgnarf
committed
Build: whitespace
(cherry picked from commit 6cd672b)
1 parent 264139b commit d2764d8

File tree

1 file changed

+89
-98
lines changed

1 file changed

+89
-98
lines changed

‎build/build.xml

Lines changed: 89 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<property name="src.dir" value="${ui.dir}/ui/" />
3131
<property name="theme.dir" value="${ui.dir}/themes/base/" />
3232
<property name="docs.dir" value="${dist.dir}/docs/" />
33-
3433
<property name="min.dir" value="${dist.dir}/ui/minified" />
3534
<property name="size.dir" value="size" />
3635

@@ -80,7 +79,7 @@
8079
<fileset dir="${dist.dir}/themes/base" includes="*.css" />
8180
</copy>
8281
<replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s">
83-
<fileset dir="${dist.dir}/headers/" includes="*.css"/>
82+
<fileset dir="${dist.dir}/headers/" includes="*.css"/>
8483
</replaceregexp>
8584
<for param="file">
8685
<path><fileset dir="${dist.dir}/themes/base/minified" includes="*.css" /></path>
@@ -161,46 +160,41 @@
161160
<mkdir dir="${min.dir}" />
162161
<mkdir dir="${min.dir}/i18n/" />
163162
<mkdir dir="${dist.dir}/themes/base/minified" />
164-
165-
<parallel threadsperprocessor="1">
166-
167-
<apply executable="java" parallel="false">
168-
<fileset dir="${dist.dir}/ui" includes="*.js" />
169-
<arg line="-jar" />
170-
<arg path="${closure-jar}" />
171-
<arg value="--warning_level" />
172-
<arg value="QUIET" />
173-
<arg value="--js_output_file" />
174-
<targetfile />
175-
<arg value="--js" />
176-
<mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
177-
</apply>
178-
179-
<apply executable="java" parallel="false">
180-
<fileset dir="${dist.dir}/ui/i18n" includes="*.js" />
181-
<arg line="-jar" />
182-
<arg path="${closure-jar}" />
183-
<arg value="--warning_level" />
184-
<arg value="QUIET" />
185-
<arg value="--js_output_file" />
186-
<targetfile />
187-
<arg value="--js" />
188-
<mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
189-
</apply>
190-
191-
<apply executable="java" parallel="false">
192-
<fileset dir="${dist.dir}/themes/base" includes="*.css" />
193-
<arg line="-jar" />
194-
<arg path="${yuicompressor-jar}" />
195-
<arg line="--charset utf-8" />
196-
<arg line="-v" />
197-
<srcfile />
198-
<arg line="-o" />
199-
<mapper type="glob" from="*.css" to="${dist.dir}/themes/base/minified/*.min.css" />
200-
<targetfile/>
201-
</apply>
202-
203-
</parallel>
163+
<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" />
173+
<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" />
185+
</apply>
186+
<apply executable="java" parallel="false">
187+
<fileset dir="${dist.dir}/themes/base" includes="*.css" />
188+
<arg line="-jar" />
189+
<arg path="${yuicompressor-jar}" />
190+
<arg line="--charset utf-8" />
191+
<arg line="-v" />
192+
<srcfile />
193+
<arg line="-o" />
194+
<mapper type="glob" from="*.css" to="${dist.dir}/themes/base/minified/*.min.css" />
195+
<targetfile/>
196+
</apply>
197+
</parallel>
204198

205199
<replaceregexp match=".css" replace=".min.css" flags="g">
206200
<fileset dir="${dist.dir}/themes/base/minified/">
@@ -262,57 +256,55 @@
262256
<target name="docs-download">
263257
<mkdir dir="${docs.dir}" />
264258
<property name="url" value="http://docs.jquery.com/action/render/UI/API/${release.version}/" />
265-
266-
<parallel threadcount="8">
267-
268-
<get src="${url}Draggable" dest="${docs.dir}draggable.html" />
269-
<get src="${url}Droppable" dest="${docs.dir}droppable.html" />
270-
<get src="${url}Resizable" dest="${docs.dir}resizable.html" />
271-
<get src="${url}Selectable" dest="${docs.dir}selectable.html" />
272-
<get src="${url}Sortable" dest="${docs.dir}sortable.html" />
273-
274-
<get src="${url}Accordion" dest="${docs.dir}accordion.html" />
275-
<get src="${url}Autocomplete" dest="${docs.dir}autocomplete.html" />
276-
<get src="${url}Button" dest="${docs.dir}button.html" />
277-
<get src="${url}Datepicker" dest="${docs.dir}datepicker.html" />
278-
<get src="${url}Dialog" dest="${docs.dir}dialog.html" />
279-
<get src="${url}Menu" dest="${docs.dir}menu.html" />
280-
<get src="${url}Progressbar" dest="${docs.dir}progressbar.html" />
281-
<get src="${url}Slider" dest="${docs.dir}slider.html" />
282-
<get src="${url}Spinner" dest="${docs.dir}spinner.html" />
283-
<get src="${url}Tooltip" dest="${docs.dir}tooltip.html" />
284-
<get src="${url}Tabs" dest="${docs.dir}tabs.html" />
285-
286-
<get src="${url}Position" dest="${docs.dir}position.html" />
287-
288-
<get src="http://docs.jquery.com/action/render/UI/Effects/animate" dest="${docs.dir}animate.html" />
289-
<get src="http://docs.jquery.com/action/render/UI/Effects/addClass" dest="${docs.dir}addClass.html" />
290-
<get src="http://docs.jquery.com/action/render/UI/Effects/effect" dest="${docs.dir}effect.html" />
291-
<get src="http://docs.jquery.com/action/render/UI/Effects/hide" dest="${docs.dir}hide.html" />
292-
<get src="http://docs.jquery.com/action/render/UI/Effects/removeClass" dest="${docs.dir}removeClass.html" />
293-
<get src="http://docs.jquery.com/action/render/UI/Effects/show" dest="${docs.dir}show.html" />
294-
<get src="http://docs.jquery.com/action/render/UI/Effects/switchClass" dest="${docs.dir}switchClass.html" />
295-
<get src="http://docs.jquery.com/action/render/UI/Effects/toggle" dest="${docs.dir}toggle.html" />
296-
<get src="http://docs.jquery.com/action/render/UI/Effects/toggleClass" dest="${docs.dir}toggleClass.html" />
297-
298-
299-
<get src="http://docs.jquery.com/action/render/UI/Effects/Blind" dest="${docs.dir}effect-blind.html" />
300-
<get src="http://docs.jquery.com/action/render/UI/Effects/Clip" dest="${docs.dir}effect-clip.html" />
301-
<get src="http://docs.jquery.com/action/render/UI/Effects/Drop" dest="${docs.dir}effect-drop.html" />
302-
<get src="http://docs.jquery.com/action/render/UI/Effects/Explode" dest="${docs.dir}effect-explode.html" />
303-
<get src="http://docs.jquery.com/action/render/UI/Effects/Fade" dest="${docs.dir}effect-fade.html" />
304-
<get src="http://docs.jquery.com/action/render/UI/Effects/Fold" dest="${docs.dir}effect-fold.html" />
305-
<get src="http://docs.jquery.com/action/render/UI/Effects/Puff" dest="${docs.dir}effect-puff.html" />
306-
<get src="http://docs.jquery.com/action/render/UI/Effects/Slide" dest="${docs.dir}effect-slide.html" />
307-
<get src="http://docs.jquery.com/action/render/UI/Effects/Scale" dest="${docs.dir}effect-scale.html" />
308-
309-
<get src="http://docs.jquery.com/action/render/UI/Effects/Bounce" dest="${docs.dir}effect-bounce.html" />
310-
<get src="http://docs.jquery.com/action/render/UI/Effects/Highlight" dest="${docs.dir}effect-highlight.html" />
311-
<get src="http://docs.jquery.com/action/render/UI/Effects/Pulsate" dest="${docs.dir}effect-pulsate.html" />
312-
<get src="http://docs.jquery.com/action/render/UI/Effects/Shake" dest="${docs.dir}effect-shake.html" />
313-
<get src="http://docs.jquery.com/action/render/UI/Effects/Size" dest="${docs.dir}effect-size.html" />
314-
<get src="http://docs.jquery.com/action/render/UI/Effects/Transfer" dest="${docs.dir}effect-transfer.html" />
315-
</parallel>
259+
<parallel threadcount="8">
260+
<get src="${url}Draggable" dest="${docs.dir}draggable.html" />
261+
<get src="${url}Droppable" dest="${docs.dir}droppable.html" />
262+
<get src="${url}Resizable" dest="${docs.dir}resizable.html" />
263+
<get src="${url}Selectable" dest="${docs.dir}selectable.html" />
264+
<get src="${url}Sortable" dest="${docs.dir}sortable.html" />
265+
266+
<get src="${url}Accordion" dest="${docs.dir}accordion.html" />
267+
<get src="${url}Autocomplete" dest="${docs.dir}autocomplete.html" />
268+
<get src="${url}Button" dest="${docs.dir}button.html" />
269+
<get src="${url}Datepicker" dest="${docs.dir}datepicker.html" />
270+
<get src="${url}Dialog" dest="${docs.dir}dialog.html" />
271+
<get src="${url}Menu" dest="${docs.dir}menu.html" />
272+
<get src="${url}Progressbar" dest="${docs.dir}progressbar.html" />
273+
<get src="${url}Slider" dest="${docs.dir}slider.html" />
274+
<get src="${url}Spinner" dest="${docs.dir}spinner.html" />
275+
<get src="${url}Tooltip" dest="${docs.dir}tooltip.html" />
276+
<get src="${url}Tabs" dest="${docs.dir}tabs.html" />
277+
278+
<get src="${url}Position" dest="${docs.dir}position.html" />
279+
280+
<get src="http://docs.jquery.com/action/render/UI/Effects/animate" dest="${docs.dir}animate.html" />
281+
<get src="http://docs.jquery.com/action/render/UI/Effects/addClass" dest="${docs.dir}addClass.html" />
282+
<get src="http://docs.jquery.com/action/render/UI/Effects/effect" dest="${docs.dir}effect.html" />
283+
<get src="http://docs.jquery.com/action/render/UI/Effects/hide" dest="${docs.dir}hide.html" />
284+
<get src="http://docs.jquery.com/action/render/UI/Effects/removeClass" dest="${docs.dir}removeClass.html" />
285+
<get src="http://docs.jquery.com/action/render/UI/Effects/show" dest="${docs.dir}show.html" />
286+
<get src="http://docs.jquery.com/action/render/UI/Effects/switchClass" dest="${docs.dir}switchClass.html" />
287+
<get src="http://docs.jquery.com/action/render/UI/Effects/toggle" dest="${docs.dir}toggle.html" />
288+
<get src="http://docs.jquery.com/action/render/UI/Effects/toggleClass" dest="${docs.dir}toggleClass.html" />
289+
290+
291+
<get src="http://docs.jquery.com/action/render/UI/Effects/Blind" dest="${docs.dir}effect-blind.html" />
292+
<get src="http://docs.jquery.com/action/render/UI/Effects/Clip" dest="${docs.dir}effect-clip.html" />
293+
<get src="http://docs.jquery.com/action/render/UI/Effects/Drop" dest="${docs.dir}effect-drop.html" />
294+
<get src="http://docs.jquery.com/action/render/UI/Effects/Explode" dest="${docs.dir}effect-explode.html" />
295+
<get src="http://docs.jquery.com/action/render/UI/Effects/Fade" dest="${docs.dir}effect-fade.html" />
296+
<get src="http://docs.jquery.com/action/render/UI/Effects/Fold" dest="${docs.dir}effect-fold.html" />
297+
<get src="http://docs.jquery.com/action/render/UI/Effects/Puff" dest="${docs.dir}effect-puff.html" />
298+
<get src="http://docs.jquery.com/action/render/UI/Effects/Slide" dest="${docs.dir}effect-slide.html" />
299+
<get src="http://docs.jquery.com/action/render/UI/Effects/Scale" dest="${docs.dir}effect-scale.html" />
300+
301+
<get src="http://docs.jquery.com/action/render/UI/Effects/Bounce" dest="${docs.dir}effect-bounce.html" />
302+
<get src="http://docs.jquery.com/action/render/UI/Effects/Highlight" dest="${docs.dir}effect-highlight.html" />
303+
<get src="http://docs.jquery.com/action/render/UI/Effects/Pulsate" dest="${docs.dir}effect-pulsate.html" />
304+
<get src="http://docs.jquery.com/action/render/UI/Effects/Shake" dest="${docs.dir}effect-shake.html" />
305+
<get src="http://docs.jquery.com/action/render/UI/Effects/Size" dest="${docs.dir}effect-size.html" />
306+
<get src="http://docs.jquery.com/action/render/UI/Effects/Transfer" dest="${docs.dir}effect-transfer.html" />
307+
</parallel>
316308
</target>
317309

318310
<target name="themes-download">
@@ -325,8 +317,7 @@
325317
<for list="${urls}" param="url">
326318
<sequential>
327319
<get src="http://ui-dev.jquery.com/download/?@{url}" dest="${zip}" />
328-
<unzip src="${zip}"
329-
dest="${dist.dir}themes/">
320+
<unzip src="${zip}" dest="${dist.dir}themes/">
330321
<patternset>
331322
<include name="development-bundle/themes/**"/>
332323
<exclude name="development-bundle/themes/base/**"/>
@@ -352,8 +343,8 @@
352343

353344
<target name="whitespace">
354345
<replaceregexp match="[\t ]+$" replace="" flags="g" byline="true">
355-
<fileset dir="${src.dir}" includes="*.js"/>
356-
<fileset dir="${src.dir}/i18n/" includes="*.js"/>
346+
<fileset dir="${src.dir}" includes="*.js"/>
347+
<fileset dir="${src.dir}/i18n/" includes="*.js"/>
357348
</replaceregexp>
358349
<echo message="All trailing spaces removed." />
359350
</target>
@@ -410,7 +401,7 @@
410401
<fileset dir="${cdndist.dir}" />
411402
</checksum>
412403
<for param="file">
413-
<path><fileset dir="${cdndist.dir}" includes="**/" excludes="**/*.MD5" /></path>
404+
<path><fileset dir="${cdndist.dir}" includes="**/" excludes="**/*.MD5" /></path>
414405
<sequential>
415406
<!-- @{file} is an absolute path, use that ugly regexes to make it relative -->
416407
<propertyregex override="yes" property="relativepath" input="@{file}" regexp=".+?cdn[\\/](.+)$" replace="\1"/>

0 commit comments

Comments
 (0)