2002/ws/desc/wsdl20 Makefile.base,1.37,1.38

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

Modified Files:
	Makefile.base 
Log Message:
Switched to xmllint for validation


Index: Makefile.base
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/Makefile.base,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Makefile.base	4 Aug 2004 15:00:01 -0000	1.37
--- Makefile.base	6 Aug 2004 15:58:30 -0000	1.38
***************
*** 20,25 ****
  PS2PDF=ps2pdf
  HTML2TEXT=w3m -dump
! VALIDATE=java -Dxml.catalog.files="$(CATALOG);$(WSD_CATALOG)" \
!               -jar $(TOOLS)/validate.jar
  XSLTPROC=xsltproc
  PUBRULESCHECK=$(XSLTPROC) --stringparam doc_uri http://www.w3.org/TR/$(YEAR)/$(DOCNAME) $(TOOLS)/pubrules-checker.xml
--- 20,24 ----
  PS2PDF=ps2pdf
  HTML2TEXT=w3m -dump
! VALIDATE=xmllint --noout --valid
  XSLTPROC=xsltproc
  PUBRULESCHECK=$(XSLTPROC) --stringparam doc_uri http://www.w3.org/TR/$(YEAR)/$(DOCNAME) $(TOOLS)/pubrules-checker.xml
***************
*** 38,42 ****
  STYLESHEET=xmlspec-wsdl.xsl
  
! $(WSDL20.html): $(WSDL20.xml) $(FILES) $(XSL) valid-xml.txt
  	@echo "Generating $@";\
  	$(XSLTPROC) $(STYLESHEET) $(WSDL20.xml) > $@
--- 37,41 ----
  STYLESHEET=xmlspec-wsdl.xsl
  
! $(WSDL20.html): $(WSDL20.xml) $(FILES) $(XSL) validate-xml
  	@echo "Generating $@";\
  	$(XSLTPROC) $(STYLESHEET) $(WSDL20.xml) > $@
***************
*** 103,107 ****
  valid-xml.txt: $(WSDL20.xml)
  	@echo "Validating $?";\
! 	$(VALIDATE) file:$? && touch ./$@
  
  valid-links.txt: $(WSDL20.html)
--- 102,106 ----
  valid-xml.txt: $(WSDL20.xml)
  	@echo "Validating $?";\
! 	$(VALIDATE) $? > ./$@
  
  valid-links.txt: $(WSDL20.html)

Received on Friday, 6 August 2004 11:58:33 UTC