diff --git a/WHATSNEW b/WHATSNEW index c1fb6fa7b..9bd27a4ba 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -16,7 +16,7 @@ Changes that could break older environments: Other changes: -------------- -* A GUI Frontend: Antidote +* A GUI Frontend: Antidote. This is currently in development. * New tasks: stylebook, propertyfile, depend, antlr, telnet, csc, ilasm, transform, javah, several clearcase tasks @@ -77,6 +77,7 @@ Fixed bugs: CMP files are included by parsing the weblogic deployment descriptor rather than relying on the naming convention used in ant 1.2 Include super classes and super interfaces into the generated ejb jar files + nested element allows support classes to be included in the EJB jar * now correctly deals with spaces in arguments @@ -97,6 +98,8 @@ Fixed bugs: * and will search for the resource "foo" instead of "/org/apache/tools/ant/taskdefs/foo" when given a relative resource name foo. + +* Handle build files in directories whose name contained a "#" character Changes from Ant 1.1 to Ant 1.2 =============================== diff --git a/build.bat b/build.bat index 16841afc7..76e9edfbd 100755 --- a/build.bat +++ b/build.bat @@ -1,8 +1,10 @@ @echo off +set _CP=CLASSPATH + if exist build\classes\org\apache\tools\ant\Main.class goto doBuild -bootstrap.bat %1 %2 %3 %4 %5 %6 %7 %8 +call bootstrap.bat %1 %2 %3 %4 %5 %6 %7 %8 :doBuild @@ -33,11 +35,11 @@ echo. :runAnt set NEW_ANT_HOME=%ANT_HOME% -if "x%ANT_HOME%" == "x" set NEW_ANT_HOME=dist +if "%ANT_HOME%" == "" set NEW_ANT_HOME=dist set CLASSPATH=%LOCALCLASSPATH% set LOCALCLASSPATH= %_JAVACMD% -classpath %CLASSPATH% %ANT_OPTS% org.apache.tools.ant.Main "-Dant.home=%NEW_ANT_HOME%" -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8 -set CLASSPATH= +set CLASSPATH=%_CP% set NEW_ANT_HOME= set _JAVACMD= diff --git a/build.xml b/build.xml index a6f21c1be..baed01c8a 100644 --- a/build.xml +++ b/build.xml @@ -357,6 +357,9 @@ + + + @@ -443,18 +446,23 @@ - + - + + + + + +