You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by cu...@locus.apache.org on 2000/03/02 18:39:35 UTC
cvs commit: xml-xalan/xdocs Makefile
curcuru 00/03/02 09:39:34
Modified: . make.include
xdocs Makefile
Log:
Update to complete xdocs build properly with new xml-site-style file and JDK 1.1/1.2 differences PR: SCUU4GZJZ8
Revision Changes Path
1.7 +6 -2 xml-xalan/make.include
Index: make.include
===================================================================
RCS file: /home/cvs/xml-xalan/make.include,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- make.include 2000/03/01 18:54:30 1.6
+++ make.include 2000/03/02 17:39:33 1.7
@@ -56,8 +56,12 @@
# References to other tools
RM = rm -f
+RM-RF = rm -rf
CP = cp -f
UPDIR := ..
+# References to standard UNIX or Cygwin tar utility, filtering through gzip
+TARGZ = tar cvzf
+UNTARGZ = tar xvzf
# Decide if we're on unix or DOS
ifeq (,$(findstring usr,$(PATH)))
@@ -118,9 +122,9 @@
.PHONY: cleandocs
cleandocs:
- @for i in docs ; \
+ @for i in xdocs ; \
do \
- (cd $$i; echo cleaning up docs "$(CURRENT_DIR)/$$i..."; \
+ (cd $$i; echo cleaning up x-docs "$(CURRENT_DIR)/$$i..."; \
$(MAKE) CURRENT_DIR=$(CURRENT_DIR)/$$i $(MFLAGS) -f Makefile clean); \
done
1.4 +39 -25 xml-xalan/xdocs/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/xml-xalan/xdocs/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 2000/02/28 19:22:58 1.3
+++ Makefile 2000/03/02 17:39:34 1.4
@@ -4,12 +4,17 @@
# Uses a specific version of Stylebook currently to create the hand-written
# HTML docs and some of the input docs to the javadoc API files
#
-# 22-Feb-00 NOTE: requires a number of xml-site files copied into
-# the xdocs/style directory before the build will complete successfully.
-# This needs better build documentation, but it does work.
+# NOTE: documentation (only) will build only with JDK 1.2.2 or higher
+# You can compile the src code with JDK 1.1.x and the doc with 1.2.x if:
+# - you have both installed
+# - your default environment is set for JDK 1.1.x
+# - you change the JAVA12 and JAVADOC12 variables from ../make.include to
+# point directly to the 1.2.x executables
+# Example: on WinXX platforms, paths are like JAVA12=c:/jdk1.2.2/bin/java.exe
#
include ../make.include
+
# Add other required dirs to the classpath
XERCES_CLASSPATH := ..$(PATHSEP)..$(PATHSEP)xml-xerces$(PATHSEP)java$(PATHSEP)bin$(PATHSEP)xerces.jar
BSF_CLASSPATH := ..$(PATHSEP)bsf.jar$(CLPATHSEP)..$(PATHSEP)bsfengines.jar
@@ -19,35 +24,44 @@
# Also hack in a simple doclet used for javadoc later on
STYLEBOOOK_CLASSPATH := xalanjdoc.jar$(CLPATHSEP)stylebook-1.0-b2.jar
EXTRA_CLASSPATH := $(XERCES_CLASSPATH)$(CLPATHSEP)$(XALAN_CLASSPATH)$(CLPATHSEP)$(BSF_CLASSPATH)$(CLPATHSEP)$(STYLEBOOOK_CLASSPATH)$(CLPATHSEP)$(CLASSPATH)
-
STYLEBOOK := org.apache.stylebook.StyleBook
-all: makesbook makejavadoc
+# Miscellaneous utility variables
+OUTPUTDIR := ../build
+SRCDIR := ../src
+JAVADOCARGFILE := javadocArgs.txt
+
+all: getxmlsite makesbook makejavadoc
+
+# Untar-gz the subset of xml-site files we require to build
+# Note that these get left in the xdocs directory even after a clean
+.PHONY: getxmlsite
+getxmlsite:
+ echo Untar-gzing the xml-site subset files
+ -$(UNTARGZ) xml-site-style.tar.gz
# Note these paths should work on WinXX or Unix-land
-makesbook:
- echo Making stylebook into ../build
- -mkdir ../build
- -mkdir ../build/docs
- -mkdir ../build/docs/resources
- $(CP) style/resources/* ../build/docs/resources
- $(JAVA12) -classpath "$(EXTRA_CLASSPATH)" $(STYLEBOOK) "targetDirectory=../build/docs/" sources/xalanLocal.xml style
+makesbook: getxmlsite
+ echo Making stylebook into $(OUTPUTDIR)
+ -mkdir $(OUTPUTDIR)
+ -mkdir $(OUTPUTDIR)/docs
+ -mkdir $(OUTPUTDIR)/docs/resources
+ $(CP) style/resources/* $(OUTPUTDIR)/docs/resources
+ $(JAVA12) -classpath "$(EXTRA_CLASSPATH)" $(STYLEBOOK) "targetDirectory=$(OUTPUTDIR)/docs/" sources/xalanLocal.xml style
-
#To build javadoc from the xdocs directory
-makejavadoc:
- echo Making javadoc1.2 into ../build
- -mkdir ../build
- -mkdir ../build/docs
- -mkdir ../build/docs/apidocs
- $(JAVA12) -classpath "$(EXTRA_CLASSPATH)" $(STYLEBOOK) "loaderConfig=sbk:/style/loaderjdoc.xml" targetDirectory=../src sources/javadocPackages.xml style
- echo -public -overview ../src/javadocOverview.html -sourcepath ../src org.apache.xalan.xpath org.apache.xalan.xpath.xdom org.apache.xalan.xpath.dtm org.apache.xalan.xpath.xml org.apache.xalan.xslt org.apache.xalan.xslt.trace org.apache.xalan.xslt.client org.apache.xalan.xslt.extensions -windowtitle Xalan -d ../build/docs/apidocs > javadocArgs.txt
- $(JAVADOC12) @javadocArgs.txt
+makejavadoc: getxmlsite
+ echo Making javadoc1.2 into $(OUTPUTDIR)
+ -mkdir $(OUTPUTDIR)
+ -mkdir $(OUTPUTDIR)/docs
+ -mkdir $(OUTPUTDIR)/docs/apidocs
+ $(JAVA12) -classpath "$(EXTRA_CLASSPATH)" $(STYLEBOOK) "loaderConfig=sbk:/style/loaderjdoc.xml" targetDirectory=$(SRCDIR) sources/javadocPackages.xml style
+ echo -public -overview $(SRCDIR)/javadocOverview.html -sourcepath $(SRCDIR) org.apache.xalan.xpath org.apache.xalan.xpath.xdom org.apache.xalan.xpath.dtm org.apache.xalan.xpath.xml org.apache.xalan.xslt org.apache.xalan.xslt.trace org.apache.xalan.xslt.client org.apache.xalan.xslt.extensions -windowtitle Xalan -d $(OUTPUTDIR)/docs/apidocs > $(JAVADOCARGFILE)
+ $(JAVADOC12) @$(JAVADOCARGFILE)
.PHONY: clean
-# In theory we should rmdir each directory too!
+# In theory we should also clean out the getxmlsite-generated files,
clean::
- $(RM) ../build/docs/*; \
- $(RM) ../build/docs/apidocs/*
-
+ $(RM-RF) $(OUTPUTDIR)/docs/*
+ $(RM) $(JAVADOCARGFILE)