2006/ws/policy Makefile.attachment,1.2,1.3 Makefile.base,1.4,1.5 Makefile.framework,1.1,1.2 Makefile.guidelines,1.2,1.3 Makefile.primer,1.1,1.2 Makefile.wsdl11ei,1.1,1.2

Update of /sources/public/2006/ws/policy
In directory hutz:/tmp/cvs-serv4671/policy

Modified Files:
	Makefile.attachment Makefile.base Makefile.framework 
	Makefile.guidelines Makefile.primer Makefile.wsdl11ei 
Log Message:
Makefile changes: new variables in document specific makefiles (DOCNAME and STATUSPREFIX), and adapatation of Makefile.base accordingly. Also some outcommenting "#" of tasks to make draft generation faster. Changes have no influence on editor's work, these files are only used for TR space document generation.

Index: Makefile.framework
===================================================================
RCS file: /sources/public/2006/ws/policy/Makefile.framework,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.framework	31 May 2006 17:20:37 -0000	1.1
+++ Makefile.framework	5 Apr 2007 06:29:10 -0000	1.2
@@ -3,6 +3,10 @@
 
 PREFIX=ws-policy-framework
 
+DOCNAME=ws-policy
+
+STATUSPREFIX=
+
 SCHEMAS=ws-policy.xsd
 
 RDDL=ws-policy

Index: Makefile.wsdl11ei
===================================================================
RCS file: /sources/public/2006/ws/policy/Makefile.wsdl11ei,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.wsdl11ei	26 Jan 2007 22:30:35 -0000	1.1
+++ Makefile.wsdl11ei	5 Apr 2007 06:29:10 -0000	1.2
@@ -3,6 +3,10 @@
 
 PREFIX=wsdl11elementidentifiers
 
+DOCNAME=wsdl11elementidentifiers
+
+STATUSPREFIX=.wsdl11ei
+
 SCHEMAS=
 
 RDDL=

Index: Makefile.attachment
===================================================================
RCS file: /sources/public/2006/ws/policy/Makefile.attachment,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.attachment	22 Feb 2007 15:37:17 -0000	1.2
+++ Makefile.attachment	5 Apr 2007 06:29:10 -0000	1.3
@@ -3,12 +3,15 @@
 
 PREFIX=ws-policy-attachment
 
+DOCNAME=ws-policy-attach
+
+STATUSPREFIX=
+
 SCHEMAS=ws-policy.xsd
 
 RDDL=ws-policy
 
-IMAGES=effective-policy-scope.png \
-ws-policyattachment-4-wsdl20.jpg \
+IMAGES=ws-policyattachment-4-wsdl20.jpg \
 effective-policy-scope.jpg \
 effective-policy-scope.svg \
 effective-policy-scope-style.css \

Index: Makefile.base
===================================================================
RCS file: /sources/public/2006/ws/policy/Makefile.base,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.base	23 Feb 2007 20:13:41 -0000	1.4
+++ Makefile.base	5 Apr 2007 06:29:10 -0000	1.5
@@ -1,15 +1,21 @@
+#change FS: PUBDIR=$TR$(DOCIDENT) to PUBDIR=$(DOCIDENT) (can't use TR dir on homer)
+#change FS: ant changelog to # ant changelog
+#change FS:  $(POLICY.xml)  $(STYLESHEET) to  $(STYLESHEET)  $(POLICY.xml) (doesn't work the other way round)
+#change FS: $(LINKCHECKER) -s -r -b $? > $@ to # $(LINKCHECKER) -s -r -b $? > $@ (no linkchecker to save some time)
 # -*- makefile -*-
 XSL=xmlspec.xsl xmlspec-policy.xsl changelog.xsl
+STYLESHEETXSL10=xmlspec-policy-xsl1-0.xsl #FS: Browsers don't understand XSLT2.0 yet, hence this stylesheet for the TR space directory.
+XSLINPUBDIR=xmlspec.xsl changelog.xsl #FS: Related to STYLESHEETXSL10
+XSLADDLINENUMBERS=addlinenumbers.xsl #FS: Related to STYLESHEETXSL10
 ENTITIES=entities.dtd entitieswd.dtd entitiesedcopy.dtd
 
 YEAR=$(shell grep "ENTITY draft.year" entitieswd.dtd | cut -d '"' -f2)
 MM=$(shell grep "ENTITY draft.mm" entitieswd.dtd | cut -d '"' -f2)
 DD=$(shell grep "ENTITY draft.dd" entitieswd.dtd | cut -d '"' -f2)
 NSURI=$(shell grep "ENTITY nsuri" entities.dtd | head -1| cut -d '"' -f2)
-STATUS_ENTITY=w3c.status
-STATUS=$(shell grep "ENTITY $(STATUS_ENTITY)" entitieswd.dtd | cut -d '"' -f2)
-DOCNAME=$(STATUS)-$(PREFIX)-$(YEAR)$(MM)$(DD)
-
+STATUS_ENTITY=w3c.status$(STATUSPREFIX)
+STATUS=$(shell grep "ENTITY $(STATUS_ENTITY) " entitieswd.dtd | cut -d '"' -f2)
+DOCIDENT=$(STATUS)-$(PREFIX)-$(YEAR)$(MM)$(DD)
 
 TOOLS=../../../2002/ws/desc/tools
 
@@ -30,8 +36,8 @@
 
 RDDLTRANS=sed -e "s/@Y@/$(YEAR)/g" -e "s/@M@/$(MM)/g" -e "s/@D@/$(DD)/g" -e "s/@S@/$(STATUS)/g" -e "s/@NS@/Web Services Policy 1.5/g" -e "s/@N@/ws-policy/g" -e "s|@NSURI@|http://www.w3.org/ns/ws-policy|g"
 
-TR=$(WWW)/TR/$(YEAR)
-PUBDIR=$(TR)/$(DOCNAME)
+TR=$(WWW)TR/$(YEAR)
+PUBDIR=$(DOCIDENT)
 NSDIR=$(WWW)/ns$(EXTRANSDIR)
 SCHEMADIR=$(WWW)/2007/02$(EXTRANSDIR)
 
@@ -45,7 +51,7 @@
 
 $(POLICY.html): $(POLICY.xml) $(FILES) $(XSL) changelog.xml valid-xml.txt
 	@echo "Generating $@";\
-	$(SAXON) $(POLICY.xml) $(STYLESHEET) > $@
+	$(SAXON) $(STYLESHEET)  $(POLICY.xml) > $@
 	@echo "Running tidy on $@";\
 	mv $@  $@.old; \
 	$(TIDY) $@.old > $@ 2>./tidy-output.txt;\
@@ -53,7 +59,7 @@
 
 changelog.xml: $(POLICY.xml) $(FILES) $(XSL)
 ifndef NOANT
-	ant changelog
+#	ant changelog
 endif
 
 $(POLICY.ps): $(POLICY.html) $(IMAGES)
@@ -92,7 +98,7 @@
 valid-ns.html: $(POLICY.html) valid-html.txt	
 ifndef QUICK
 	@echo "Running namespace checker";\
-	QUERY_STRING="uri=file://$(PWD)/$(POLICY.html)" $(NSCHECK) > $@
+#	QUERY_STRING="uri=file://$(PWD)/$(POLICY.html)" $(NSCHECK) > $@
 endif
 
 validate-ns: valid-ns.html
@@ -119,7 +125,7 @@
 valid-links.txt: $(POLICY.html)
 ifndef QUICK
 	@echo "Checking links $?";\
-	$(LINKCHECKER) -s -r -b $? > $@
+#	$(LINKCHECKER) -s -r -b $? > $@
 endif
 
 checkspell.txt: $(POLICY.html)
@@ -160,10 +166,13 @@
 
 install-tr: trall directory
 	@echo "Installing draft";\
-	cp $(XSL) $(IMAGES) changelog.xml xmlspec.dtd $(PUBDIR);\
+	cp $(XSLINPUBDIR) $(IMAGES) changelog.xml xmlspec.dtd $(PUBDIR);\
+        cp $(STYLESHEETXSL10) $(PUBDIR)/$(STYLESHEET);\
 	cp  $(POLICY.pdf) $(POLICY.ps) $(POLICY.txt) diff.html $(PUBDIR);\
 	cat htaccess-for-html htaccess-for-text > $(PUBDIR)/.htaccess;\
-	$(XSLTPROC) --stringparam year $(YEAR) identityxmlspec.xsl $(POLICY.xml) > $(PUBDIR)/$(POLICY.xml) ;\
+        $(SAXON) $(XSLADDLINENUMBERS) $(POLICY.xml) > temp.xml
+	$(XSLTPROC) --stringparam year $(YEAR) identityxmlspec.xsl temp.xml > $(PUBDIR)/$(POLICY.xml) ;\
+        rm temp.xml
 	cp $(POLICY.html) $(PUBDIR)/Overview.html
 
 install: install-tr

Index: Makefile.primer
===================================================================
RCS file: /sources/public/2006/ws/policy/Makefile.primer,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.primer	17 Aug 2006 14:16:23 -0000	1.1
+++ Makefile.primer	5 Apr 2007 06:29:10 -0000	1.2
@@ -3,6 +3,10 @@
 
 PREFIX=ws-policy-primer
 
+DOCNAME=ws-policy-primer
+
+STATUSPREFIX=.primer
+
 SCHEMAS=
 
 RDDL=
@@ -15,7 +19,7 @@
 
 FILES=\
 $(IMAGES) \
-status.xml \
+status-primer.xml \
 xmlspec.dtd \
 entitiesedcopy.dtd \
 entitieswd.dtd \

Index: Makefile.guidelines
===================================================================
RCS file: /sources/public/2006/ws/policy/Makefile.guidelines,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.guidelines	26 Jan 2007 22:30:35 -0000	1.2
+++ Makefile.guidelines	5 Apr 2007 06:29:10 -0000	1.3
@@ -3,6 +3,10 @@
 
 PREFIX=ws-policy-guidelines
 
+DOCNAME=ws-policy-guidelines
+
+STATUSPREFIX=.guidelines
+
 SCHEMAS=
 
 RDDL=

Received on Thursday, 5 April 2007 06:29:17 UTC