Skip to content

J
jquery
Commit 4ec1b743 authored by Richard D. Worth's avatar Richard D. Worth Committed by John Resig
Browse files
Options

Simplified getting the commit date using git log --pretty. Fixed missing date in ant build.

parent 2e10af14
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
Makefile
View file @ 4ec1b743
...@@ -32,7 +32,7 @@ VER = sed s/@VERSION/${JQ_VER}/ ...@@ -32,7 +32,7 @@ VER = sed s/@VERSION/${JQ_VER}/
RHINO = java -jar ${BUILD_DIR}/js.jar RHINO = java -jar ${BUILD_DIR}/js.jar
MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar
DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'` DATE=`git log -1 --pretty=format:%ad`
all: jquery lint min all: jquery lint min
@@echo "jQuery build complete." @@echo "jQuery build complete."
......
build.xml
View file @ 4ec1b743
...@@ -60,6 +60,9 @@ ...@@ -60,6 +60,9 @@
<fileset file="src/outro.js" /> <fileset file="src/outro.js" />
</concat> </concat>
<replaceregexp match="@VERSION" replace="${version}" flags="g" byline="true" file="${JQ}" /> <replaceregexp match="@VERSION" replace="${version}" flags="g" byline="true" file="${JQ}" />
<exec executable="git" outputproperty="date">
<arg line="log -1 --pretty=format:%ad"/>
</exec>
<replaceregexp match="Date: " replace="Date: ${date}" file="${JQ}" /> <replaceregexp match="Date: " replace="Date: ${date}" file="${JQ}" />
<echo message="${JQ} built." /> <echo message="${JQ} built." />
</target> </target>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment