Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 142538 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/dev-java/ant-core/files/1.6.5-ant (-4 / +9 lines)
Lines 82-88 Link Here
82
ANT_HOME=/usr/share/ant-core
82
ANT_HOME=/usr/share/ant-core
83
83
84
# set ANT_LIB location
84
# set ANT_LIB location
85
ANT_LIB="${ANT_HOME}/lib"
85
# add in the dependency .jar files
86
if [[ -d /usr/share/ant-tasks/lib && "${JAVA_PKG_FORCE_NOANTTASKS}" != "yes" ]] ; then
87
    LIBCLASSPATH="-lib `java-config --classpath=log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,sun-jaf-bin,sun-javamail-bin 2> /dev/null`"
88
    ANT_LIB="${ANT_HOME}/lib"
89
else
90
    ANT_LIB="${ANT_HOME}/lib-core"
91
fi
86
92
87
if [ -z "$JAVACMD" ] ; then
93
if [ -z "$JAVACMD" ] ; then
88
  if [ -n "$JAVA_HOME"  ] ; then
94
  if [ -n "$JAVA_HOME"  ] ; then
Lines 107-114 Link Here
107
  LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
113
  LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
108
fi
114
fi
109
115
110
# add in the dependency .jar files
116
    
111
LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,sun-jaf-bin,sun-javamail-bin 2> /dev/null`"
112
117
113
if [ -n "$JAVA_HOME" ] ; then
118
if [ -n "$JAVA_HOME" ] ; then
114
  if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
119
  if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
Lines 163-169 Link Here
163
fi
168
fi
164
169
165
170
166
ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
171
ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $LIBCLASSPATH $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
167
172
168
if $ant_exec_debug ; then
173
if $ant_exec_debug ; then
169
    echo $ant_exec_command
174
    echo $ant_exec_command

Return to bug 142538