Skip to content

Commit 9f75fb8

Browse files
committed
Build: Fix for #3576, adding headers to minified and packed files; current solution is rather ugly, need to refactor; also removed unnecessary files from old build scripts, while adding ant-contrib-0.6.jar
1 parent 9d4bfd8 commit 9f75fb8

14 files changed

Lines changed: 46 additions & 2323 deletions

File tree

release/build.xml

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010
-->
1111

1212
<project name="jquery-ui" default="deploy-release" basedir=".">
13+
14+
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
15+
<classpath>
16+
<pathelement location="build/ant-contrib-0.6.jar"/>
17+
</classpath>
18+
</taskdef>
1319

14-
<target name="deploy-release" depends="load.properties, concatenate, minify, pack, copy, replace-version, zip" description="Release builder">
20+
<target name="deploy-release" depends="load.properties, concatenate, minify, pack, copy, replace-version, prepend-header, zip" description="Release builder">
1521
</target>
1622

1723
<target name="load.properties">
@@ -40,11 +46,49 @@
4046
<target name="replace-version" depends="load.properties">
4147
<replaceregexp match="@VERSION" replace="${release.version}" flags="g" byline="true">
4248
<fileset dir="${dist.dir}/ui/" includes="*.js"/>
43-
<fileset dir="${dist.dir}/ui/packed/" includes="*.js"/>
4449
<fileset dir="${dist.dir}/ui/minified/" includes="*.js"/>
4550
</replaceregexp>
4651
<echo message="Replaced all @VERSION to ${release.version}." />
4752
</target>
53+
54+
<target name="prepend-header" depends="load.properties">
55+
<!-- TODO: refactor this ugly mess -->
56+
<copy todir="${dist.dir}/headers/">
57+
<fileset dir="${dist.dir}/ui/" includes="*.js" />
58+
</copy>
59+
<replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s">
60+
<fileset dir="${dist.dir}/headers/" includes="*.js"/>
61+
</replaceregexp>
62+
<for param="file">
63+
<path><fileset dir="${dist.dir}/ui/minified/" includes="*.js" /></path>
64+
<sequential>
65+
<propertyregex override="yes" property="target" input="@{file}" regexp=".+\\(.+)\.min\.js$" replace="\1"/>
66+
<concat destfile="${dist.dir}/ui-headered/${target}.min.js">
67+
<header file="${dist.dir}/headers/${target}.js" />
68+
<fileset file="@{file}" />
69+
</concat>
70+
</sequential>
71+
</for>
72+
<copy todir="${dist.dir}/ui/minified">
73+
<fileset dir="${dist.dir}/ui-headered/" includes="*.js" />
74+
</copy>
75+
<delete dir="${dist.dir}/ui-headered/" />
76+
<for param="file">
77+
<path><fileset dir="${dist.dir}/ui/packed/" includes="*.js" /></path>
78+
<sequential>
79+
<propertyregex override="yes" property="target" input="@{file}" regexp=".+\\(.+)\.packed\.js$" replace="\1"/>
80+
<concat destfile="${dist.dir}/ui-headered/${target}.packed.js">
81+
<header file="${dist.dir}/headers/${target}.js" />
82+
<fileset file="@{file}" />
83+
</concat>
84+
</sequential>
85+
</for>
86+
<copy todir="${dist.dir}/ui/packed">
87+
<fileset dir="${dist.dir}/ui-headered/" includes="*.js" />
88+
</copy>
89+
<delete dir="${dist.dir}/ui-headered/" />
90+
<delete dir="${dist.dir}/headers/" />
91+
</target>
4892

4993
<target description="Zip the package" name="zip">
5094
<zip destfile="${dist.dir}/../${release.filename}.zip">

release/build/ant-contrib-0.6.jar

117 KB
Binary file not shown.

release/build/js.jar

-794 KB
Binary file not shown.

release/build/js/Packer.js

Lines changed: 0 additions & 209 deletions
This file was deleted.

release/build/js/ParseMaster.js

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)