You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2002/08/07 14:50:30 UTC

cvs commit: xml-fop status.xml fop.bat build.sh build.bat

jeremias    2002/08/07 05:50:30

  Modified:    .        status.xml fop.bat build.sh build.bat
  Log:
  Adjust for new Avalon Framework JAR
  
  Revision  Changes    Path
  1.4       +5 -2      xml-fop/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/status.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- status.xml	6 Aug 2002 08:34:07 -0000	1.3
  +++ status.xml	7 Aug 2002 12:50:30 -0000	1.4
  @@ -1,4 +1,4 @@
  -<?xml version="1.0"?>
  +<?xml version="1.0" encoding="UTF-8" ?>
   <status>
   
     <developers>
  @@ -55,7 +55,7 @@
        Design FOP API interfaces.
       </action>
       <action context="design" dev="open">
  -     Integrate with avalon logging, URI reslover,
  +     Integrate with Jakarta Avalon: logging, configuration, URI resolver,
        component management, image caching etc.
       </action>
      </actions>
  @@ -76,6 +76,9 @@
   
     <changes>
      <release version="?" date="2002">
  +    <action dev="JM" type="update" context="build">
  +      Updated Avalon Framework JAR (with Log4J support, Bug 11274)
  +    </action>
       <action dev="KLL" type="update" context="docs"
               due-to="Victor Mote" due-to-email="vic@outfitr.com">
         Copies across overview for javadocs build.
  
  
  
  1.6       +1 -1      xml-fop/fop.bat
  
  Index: fop.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/fop.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- fop.bat	11 Apr 2002 09:33:24 -0000	1.5
  +++ fop.bat	7 Aug 2002 12:50:30 -0000	1.6
  @@ -1 +1 @@
  -java -cp build\fop.jar;lib\batik.jar;lib\xalan-2.0.0.jar;lib\xerces-1.2.3.jar;lib\avalon-framework-4.0.jar;lib\avalon-framework-cvs-20020315.jar;lib\jimi-1.0.jar org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
  +java -cp build\fop.jar;lib\batik.jar;lib\xml-apis.jar;lib\xalan-2.3.1.jar;lib\xercesImpl-2.0.1.jar;lib\avalon-framework-4.0.jar;lib\avalon-framework-cvs-20020806.jar;lib\jimi-1.0.jar org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
  
  
  
  1.21      +1 -1      xml-fop/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.sh,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.sh	6 Aug 2002 06:31:52 -0000	1.20
  +++ build.sh	7 Aug 2002 12:50:30 -0000	1.21
  @@ -27,7 +27,7 @@
   
   LIBDIR=lib
   LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xercesImpl-2.0.1.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/xml-apis.jar
  -LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020315.jar
  +LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020806.jar
   
   ANT_HOME=$LIBDIR
   # antRun must be executable (can't do this in build.xml because Ant uses antRun
  
  
  
  1.18      +31 -32    xml-fop/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.bat,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.bat	28 Jun 2002 07:52:51 -0000	1.17
  +++ build.bat	7 Aug 2002 12:50:30 -0000	1.18
  @@ -1,32 +1,31 @@
  -@echo off
  -
  -echo Fop Build System
  -echo ----------------
  -
  -if "%JAVA_HOME%" == "" goto error
  -
  -set LIBDIR=lib
  -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.4.3.jar;%LIBDIR%\xalan-2.3.1.jar;%LIBDIR%\xml-apis.jar
  -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar
  -
  -set ANT_HOME=%LIBDIR%
  -
  -echo Building with classpath %LOCALCLASSPATH%
  -
  -echo Starting Ant...
  -
  -%JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath "%LOCALCLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
  -
  -goto end
  -
  -:error
  -
  -echo ERROR: JAVA_HOME not found in your environment.
  -echo Please, set the JAVA_HOME variable in your environment to match the
  -echo location of the Java Virtual Machine you want to use.
  -
  -:end
  -
  -rem set LOCALCLASSPATH=
  -
  -pause;
  +@echo off
  +
  +echo Fop Build System
  +echo ----------------
  +
  +if "%JAVA_HOME%" == "" goto error
  +
  +set LIBDIR=lib
  +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xercesImpl-2.0.1.jar;%LIBDIR%\xalan-2.3.1.jar;%LIBDIR%\xml-apis.jar
  +
  +set ANT_HOME=%LIBDIR%
  +
  +echo Building with classpath %LOCALCLASSPATH%
  +
  +echo Starting Ant...
  +
  +%JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath "%LOCALCLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
  +
  +goto end
  +
  +:error
  +
  +echo ERROR: JAVA_HOME not found in your environment.
  +echo Please, set the JAVA_HOME variable in your environment to match the
  +echo location of the Java Virtual Machine you want to use.
  +
  +:end
  +
  +rem set LOCALCLASSPATH=
  +
  +pause;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org