diff options
| author | Peter Reilly <peterreilly@apache.org> | 2006-10-12 22:51:06 +0000 |
|---|---|---|
| committer | Peter Reilly <peterreilly@apache.org> | 2006-10-12 22:51:06 +0000 |
| commit | c7e4024d63f27b2fd647075fa534a63eb0053b8e (patch) | |
| tree | 07ec2bc3e06ceaa074f6fc84c666215c408fa55c /src/script/ant | |
| parent | 49f611c10cf584b49e49cca329a18c2d22f1daca (diff) | |
| download | ant-c7e4024d63f27b2fd647075fa534a63eb0053b8e.tar.gz | |
place the OPT_JAR_LIST in the correct place
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@463483 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/script/ant')
| -rw-r--r-- | src/script/ant | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/script/ant b/src/script/ant index eae54a7f2..46d054746 100644 --- a/src/script/ant +++ b/src/script/ant @@ -153,13 +153,6 @@ fi # variable if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)" - # If the user requested to try to add some other jars to the classpath - if [ -n "$OPT_JAR_LIST" ] ; then - _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)" - if [ -n "$_OPTCLASSPATH" ] ; then - LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH" - fi - fi # If no optional jars have been specified then build the default list if [ -z "$OPT_JAR_LIST" ] ; then @@ -182,6 +175,14 @@ if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then done fi + # If the user requested to try to add some other jars to the classpath + if [ -n "$OPT_JAR_LIST" ] ; then + _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)" + if [ -n "$_OPTCLASSPATH" ] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH" + fi + fi + # Explicitly add javac path to classpath, assume JAVA_HOME set # properly in rpm mode if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then |