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 ke...@apache.org on 2001/05/18 11:56:07 UTC

cvs commit: xml-fop/test createpdf.sh

keiron      01/05/18 02:56:07

  Modified:    .        build.bat build.xml fop.bat
               docs/bugtests runtests.bat runtests.sh
               docs/examples runtests.bat runtests.sh
               docs/examples/advanced cid-fonts.fo
               docs/examples/svg makedoc.bat
               docs/xml-docs makedoc.bat makedoc.sh
               docs/xml-docs/fop compiling.xml fonts.xml running.xml
               lib      readme
               test     createpdf.sh
  Log:
  fixed classpath for batik jar
  
  Revision  Changes    Path
  1.10      +2 -2      xml-fop/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.bat,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.bat	2001/03/14 15:54:35	1.9
  +++ build.bat	2001/05/18 09:55:29	1.10
  @@ -6,10 +6,10 @@
   if "%JAVA_HOME%" == "" goto error
   
   set LIBDIR=lib
  -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\w3c.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\jimi-1.0.jar
  +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\jimi-1.0.jar
   set ANT_HOME=%LIBDIR%
   
  -echo Building with classpath %LOCALCLASSPATH%
  +echo Building with classpath %LOCALCLASSPATH%;%CLASSPATH%
   
   echo Starting Ant...
   
  
  
  
  1.35      +2 -2      xml-fop/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build.xml	2001/05/17 07:43:55	1.34
  +++ build.xml	2001/05/18 09:55:30	1.35
  @@ -132,7 +132,7 @@
          <include name="lib/xerces-1.2.3.jar"/>
          <include name="lib/xalan-2.0.0.jar"/>
          <include name="lib/xalanj1compat.jar"/>
  -       <include name="lib/w3c.jar"/>
  +       <include name="lib/batik.jar"/>
          <include name="lib/jimi*"/>
       </fileset>
   
  @@ -275,7 +275,7 @@
       <taskdef name="runTest" classname="org.apache.fop.tools.anttasks.RunTest"/>
   
       <property name="main.class" value="org.apache.fop.apps.Fop"/>
  -    <property name="runtime.classpath" value="lib/xerces-1.2.3.jar lib/xalan-2.0.0.jar lib/xalanj1compat.jar lib/w3c.jar lib/jimi-1.0.jar"/>
  +    <property name="runtime.classpath" value="lib/xerces-1.2.3.jar lib/xalan-2.0.0.jar lib/xalanj1compat.jar lib/batik.jar lib/jimi-1.0.jar"/>
      
       <filter filtersfile="${build.src}/codegen/filter"/>
   
  
  
  
  1.2       +1 -1      xml-fop/fop.bat
  
  Index: fop.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/fop.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fop.bat	2001/04/03 01:01:30	1.1
  +++ fop.bat	2001/05/18 09:55:31	1.2
  @@ -1 +1 @@
  -java -cp fop.jar;lib\w3c.jar;lib\xalan-2.0.0.jar;lib\xerces-1.2.3.jar;lib\jimi-1.0.jar org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
  +java -cp fop.jar;lib\batik.jar;lib\xalan-2.0.0.jar;lib\xerces-1.2.3.jar;lib\jimi-1.0.jar org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
  
  
  
  1.3       +1 -1      xml-fop/docs/bugtests/runtests.bat
  
  Index: runtests.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/bugtests/runtests.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- runtests.bat	2001/01/16 08:00:47	1.2
  +++ runtests.bat	2001/05/18 09:55:36	1.3
  @@ -6,7 +6,7 @@
   if "%JAVA_HOME%" == "" goto error
   
   
  -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;..\..\lib\ant.jar;..\..\lib\buildtools.jar;..\..\lib\w3c.jar;..\..\build\fop.jar
  +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;..\..\lib\ant.jar;..\..\lib\buildtools.jar;..\..\lib\batik.jar;..\..\build\fop.jar
   set ANT_HOME=..\..\lib
   
   echo Starting Tests ...
  
  
  
  1.4       +1 -1      xml-fop/docs/bugtests/runtests.sh
  
  Index: runtests.sh
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/bugtests/runtests.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- runtests.sh	2001/03/05 03:46:19	1.3
  +++ runtests.sh	2001/05/18 09:55:37	1.4
  @@ -14,7 +14,7 @@
   fi
   
   LIBDIR=../../lib/
  -LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/w3c.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/jimi-1.0.jar
  +LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/jimi-1.0.jar
   ANT_HOME=$LIBDIR
   
   echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
  
  
  
  1.9       +1 -1      xml-fop/docs/examples/runtests.bat
  
  Index: runtests.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/examples/runtests.bat,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- runtests.bat	2001/03/14 15:54:43	1.8
  +++ runtests.bat	2001/05/18 09:55:41	1.9
  @@ -7,7 +7,7 @@
   
   
   set LIBDIR=..\..\lib
  -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\w3c.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
  +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
   set ANT_HOME=%LIBDIR%
   
   echo Starting Tests ...
  
  
  
  1.7       +1 -1      xml-fop/docs/examples/runtests.sh
  
  Index: runtests.sh
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/examples/runtests.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- runtests.sh	2001/03/05 03:46:19	1.6
  +++ runtests.sh	2001/05/18 09:55:42	1.7
  @@ -13,7 +13,7 @@
     exit 1
   fi
   LIBDIR=../../lib
  -LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/w3c.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/../build/fop.jar
  +LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/../build/fop.jar
   ANT_HOME=$LIBDIR
   
   echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
  
  
  
  1.2       +1 -1      xml-fop/docs/examples/advanced/cid-fonts.fo
  
  Index: cid-fonts.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/examples/advanced/cid-fonts.fo,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cid-fonts.fo	2001/04/01 09:46:28	1.1
  +++ cid-fonts.fo	2001/05/18 09:55:46	1.2
  @@ -283,7 +283,7 @@
        <fo:block font-family="Courier" font-size="10pt" 
         space-before.optimum="6pt"
         white-space-collapse="false" margin-left="6pt" text-align="start">
  -C:\Fop-0.18.1> set CLASSPATH=fop.jar;lib\xerces-1.2.3.jar;lib\xalan-2.0.0.jar;lib\w3c.jar
  +C:\Fop-0.18.1> set CLASSPATH=fop.jar;lib\xerces-1.2.3.jar;lib\xalan-2.0.0.jar;lib\batik.jar
        </fo:block>
   
   
  
  
  
  1.5       +1 -1      xml-fop/docs/examples/svg/makedoc.bat
  
  Index: makedoc.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/examples/svg/makedoc.bat,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- makedoc.bat	2001/03/14 15:54:47	1.4
  +++ makedoc.bat	2001/05/18 09:55:49	1.5
  @@ -6,7 +6,7 @@
   if "%JAVA_HOME%" == "" goto error
   set LIBDIR=..\..\..\lib
   set LIBDIR=lib
  -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\w3c.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
  +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
   set ANT_HOME=%LIBDIR%
   
   
  
  
  
  1.12      +1 -1      xml-fop/docs/xml-docs/makedoc.bat
  
  Index: makedoc.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/xml-docs/makedoc.bat,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- makedoc.bat	2001/03/28 05:21:16	1.11
  +++ makedoc.bat	2001/05/18 09:55:51	1.12
  @@ -8,7 +8,7 @@
   if "%JAVA_HOME%" == "" goto error
   
   set LIBDIR=..\..\lib
  -set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\w3c.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-1.2.2.jar;%LIBDIR%\bsf.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\stylebook.jar;%LIBDIR%\..\build\fop.jar
  +set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-1.2.2.jar;%LIBDIR%\bsf.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\stylebook.jar;%LIBDIR%\..\build\fop.jar
   set ANT_HOME=%LIBDIR%
   
   
  
  
  
  1.13      +1 -1      xml-fop/docs/xml-docs/makedoc.sh
  
  Index: makedoc.sh
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/xml-docs/makedoc.sh,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- makedoc.sh	2001/03/28 05:21:16	1.12
  +++ makedoc.sh	2001/05/18 09:55:52	1.13
  @@ -16,7 +16,7 @@
   fi
   
   LIBDIR=../../lib
  -LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/w3c.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-1.2.2.jar:$LIBDIR/bsf.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/stylebook.jar:$LIBDIR/../build/fop.jar
  +LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-1.2.2.jar:$LIBDIR/bsf.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/stylebook.jar:$LIBDIR/../build/fop.jar
   ANT_HOME=$LIBDIR
   
   echo Building with classpath $LOCALCLASSPATH:$CLASSPATH
  
  
  
  1.8       +1 -1      xml-fop/docs/xml-docs/fop/compiling.xml
  
  Index: compiling.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/xml-docs/fop/compiling.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- compiling.xml	2001/03/25 23:02:18	1.7
  +++ compiling.xml	2001/05/18 09:55:56	1.8
  @@ -27,7 +27,7 @@
       <p>If you have problems compiling Fop, please try this first: </p>
       <ul>
         <li>delete the build directory completely and try a new build from scratch</li>
  -      <li>check, whether you have an older version of xerces.jar, xalan.jar, w3c.jar somewhere in 
  +      <li>check, whether you have an older version of xerces.jar, xalan.jar, batik.jar somewhere in 
             you classpath.</li>
         </ul>
         <p>If you still have problems, please look at the
  
  
  
  1.4       +1 -1      xml-fop/docs/xml-docs/fop/fonts.xml
  
  Index: fonts.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/xml-docs/fop/fonts.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- fonts.xml	2001/03/25 23:02:18	1.3
  +++ fonts.xml	2001/05/18 09:55:57	1.4
  @@ -18,7 +18,7 @@
   			<p>	Run the class org.apache.fop.fonts.apps.PFMReader to generate the XML file.
   			</p>
   			<p>
  -				<code>java -cp fop.jar;xerces.jar;xalan.jar;w3c.jar</code>
  +				<code>java -cp fop.jar;xerces.jar;xalan.jar;batik.jar</code>
   			</p>
   			<p>
   				<code>org.apache.fop.fonts.apps.PFMReader pfm-file xml-file</code>
  
  
  
  1.12      +1 -1      xml-fop/docs/xml-docs/fop/running.xml
  
  Index: running.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/docs/xml-docs/fop/running.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- running.xml	2001/03/25 23:02:18	1.11
  +++ running.xml	2001/05/18 09:55:58	1.12
  @@ -17,7 +17,7 @@
               </li>
               <li>An XSLT processor 
               </li>
  -            <li>The SVG library w3c.jar corresponding to the SVG Candidate Recommendation (02 November 2000).
  +            <li>The SVG library batik.jar is the library from the batik project at xml.apache.org.
               </li>
               <li>The imaging library Jimi from Sun
               </li>
  
  
  
  1.4       +2 -2      xml-fop/lib/readme
  
  Index: readme
  ===================================================================
  RCS file: /home/cvs/xml-fop/lib/readme,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- readme	2001/02/04 06:07:56	1.3
  +++ readme	2001/05/18 09:56:02	1.4
  @@ -4,7 +4,7 @@
   ant.jar         Ant is the scripting tool which is used to build Fop or to run 
                   the test scripts. see build.xml in root for more information
   
  -w3c.jar         the svg library from the w3 consortium
  +batik.jar       the svg library from Batik at xml.apache.org
   
   
   buildtools.jar  Ant tasks required for building FOP. Rebuild with 
  @@ -13,4 +13,4 @@
   		buildtools.jar, make sure you have both Xalan 1 and
   		Xalan 2 in the classpath when building it.)
   
  -stylebook.jar	Jar used for creating the FOP website
  \ No newline at end of file
  +stylebook.jar	Jar used for creating the FOP website
  
  
  
  1.2       +1 -1      xml-fop/test/createpdf.sh
  
  Index: createpdf.sh
  ===================================================================
  RCS file: /home/cvs/xml-fop/test/createpdf.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- createpdf.sh	2001/05/16 12:18:09	1.1
  +++ createpdf.sh	2001/05/18 09:56:05	1.2
  @@ -1,3 +1,3 @@
   # this can be used to create pdf output of the testsuite files
   
  -$JAVA_HOME/bin/java -cp ../build/fop.jar:../lib/w3c.jar:../lib/xalan-2.0.0.jar:../lib/xerces-1.2.3.jar:../lib/jimi-1.0.jar org.apache.fop.tools.TestConverter -pdf -b ./ basictests.xml
  +$JAVA_HOME/bin/java -cp ../build/fop.jar:../lib/batik.jar:../lib/xalan-2.0.0.jar:../lib/xerces-1.2.3.jar:../lib/jimi-1.0.jar org.apache.fop.tools.TestConverter -pdf -b ./ basictests.xml
  
  
  

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