Fixed documentation build. Stylebook requires Xalan 1.

PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194177 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/xml-docs/makedoc.bat b/docs/xml-docs/makedoc.bat
index b695b1a87e6034887ac567ca872fe780374820ed..7ce915ceb662e520fa858896782118f7496ebf31 100755 (executable)
--- a/docs/xml-docs/makedoc.bat
+++ b/docs/xml-docs/makedoc.bat
@@ -8,15 +8,14 @@ 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%\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%\stylebook.jar;%LIBDIR%\..\build\fop.jar
+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 ANT_HOME=%LIBDIR%
 
 
 %JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath %LOCALCLASSPATH%;%CLASSPATH% org.apache.tools.ant.Main %1 %2 %3 %4 %5
 
-echo sorry, production of html documentation is broken at the moment
 
-rem %JAVA_HOME%\bin\java.exe -classpath %LOCALCLASSPATH%;%CLASSPATH% org.apache.stylebook.StyleBook "targetDirectory=../html-docs/" fop.xml style/
+%JAVA_HOME%\bin\java.exe -classpath %LOCALCLASSPATH%;%CLASSPATH% org.apache.stylebook.StyleBook "targetDirectory=../html-docs/" fop.xml style/
 
 goto end
 
@@ -28,7 +27,3 @@ echo location of the Java Virtual Machine you want to use.
 
 :end
 
-rem set LOCALCLASSPATH=
-
-
-

diff --git a/docs/xml-docs/makedoc.sh b/docs/xml-docs/makedoc.sh
index b17a85276f0c8a3102d4b0be9830c9b3f491aa19..195af968170d5c5dcfd65753fea786b6397a30c6 100755 (executable)
--- a/docs/xml-docs/makedoc.sh
+++ b/docs/xml-docs/makedoc.sh
@@ -16,10 +16,10 @@ if [ "$JAVA_HOME" = "" ] ; then
 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/stylebook.jar:$LIBDIR/../build/fop.jar
+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
 ANT_HOME=$LIBDIR
 
-echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
+echo Building with classpath $LOCALCLASSPATH:$CLASSPATH
 echo
 
 echo Starting Ant...
@@ -27,6 +27,5 @@ echo
 
 $JAVA_HOME/bin/java -Dant.home=$ANT_HOME -classpath "$LOCALCLASSPATH:$CLASSPATH" org.apache.tools.ant.Main $*
 
-echo "sorry, production of html documentation is broken at the moment"
 
-#$JAVA_HOME/bin/java -classpath "$LOCALCLASSPATH:$CLASSPATH" org.apache.stylebook.StyleBook "targetDirectory=../html-docs/" fop.xml style/
+$JAVA_HOME/bin/java -classpath "$LOCALCLASSPATH:$CLASSPATH" org.apache.stylebook.StyleBook "targetDirectory=../html-docs/" fop.xml style/

diff --git a/lib/xalan-1.2.2.jar b/lib/xalan-1.2.2.jar
new file mode 100644 (file)
index 0000000..c8dd771
Binary files /dev/null and b/lib/xalan-1.2.2.jar differ