2961d62242
Fix PR pkg/42990
* Lexically scoped local properties, i.e. properties that are only defined
inside a target, sequential block or similar environment.
* <import> can now import from any file- or URL-providing resource - this
includes <javaresource>.
* Various improvements to the directory scanning code that help with symbolic
link cycles (as can be found on MacOS X Java installations for example) and
improve scanning performance. For big directory trees the improvement is
dramatic.
* The way developers can extend Ant's property expansion algorithm has been
rewritten (breaking the older API) to be easier to use and be more powerful.
a new top level element extension-point allows build files to be extended
with custom targets more easily
* At the same time the if and unless attributes have been rewritten to do the
expected thing if applied to a property expansion (i.e. if="${foo}" will mean
"yes, do it" if ${foo} expands to true, in Ant 1.7.1 it would mean "no"
unless a property named "true" existed). This adds "testing conditions" as a
new use-case to property expansion.
* Ant now requires Java 1.4 or later
* new task include provides an alternative to <import> that should be preferred
when you don't want to override any targets
* numerous bug fixes and improvements as documented in Bugzilla and in WHATSNEW
34 lines
779 B
Text
34 lines
779 B
Text
$NetBSD: patch-aa,v 1.3 2010/04/13 21:05:42 tonio Exp $
|
|
|
|
--- bin/ant.orig 2010-02-02 01:35:22.000000000 +0100
|
|
+++ bin/ant 2010-04-13 22:52:56.000000000 +0200
|
|
@@ -91,6 +91,15 @@
|
|
MINGW*) mingw=true ;;
|
|
esac
|
|
|
|
+if [ "$ANT_HOME" = "" ] ; then
|
|
+ # try to find ANT
|
|
+ ANT_HOME=@PREFIX@
|
|
+fi
|
|
+
|
|
+if [ "$JAVA_HOME" = "" ] ; then
|
|
+ JAVA_HOME=@JAVA_HOME@
|
|
+fi
|
|
+
|
|
if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
|
|
## resolve links - $0 may be a link to ant's home
|
|
PRG="$0"
|
|
@@ -129,7 +138,12 @@
|
|
fi
|
|
|
|
# set ANT_LIB location
|
|
-ANT_LIB="${ANT_HOME}/lib"
|
|
+ANT_LIB="${ANT_HOME}/lib/java/ant"
|
|
+
|
|
+# use ${PREFIX}/bin/java (wrapper)
|
|
+if [ "$JAVACMD" = "" ] && [ -f @PREFIX@/bin/java ] ; then
|
|
+ JAVACMD=@PREFIX@/bin/java
|
|
+fi
|
|
|
|
if [ -z "$JAVACMD" ] ; then
|
|
if [ -n "$JAVA_HOME" ] ; then
|