2002/ws/desc/wsdl20 Makefile.base,1.16,1.17

Update of /sources/public/2002/ws/desc/wsdl20
In directory homer:/tmp/cvs-serv20522

Modified Files:
	Makefile.base 
Log Message:
Switched to xsltproc as Xalan crashes


Index: Makefile.base
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/Makefile.base,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.base	30 Jul 2004 09:42:53 -0000	1.16
--- Makefile.base	30 Jul 2004 11:15:48 -0000	1.17
***************
*** 21,26 ****
  VALIDATE=java -Dxml.catalog.files="$(CATALOG);$(WSD_CATALOG)" \
                -jar $(TOOLS)/validate.jar
! XSLENGINE=java -classpath "$(XJARS)" org.apache.xalan.xslt.Process
! PUBRULESCHECK=$(XSLENGINE) -PARAM doc_uri http://www.w3.org/TR/$(THISDOC) -XSL $(TOOLS)/pubrules-checker.xml -IN
  SETUP-NAMESPACES=$(TOOLS)/setup-namespaces
  
--- 21,26 ----
  VALIDATE=java -Dxml.catalog.files="$(CATALOG);$(WSD_CATALOG)" \
                -jar $(TOOLS)/validate.jar
! XSLTPROC=xsltproc
! PUBRULESCHECK=$(XSLTPROC) --stringparam doc_uri http://www.w3.org/TR/$(THISDOC) $(TOOLS)/pubrules-checker.xml
  SETUP-NAMESPACES=$(TOOLS)/setup-namespaces
  
***************
*** 32,38 ****
  WSDL20.txt=$(PREFIX).txt
  
  $(WSDL20.html): $(WSDL20.xml) $(FILES) $(XSL)
  	@echo "Generating $@";\
! 	$(XSLENGINE) -IN file:$(WSDL20.xml) -OUT $@
  	@echo "Running tidy on $@";\
  	mv $@  $@.old; \
--- 32,40 ----
  WSDL20.txt=$(PREFIX).txt
  
+ STYLESHEET=xmlspec-wsdl.xsl
+ 
  $(WSDL20.html): $(WSDL20.xml) $(FILES) $(XSL)
  	@echo "Generating $@";\
! 	$(XSLTPROC) $(STYLESHEET) $(WSDL20.xml) > $@
  	@echo "Running tidy on $@";\
  	mv $@  $@.old; \
***************
*** 56,60 ****
  	rm $<-prevversion.html
  
! check.txt: valid-xml.txt valid-html.txt valid-links.txt valid-pubrules.html checkspell.txt
  
  valid-html.txt: $(WSDL20.html)
--- 58,62 ----
  	rm $<-prevversion.html
  
! check.txt: trhtml valid-xml.txt valid-html.txt valid-links.txt valid-pubrules.html checkspell.txt
  
  valid-html.txt: $(WSDL20.html)
***************
*** 89,97 ****
  
  valid-links.txt: $(WSDL20.html)
! 	@echo "Check links $?";\
  	$(LINKCHECKER) -s -r -b $? > $@
  
  checkspell.txt: $(WSDL20.html)
! 	@echo "Check spelling $?";\
  	rm -f $@ ;\
  	$(SPELL) < $? | sort | uniq -c | sort -nr > $@
--- 91,99 ----
  
  valid-links.txt: $(WSDL20.html)
! 	@echo "Checking links $?";\
  	$(LINKCHECKER) -s -r -b $? > $@
  
  checkspell.txt: $(WSDL20.html)
! 	@echo "Checking spelling $?";\
  	rm -f $@ ;\
  	$(SPELL) < $? | sort | uniq -c | sort -nr > $@
***************
*** 104,108 ****
  	then for i in $(SCHEMAS) ;\
  	do echo "Generating $$i...";\
! 	 $(XSLENGINE) -IN file:$$i -XSL file:$(TOOLS)/identity.xsl -OUT $(PUBDIR)/$$i;\
  	done ; fi
  
--- 106,110 ----
  	then for i in $(SCHEMAS) ;\
  	do echo "Generating $$i...";\
! 	 $(XSTPROC) $(TOOLS)/identity.xsl $$i > $(PUBDIR)/$$i;\
  	done ; fi
  
***************
*** 112,116 ****
  acknowledgements:
  	@echo "Generating $@";\
! 	 $(XSLENGINE) -IN http://www.w3.org/2002/ws/desc/Overview.html -XSL mbwg.xsl -OUT acknowledgements.xml
  
  trhtml: acknowledgements $(WSDL20.html) 
--- 114,118 ----
  acknowledgements:
  	@echo "Generating $@";\
! 	 $(XSLTPROC) mbwg.xsl http://www.w3.org/2002/ws/desc/Overview.html > acknowledgements.xml
  
  trhtml: acknowledgements $(WSDL20.html) 
***************
*** 123,127 ****
  	cp $(XSL) $(IMAGES) $(PUBDIR);\
  	cp  $(WSDL20.pdf) $(WSDL20.ps) $(WSDL20.txt) diff.html $(PUBDIR);\
! 	$(XSLENGINE) -IN file:$(WSDL20.xml) -XSL $(TOOLS)/identityxmlspec.xsl -OUT $(PUBDIR)/$(WSDL20.xml) ;\
  	cp $(WSDL20.html) $(PUBDIR)/Overview.html
  
--- 125,129 ----
  	cp $(XSL) $(IMAGES) $(PUBDIR);\
  	cp  $(WSDL20.pdf) $(WSDL20.ps) $(WSDL20.txt) diff.html $(PUBDIR);\
! 	$(XSLTPROC) $(TOOLS)/identityxmlspec.xsl $(WSDL20.xml) > $(PUBDIR)/$(WSDL20.xml) ;\
  	cp $(WSDL20.html) $(PUBDIR)/Overview.html
  

Received on Friday, 30 July 2004 07:15:59 UTC