diff options
author | Paul Phillips <paulp@improving.org> | 2012-01-30 13:47:49 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-01-30 13:47:49 -0800 |
commit | 74a252e668959dd2cf4808132473d8b15bb606af (patch) | |
tree | 51960e576adc988ec67a1b9fa3743b897f655451 | |
parent | 57bccd7e757ee801ffec7bf1669c424edf33e81f (diff) | |
parent | 263aa2ead1f599f48b218027eb9550745fef43f1 (diff) | |
download | scala-74a252e668959dd2cf4808132473d8b15bb606af.tar.gz scala-74a252e668959dd2cf4808132473d8b15bb606af.tar.bz2 scala-74a252e668959dd2cf4808132473d8b15bb606af.zip |
Merge branch 'master' into inline
-rw-r--r-- | build.xml | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -213,11 +213,22 @@ INITIALISATION <condition property="starr.absent"> <not><available file="${lib.dir}/scala-library.jar"/></not> </condition> + + <!-- It's such a PITA to perform the amazing && in ant, forget it. + I'll just check the compiler jar. --> + <target name="init.starr.check"> + <uptodate property="starr.compiler.uptodate" + srcfile="${lib.dir}/scala-compiler.jar.desired.sha1" + targetfile="${lib.dir}/scala-compiler.jar" /> + </target> - <target name="init.starr" if="starr.absent"> - <echo level="warn" message="Downloading bootstrap libs. (To do this by hand, run ./pull-binary-libs.sh)"/> + <target name="init.starr" depends="init.starr.check" unless="starr.compiler.uptodate"> + <echo level="warn" message="Updating bootstrap libs. (To do this by hand, run ./pull-binary-libs.sh)"/> <exec osfamily="unix" vmlauncher="false" executable="./pull-binary-libs.sh" failifexecutionfails="true" /> <exec osfamily="windows" vmlauncher="false" executable="pull-binary-libs.sh" failifexecutionfails="true" /> + <!-- uptodate task needs to know these are what's in the sha. --> + <touch file="${lib.dir}/scala-library.jar" /> + <touch file="${lib.dir}/scala-compiler.jar" /> </target> <target name="init" depends="init.starr"> |