cvs commit: cocoon-2.1 build.bat build.sh

[joerg]

joerg       2004/03/13 09:51:10

  Modified:    .        build.bat build.sh
  Log:
  fixed java.endorsed.dirs setting, the ant script seems not to handle it via 
-D on the command line
  
  Revision  Changes    Path
  1.11      +8 -3      cocoon-2.1/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.bat,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.bat 8 Mar 2004 06:07:14 -0000       1.10
  +++ build.bat 13 Mar 2004 17:51:10 -0000      1.11
  @@ -28,11 +28,16 @@
   set OLD_ANT_HOME=%ANT_HOME%
   set ANT_HOME=tools
   
  -call %ANT_HOME%\bin\ant -Djava.endorsed.dirs=lib\endorsed -logger 
org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8 %9
  +set OLD_ANT_OPTS=%ANT_OPTS%
  +set ANT_OPTS="-Djava.endorsed.dirs=lib\endorsed"
   
  -rem ----- Restore ANT_HOME
  +call %ANT_HOME%\bin\ant -logger org.apache.tools.ant.NoBannerLogger -emacs 
%1 %2 %3 %4 %5 %6 %7 %8 %9
  +
  +rem ----- Restore ANT_HOME and ANT_OPTS
   set ANT_HOME=%OLD_ANT_HOME%
   set OLD_ANT_HOME=
  +set ANT_OPTS=%OLD_ANT_OPTS%
  +set OLD_ANT_OPTS=
   
   rem ----- Restore CLASSPATH
   set CLASSPATH=%OLD_CLASSPATH%
  
  
  
  1.10      +6 -2      cocoon-2.1/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.sh  8 Mar 2004 06:07:14 -0000       1.9
  +++ build.sh  13 Mar 2004 17:51:10 -0000      1.10
  @@ -33,12 +33,16 @@
   # ----- Use Ant shipped with Cocoon. Ignore installed in the system Ant
   OLD_ANT_HOME="$ANT_HOME"
   export ANT_HOME=tools
  +OLD_ANT_OPTS="$ANT_OPTS"
  +export ANT_OPTS="-Djava.endorsed.dirs=lib/endorsed"
   
  -"$ANT_HOME/bin/ant" -Djava.endorsed.dirs=lib/endorsed -logger 
org.apache.tools.ant.NoBannerLogger -emacs  $@
  +"$ANT_HOME/bin/ant" -logger org.apache.tools.ant.NoBannerLogger -emacs  $@
   
  -# ----- Restore ANT_HOME
  +# ----- Restore ANT_HOME and ANT_OPTS
   export ANT_HOME=$OLD_ANT_HOME
   unset OLD_ANT_HOME
  +export ANT_OPTS=$OLD_ANT_OPTS
  +unset OLD_ANT_OPTS
   
   # ----- Restore CLASSPATH
   export CLASSPATH=$OLD_CLASSPATH