diff options
| author | michelou <michelou@epfl.ch> | 2005-09-09 15:41:49 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-09-09 15:41:49 +0000 |
| commit | ce8cd951e79b99ede189120b59e43d7924fd9fb0 (patch) | |
| tree | 434db025a1270996c1f002df07190af2f318976d /ant-build-nsc.sh | |
| parent | 2bcd0daa548bf8ec6ae7e8a321eb959b42a52a04 (diff) | |
| download | scala-ce8cd951e79b99ede189120b59e43d7924fd9fb0.tar.gz scala-ce8cd951e79b99ede189120b59e43d7924fd9fb0.tar.bz2 scala-ce8cd951e79b99ede189120b59e43d7924fd9fb0.zip | |
- moved some operations to Ant buildfile.
Diffstat (limited to 'ant-build-nsc.sh')
| -rwxr-xr-x | ant-build-nsc.sh | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/ant-build-nsc.sh b/ant-build-nsc.sh index f95e8a1493..86e2c245d2 100755 --- a/ant-build-nsc.sh +++ b/ant-build-nsc.sh @@ -7,38 +7,25 @@ . ant-common.sh ############################################################################## -# jars for `scalac' task MUST EXIST - -if ! addJar $fjbg_jar fjbg_jar; then exit -1; fi -if ! addJar $scala_jar scala_jar; then - $ECHO "try: make jar target=LIBRARY" && exit -1; -fi -if ! addJar $tools_jar tools_jar; then - $ECHO "try: make jar target=TOOLS" && exit -1; -fi - -############################################################################## -# jars for `pico' task MUST EXIST including the `-scala-hacks' enabled +# ant build -if ! addJar $jaco_jar jaco_jar; then exit -1; fi +ANT_CONFIG_BUILDFILE=build-nsc.xml +ANT_BUILDFILE=concrete-$ANT_CONFIG_BUILDFILE +ANT_EXCLUDEFILE=developer/${USER}/build-nsc-excludes.xml -############################################################################## -# ant build +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_CONFIGFILE=build-nsc.xml -ANT_BUILDFILE=concrete-$ANT_CONFIGFILE -ANT_EXCLFILE=developer/${USER}/build-nsc-excludes.xml +CLASSPATH=$nsc_fjbg_jar:$nsc_scala_jar:$nsc_tools_jar:$nsc_jaco_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" ############################################################################## |