diff options
| author | michelou <michelou@epfl.ch> | 2005-09-13 09:18:22 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-09-13 09:18:22 +0000 |
| commit | b6f8d5a603fab46e6e8e30fc85a35d36fda6f05e (patch) | |
| tree | 620dfe442ff680e55f6034bd21716932ac534570 | |
| parent | ec5c9dff4b975f2532bf6ce900cddd16c29ec70e (diff) | |
| download | scala-b6f8d5a603fab46e6e8e30fc85a35d36fda6f05e.tar.gz scala-b6f8d5a603fab46e6e8e30fc85a35d36fda6f05e.tar.bz2 scala-b6f8d5a603fab46e6e8e30fc85a35d36fda6f05e.zip | |
- moved handling of exclude file to ant-common.sh
| -rwxr-xr-x | ant-build-nsc.sh | 13 | ||||
| -rwxr-xr-x | ant-common.sh | 11 | ||||
| -rwxr-xr-x | ant-test-nsc.sh | 13 |
3 files changed, 13 insertions, 24 deletions
diff --git a/ant-build-nsc.sh b/ant-build-nsc.sh index 86e2c245d2..ef273d6a9f 100755 --- a/ant-build-nsc.sh +++ b/ant-build-nsc.sh @@ -4,22 +4,11 @@ ############################################################################## # $Id$ -. ant-common.sh +. ant-common.sh build-nsc ############################################################################## # ant build -ANT_CONFIG_BUILDFILE=build-nsc.xml -ANT_BUILDFILE=concrete-$ANT_CONFIG_BUILDFILE -ANT_EXCLUDEFILE=developer/${USER}/build-nsc-excludes.xml - -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 - CLASSPATH=$nsc_fjbg_jar:$nsc_scala_jar:$nsc_tools_jar:$nsc_jaco_jar # for debugging your classpath diff --git a/ant-common.sh b/ant-common.sh index df29b1865b..e607119349 100755 --- a/ant-common.sh +++ b/ant-common.sh @@ -24,4 +24,15 @@ SED=sed $ANT_CMD -Dplatform=unix -q -f setenv-nsc.xml . env.sh +ANT_CONFIG_BUILDFILE=$1.xml +ANT_BUILDFILE=concrete-$ANT_CONFIG_BUILDFILE +ANT_EXCLUDEFILE=developer/${USER}/$1-excludes.xml + +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 + ############################################################################## diff --git a/ant-test-nsc.sh b/ant-test-nsc.sh index 438cfb9199..66750f1724 100755 --- a/ant-test-nsc.sh +++ b/ant-test-nsc.sh @@ -4,22 +4,11 @@ ############################################################################## # $Id$ -. ant-common.sh +. ant-common.sh test-nsc ############################################################################## # ant build -ANT_CONFIG_BUILDFILE=test-nsc.xml -ANT_BUILDFILE=concrete-$ANT_CONFIG_BUILDFILE -ANT_EXCLUDELFILE=developer/${USER}/test-nsc-excludes.xml - -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 - CLASSPATH=$nsc_fjbg_jar:$nsc_scala_jar:$nsc_tools_jar:$nsc_nsc_jar:$nsc_nsc4ant_jar # for debugging your classpath |