Skip to content

Commit 1eb9974

Browse files
Craga89Craga89
committed
Date macro is now properly defined in build.xml file.
1 parent 2e10af1 commit 1eb9974

File tree

1 file changed

+40
-36
lines changed

1 file changed

+40
-36
lines changed

‎build.xml‎

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<project name="jQuery" default="jquery" basedir=".">
22

33
<loadfile property="version" srcfile="version.txt" />
4-
<property description="Folder for jquery and min target" name="dist" value="./dist" />
4+
<exec outputproperty="date" executable="git">
5+
<arg line="log --pretty=format:'%ad' -1" />
6+
</exec>
57

6-
<property name="JQ" value="${dist}/jquery.js" />
7-
<property name="JQ_MIN" value="${dist}/jquery.min.js" />
8+
<property description="Folder for jquery and min target" name="dist" value="./dist" />
9+
10+
<property name="JQ" value="${dist}/jquery.js" />
11+
<property name="JQ_MIN" value="${dist}/jquery.min.js" />
812

913
<loadfile property="sizzle-exports" srcfile="src/sizzle-jquery.js" />
1014

@@ -36,36 +40,36 @@
3640
<echo message="git pull sizzle: ${git-sizzle}" />
3741
</target>
3842

39-
<target name="jquery" depends="qunit-clone,qunit-pull,sizzle-clone,sizzle-pull" description="Main jquery build, concatenates source files and replaces @VERSION">
40-
<echo message="Building ${JQ}" />
41-
<copy file="src/sizzle/sizzle.js" tofile="src/selector.js" overwrite="true" />
42-
<replaceregexp match="// EXPOSE" replace="${sizzle-exports}" file="src/selector.js" />
43-
<mkdir dir="${dist}" />
44-
<concat destfile="${JQ}">
45-
<fileset file="src/intro.js" />
46-
<fileset file="src/core.js" />
47-
<fileset file="src/support.js" />
48-
<fileset file="src/data.js" />
49-
<fileset file="src/queue.js" />
50-
<fileset file="src/attributes.js" />
51-
<fileset file="src/event.js" />
52-
<fileset file="src/selector.js" />
53-
<fileset file="src/traversing.js" />
54-
<fileset file="src/manipulation.js" />
55-
<fileset file="src/css.js" />
56-
<fileset file="src/ajax.js" />
57-
<fileset file="src/effects.js" />
58-
<fileset file="src/offset.js" />
59-
<fileset file="src/dimensions.js" />
60-
<fileset file="src/outro.js" />
61-
</concat>
62-
<replaceregexp match="@VERSION" replace="${version}" flags="g" byline="true" file="${JQ}" />
43+
<target name="jquery" depends="qunit-clone,qunit-pull,sizzle-clone,sizzle-pull" description="Main jquery build, concatenates source files and replaces @VERSION">
44+
<echo message="Building ${JQ}" />
45+
<copy file="src/sizzle/sizzle.js" tofile="src/selector.js" overwrite="true" />
46+
<replaceregexp match="// EXPOSE" replace="${sizzle-exports}" file="src/selector.js" />
47+
<mkdir dir="${dist}" />
48+
<concat destfile="${JQ}">
49+
<fileset file="src/intro.js" />
50+
<fileset file="src/core.js" />
51+
<fileset file="src/support.js" />
52+
<fileset file="src/data.js" />
53+
<fileset file="src/queue.js" />
54+
<fileset file="src/attributes.js" />
55+
<fileset file="src/event.js" />
56+
<fileset file="src/selector.js" />
57+
<fileset file="src/traversing.js" />
58+
<fileset file="src/manipulation.js" />
59+
<fileset file="src/css.js" />
60+
<fileset file="src/ajax.js" />
61+
<fileset file="src/effects.js" />
62+
<fileset file="src/offset.js" />
63+
<fileset file="src/dimensions.js" />
64+
<fileset file="src/outro.js" />
65+
</concat>
66+
<replaceregexp match="@VERSION" replace="${version}" flags="g" byline="true" file="${JQ}" />
6367
<replaceregexp match="Date: " replace="Date: ${date}" file="${JQ}" />
64-
<echo message="${JQ} built." />
65-
</target>
68+
<echo message="${JQ} built." />
69+
</target>
6670

67-
<target name="min" depends="jquery" description="Remove all comments and whitespace, no compression, great in combination with GZip">
68-
<echo message="Building ${JQ_MIN}" />
71+
<target name="min" depends="jquery" description="Remove all comments and whitespace, no compression, great in combination with GZip">
72+
<echo message="Building ${JQ_MIN}" />
6973
<apply executable="java" parallel="false" verbose="true" dest="${dist}">
7074
<fileset dir="${dist}">
7175
<include name="jquery.js" />
@@ -89,12 +93,12 @@
8993
<filelist files="dist/tmpmin"/>
9094
</concat>
9195
<delete file="dist/tmpmin"/>
92-
<echo message="${JQ_MIN} built." />
93-
</target>
96+
<echo message="${JQ_MIN} built." />
97+
</target>
9498

95-
<target name="clean">
96-
<delete dir="${dist}" />
97-
</target>
99+
<target name="clean">
100+
<delete dir="${dist}" />
101+
</target>
98102

99103
<target name="openAjaxMetadata">
100104
<property name="target" value="openAjaxMetadata-jquery-${version}.xml" />

0 commit comments

Comments
 (0)