diff options
Diffstat (limited to 'ant-test-nsc.sh')
-rwxr-xr-x | ant-test-nsc.sh | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/ant-test-nsc.sh b/ant-test-nsc.sh index 0483f601d3..2f0d927842 100755 --- a/ant-test-nsc.sh +++ b/ant-test-nsc.sh @@ -7,41 +7,25 @@ . ant-common.sh ############################################################################## -# jar with fjbg, scala runtime - -if ! addJar $fjbg_jar fjbg_jar; then exit -1; fi -if ! addJar $tools_jar tools_jar; then exit -1; fi -if ! addJar $scala_jar scala_jar; then - $ECHO "try: make jar target=LIBRARY" && exit -1; -fi +# ant build -############################################################################## -# jars for `nsc' task (once its compiled) +ANT_CONFIG_BUILDFILE=test-nsc.xml +ANT_BUILDFILE=concrete-$ANT_CONFIG_BUILDFILE +ANT_EXCUDELFILE=developer/${USER}/test-nsc-excludes.xml -if ! addJar $nsc4ant_jar nsc4ant_jar; then - $ECHO "try 'sh ant-build-nsc.sh build.nsc4'" && exit -1; -fi -if ! addJar $nsc_jar nsc_jar; then - $ECHO "try 'sh ant-build-nsc.sh'" && exit -1; +if [ -f "$ANT_EXCLUDEFILE" ]; then + $SED -e "s#userExcludes\ \"\"#userExcludes\ SYSTEM\ \"$ANT_EXCLUDEFILE\"#" \ + < $ANT_CONFIG_BUILDFILE > $ANT_BUILDFILE; + else + $CP $ANT_CONFIG_BUILDFILE $ANT_BUILDFILE; fi -############################################################################## -# ant build - -ANT_CONFIGFILE=test-nsc.xml -ANT_BUILDFILE=concrete-$ANT_CONFIGFILE -ANT_EXCLFILE=developer/${USER}/test-nsc-excludes.xml +CLASSPATH=$nsc_fjbg_jar:$nsc_scala_jar:$nsc_tools_jar:$nsc_nsc_jar:$nsc_nsc4ant_jar # for debugging your classpath #echo CLASSPATH=$CLASSPATH -if [ -f "$ANT_EXCLFILE" ]; then - $SED -e "s#userExcludes\ \"\"#userExcludes\ SYSTEM\ \"$ANT_EXCLFILE\"#" \ - < $ANT_CONFIGFILE > $ANT_BUILDFILE; - else - $CP $ANT_CONFIGFILE $ANT_BUILDFILE; -fi -CLASSPATH="$CLASSPATH" $ANT_CMD -f "$ANT_BUILDFILE" $* +CLASSPATH="$CLASSPATH" $ANT_CMD -Dplatform=unix -f "$ANT_BUILDFILE" $* $RM "$ANT_BUILDFILE" ############################################################################## |