]>
Commit | Line | Data |
---|---|---|
551bdb22 JK |
1 | --- apache-ant-1.6.2/src/script/ant~ 2004-07-16 08:56:50.000000000 +0100 |
2 | +++ apache-ant-1.6.2/src/script/ant 2004-11-05 15:14:23.000000000 +0000 | |
3 | @@ -159,6 +159,28 @@ | |
4 | # variable | |
5 | if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then | |
6 | LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)" | |
7 | + | |
8 | + # If no optional jars have been specified then build the default list | |
9 | + if [ -z "$OPT_JAR_LIST" ] ; then | |
10 | + for file in /etc/ant.d/*; do | |
11 | + if [ -f "$file" ]; then | |
12 | + case "$file" in | |
13 | + *~) ;; | |
14 | + *#*) ;; | |
15 | + *.rpmsave) ;; | |
16 | + *.rpmnew) ;; | |
17 | + *) | |
18 | + for dep in `cat "$file"`; do | |
19 | + case "$OPT_JAR_LIST" in | |
20 | + *"$dep"*) ;; | |
21 | + *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep" | |
22 | + esac | |
23 | + done | |
24 | + esac | |
25 | + fi | |
26 | + done | |
27 | + fi | |
28 | + | |
29 | # If the user requested to try to add some other jars to the classpath | |
30 | if [ -n "$OPT_JAR_LIST" ] ; then | |
31 | _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)" |