Jan: Thanks for catching my breakage. If Gump's happy, I'm happy. Of course there may be something else about the bootstrap layer I don't know...
Thanks again, Matt --- [EMAIL PROTECTED] wrote: > Matt, > > you has done the he change in the build.xml and > introduced the <intersect> element [1]. > What was your intention? Is my patch ok (I am > increasing the bootstrap-layer!) ? > > Jan > > [1] > http://svn.apache.org/viewvc/ant/core/trunk/build.xml?r1=447538&r2=447549&diff_format=h > > > > >-----Ursprüngliche Nachricht----- > >Von: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > >Gesendet: Dienstag, 19. September 2006 12:30 > >An: [EMAIL PROTECTED] > >Betreff: svn commit: r447800 - in /ant/core/trunk: > >bootstrap.bat bootstrap.sh > > > >Author: jhm > >Date: Tue Sep 19 03:29:36 2006 > >New Revision: 447800 > > > >URL: > http://svn.apache.org/viewvc?view=rev&rev=447800 > >Log: > >Should make Gump happy: > > > > # Start Time: Tue, 19 Sep 2006 00:26:54 (PDT) > > # End Time: Tue, 19 Sep 2006 00:27:10 (PDT) > > > > BUILD FAILED > > /x1/gump/public/workspace/ant/build.xml:1072: > The > >following error occurred while executing this line: > > /x1/gump/public/workspace/ant/build.xml:500: > resourcecount > >doesn't support the nested "intersect" element. > > > ><intersect> is a Resource and Resources were not > part of the > >thin-layer of Ant's bootstrap. > > > >Modified: > > ant/core/trunk/bootstrap.bat > > ant/core/trunk/bootstrap.sh > > > >Modified: ant/core/trunk/bootstrap.bat > >URL: > >http://svn.apache.org/viewvc/ant/core/trunk/bootstrap.bat?view= > >diff&rev=447800&r1=447799&r2=447800 > >=============================================================== > >=============== > >--- ant/core/trunk/bootstrap.bat (original) > >+++ ant/core/trunk/bootstrap.bat Tue Sep 19 > 03:29:36 2006 > >@@ -8,9 +8,9 @@ > > REM The ASF licenses this file to You under the > Apache > >License, Version 2.0 REM (the "License"); you may > not use > >this file except in compliance with REM the > License. You > >may obtain a copy of the License at -REM > >+REM > > REM > http://www.apache.org/licenses/LICENSE-2.0 > >-REM > >+REM > > REM Unless required by applicable law or agreed > to in > >writing, software REM distributed under the > License is > >distributed on an "AS IS" BASIS, REM WITHOUT > WARRANTIES OR > >CONDITIONS OF ANY KIND, either express or implied. > >@@ -62,7 +62,7 @@ > > echo. > > echo ... Compiling Ant Classes > > > >-"%JAVAC%" %BOOTJAVAC_OPTS% -d %CLASSDIR% > %TOOLS%\bzip2\*.java > >%TOOLS%\tar\*.java %TOOLS%\zip\*.java > %TOOLS%\ant\*.java > >%TOOLS%\ant\types\*.java > %TOOLS%\ant\taskdefs\*.java > >%TOOLS%\ant\util\regexp\RegexpMatcher.java > >%TOOLS%\ant\util\regexp\RegexpMatcherFactory.java > >%TOOLS%\ant\taskdefs\condition\*.java > >%TOOLS%\ant\taskdefs\compilers\*.java > >+"%JAVAC%" %BOOTJAVAC_OPTS% -d %CLASSDIR% > %TOOLS%\bzip2\*.java > >+%TOOLS%\tar\*.java %TOOLS%\zip\*.java > %TOOLS%\ant\*.java > >+%TOOLS%\ant\types\*.java > %TOOLS%\ant\taskdefs\*.java > >+%TOOLS%\ant\util\regexp\RegexpMatcher.java > >+%TOOLS%\ant\util\regexp\RegexpMatcherFactory.java > >+%TOOLS%\ant\taskdefs\condition\*.java > >+%TOOLS%\ant\taskdefs\compilers\*.java > >+%TOOLS%\ant\types\resources\*.java > > > > if ERRORLEVEL 1 goto mainend > > > >@@ -92,7 +92,7 @@ > > goto doneStart > > > > :win9xStart > >-rem Slurp the command line arguments. This loop > allows for > >an unlimited number of > >+rem Slurp the command line arguments. This loop > allows for an > >+unlimited number of > > rem agruments (up to the command line limit, > anyway). > > > > set ANT_CMD_LINE_ARGS= > >@@ -104,7 +104,7 @@ > > goto setupArgs > > > > :doneStart > >-rem This label provides a place for the argument > list loop to > >break out > >+rem This label provides a place for the argument > list loop to > >break out > > rem and for NT handling to skip to. > > > > "%JAVA%" %ANT_OPTS% org.apache.tools.ant.Main > -emacs > >%ANT_CMD_LINE_ARGS% bootstrap @@ -135,4 +135,3 @@ > set > >LOCALCLASSPATH= set OLDANTHOME= set TOOLS= > >- > > > >Modified: ant/core/trunk/bootstrap.sh > >URL: > >http://svn.apache.org/viewvc/ant/core/trunk/bootstrap.sh?view=d > >iff&rev=447800&r1=447799&r2=447800 > >=============================================================== > >=============== > >--- ant/core/trunk/bootstrap.sh (original) > >+++ ant/core/trunk/bootstrap.sh Tue Sep 19 03:29:36 > 2006 > >@@ -22,7 +22,7 @@ > > CYGWIN*) cygwin=true ;; > > Darwin*) darwin=true > > if [ -z "$JAVA_HOME" ] ; then > >- > >JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home > > >+ > >JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home > > fi > > ;; > > esac > >@@ -131,11 +131,12 @@ > > ${TOOLS}/ant/util/regexp/RegexpMatcher.java \ > > > ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \ > > ${TOOLS}/ant/types/*.java \ > >+ ${TOOLS}/ant/types/resources/*.java \ > > ${TOOLS}/ant/*.java > ${TOOLS}/ant/taskdefs/*.java \ > > ${TOOLS}/ant/taskdefs/compilers/*.java \ > > ${TOOLS}/ant/taskdefs/condition/*.java > > ret=$? > >-if [ $ret != 0 ]; then > >+if [ $ret != 0 ]; then > > echo ... Failed compiling Ant classes ! > > exit $ret > > fi > >@@ -153,7 +154,7 @@ > > > > "${JAVACMD}" -classpath "${CLASSPATH}" > -Dant.home=. $ANT_OPTS > >org.apache.tools.ant.Main -emacs "$@" bootstrap > ret=$? > >-if [ $ret != 0 ]; then > >+if [ $ret != 0 ]; then > > echo ... Failed Building Ant Distribution ! > > exit $ret > > fi > >@@ -164,4 +165,4 @@ > > rm -rf ${CLASSDIR} > > rm -rf bin > > > >-echo ... Done Bootstrapping Ant Distribution > >+echo ... Done Bootstrapping Ant Distribution > >\ No newline at end of file > > > > > > > >--------------------------------------------------------------------- > >To unsubscribe, e-mail: > [EMAIL PROTECTED] For > >additional commands, e-mail: > [EMAIL PROTECTED] > === message truncated === __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
