Make the necessary changes to get the new 'svg2-tools' repo build process working, and stop generating files in 'master' (generate them in 'build' instead). r=WG.
authorJonathan Watt <jwatt@mozilla.com>
Thu, 28 Jul 2011 16:19:10 +0100
changeset 2 7287a5350439
parent 1 cbc4f3f708e9
child 3 dc563a07faee
Make the necessary changes to get the new 'svg2-tools' repo build process working, and stop generating files in 'master' (generate them in 'build' instead). r=WG.
Makefile
master/Makefile
master/images/implnote/arcs/Makefile
master/publish.xml
master/style/svg-style-print.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile	Thu Jul 28 16:19:10 2011 +0100
@@ -0,0 +1,29 @@
+# Makefile for SVG 1.1 Second Edition.
+
+all :
+	$(MAKE) -C master/images/implnote/arcs/
+	@../svg2-tools/build.py
+
+pdf : all
+	prince --no-author-style -s build/publish/style/svg-style.css -s http://www.w3.org/StyleSheets/TR/W3C-REC -s build/publish/style/svg-style-print.css build/publish/single-page.html -o build/publish/single-page.pdf
+
+ZIPDIR=REC-SVG11-20110802
+
+zip : all
+	rm -rf build/publish/$(ZIPDIR) build/publish/$(ZIPDIR).zip
+	mkdir -p build/publish/$(ZIPDIR)/style
+	cp build/publish/*.html build/publish/$(ZIPDIR)
+	rm build/publish/$(ZIPDIR)/single-page.html
+	cp build/publish/style/svg-style.css build/publish/$(ZIPDIR)/style/
+	wget -O build/publish/$(ZIPDIR)/style/W3C-REC.css http://www.w3.org/StyleSheets/TR/W3C-REC.css
+	wget -O build/publish/$(ZIPDIR)/style/logo-REC.png http://www.w3.org/StyleSheets/TR/logo-REC.png
+	perl -i -pe 's{http://www.w3.org/StyleSheets/TR/logo-REC}{logo-REC.png}' build/publish/$(ZIPDIR)/style/W3C-REC.css
+	perl -i -pe 's{http://www.w3.org/StyleSheets/TR/W3C-REC}{style/W3C-REC.css}' build/publish/$(ZIPDIR)/*.html
+	cp -a build/publish/images build/publish/$(ZIPDIR)/
+	find build/publish/$(ZIPDIR)/images/ -name CVS | xargs rm -rf
+	cd build/publish/ && zip -r $(ZIPDIR).zip $(ZIPDIR)
+	rm -rf build/publish/$(ZIPDIR)
+
+clean :
+	$(MAKE) -C master/images/implnote/arcs/ clean
+	@../svg2-tools/build.py -c
--- a/master/Makefile	Thu Jul 28 16:19:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# Makefile for SVG 1.1 Second Edition.
-
-all :
-	$(MAKE) -C images/implnote/arcs/
-	@./build.pl
-
-pdf : all
-	prince --no-author-style -s ../publish/style/svg-style.css -s http://www.w3.org/StyleSheets/TR/W3C-REC -s ../publish/style/svg-style-print.css ../publish/single-page.html -o ../publish/single-page.pdf
-
-ZIPDIR=REC-SVG11-20110802
-
-zip : all
-	rm -rf ../publish/$(ZIPDIR) ../publish/$(ZIPDIR).zip
-	mkdir -p ../publish/$(ZIPDIR)/style
-	cp ../publish/*.html ../publish/$(ZIPDIR)
-	rm ../publish/$(ZIPDIR)/single-page.html
-	cp ../publish/style/svg-style{,-extra}.css ../publish/$(ZIPDIR)/style/
-	wget -O ../publish/$(ZIPDIR)/style/W3C-REC.css http://www.w3.org/StyleSheets/TR/W3C-REC.css
-	wget -O ../publish/$(ZIPDIR)/style/logo-REC.png http://www.w3.org/StyleSheets/TR/logo-REC.png
-	perl -i -pe 's{http://www.w3.org/StyleSheets/TR/logo-REC}{logo-REC.png}' ../publish/$(ZIPDIR)/style/W3C-REC.css
-	perl -i -pe 's{http://www.w3.org/StyleSheets/TR/W3C-REC}{style/W3C-REC.css}' ../publish/$(ZIPDIR)/*.html
-	cp -a ../publish/images ../publish/$(ZIPDIR)/
-	find ../publish/$(ZIPDIR)/images/ -name CVS | xargs rm -rf
-	cd ../publish/ && zip -r $(ZIPDIR).zip $(ZIPDIR)
-	rm -rf ../publish/$(ZIPDIR)
-
-clean :
-	$(MAKE) -C images/implnote/arcs/ clean
-	@./build.pl -c
--- a/master/images/implnote/arcs/Makefile	Thu Jul 28 16:19:09 2011 +0100
+++ b/master/images/implnote/arcs/Makefile	Thu Jul 28 16:19:10 2011 +0100
@@ -1,21 +1,23 @@
 # Makefile for generating SVGs and PNGs from the MathML documents in this directory.
 
-SVG2PNG=java -jar ../../../../../../tools/batik/batik-rasterizer.jar
+THISDIR=$(abspath .)
+TARGETDIR=$(abspath ../../../../build/publish/images/implnote/arcs)
+TOOLSDIR=$(abspath ../../../../../svg2-tools)
 
-# This directory relative to tools/math/.
-THISDIR=../../profiles/1.1F2/master/images/implnote/arcs
+SVG2PNG=java -jar $(TOOLSDIR)/batik/batik-rasterizer.jar
 
 MML_FILES=$(wildcard *.mml)
 
-all : $(MML_FILES:%.mml=%.png)
+all : $(MML_FILES:%.mml=$(TARGETDIR)/%.png)
 
-%.svg : %.mml
-	cd ../../../../../../tools/math && ./math2svg.py -o $(THISDIR)/[email protected] $(THISDIR)/$<
+$(TARGETDIR)/%.svg : %.mml
+	mkdir -p $(TARGETDIR)
+	cd $(TOOLSDIR)/math && ./math2svg.py -o [email protected] $(THISDIR)/$<
 
-%.png : %.svg
+$(TARGETDIR)/%.png : $(TARGETDIR)/%.svg
 	$(SVG2PNG) -cssUser 'data:text/css,svg{text-rendering:geometricPrecision}' -d [email protected] $<
 clean :
-	rm -f $(MML_FILES:%.mml=%.png) $(MML_FILES:%.mml=%.svg)
+	rm -f $(MML_FILES:%.mml=$(TARGETDIR)/%.png) $(MML_FILES:%.mml=$(TARGETDIR)/%.svg)
 
-.PRECIOUS : %.svg
+.PRECIOUS : $(TARGETDIR)/%.svg
 .PHONY : all clean
--- a/master/publish.xml	Thu Jul 28 16:19:09 2011 +0100
+++ b/master/publish.xml	Thu Jul 28 16:19:10 2011 +0100
@@ -4,7 +4,7 @@
   <title>Scalable Vector Graphics (SVG) 1.1 (Second Edition)</title>
   <short-title>SVG 1.1 (Second Edition)</short-title>
   <maturity>REC</maturity>
-  <output use-publish-directory='true'/>
+  <output use-publish-directory='true' publish-directory='build/publish'/>
 
   <publication-date>2011-08-02</publication-date>
 
@@ -17,7 +17,7 @@
   </versions>
 
   <definitions href='definitions.xml'/>
-  <interfaces idl='svg.idlx'/>
+  <interfaces idl='../build/svg.idlx'/>
 
   <toc href='expanded-toc.html'/>
   <elementindex href='eltindex.html'/>
@@ -49,7 +49,6 @@
   <chapter name='metadata'/>
   <chapter name='backward'/>
   <chapter name='extend'/>
-  <appendix name='svgdtd'/>
   <appendix name='svgdom'/>
   <appendix name='idl'/>
   <appendix name='java'/>
@@ -66,7 +65,4 @@
   <appendix name='feature'/>
   <appendix name='mimereg'/>
   <appendix name='changes'/>
-  <!--
-  <appendix name='indexlist'/>
-  -->
 </publish-conf>
--- a/master/style/svg-style-print.css	Thu Jul 28 16:19:09 2011 +0100
+++ b/master/style/svg-style-print.css	Thu Jul 28 16:19:10 2011 +0100
@@ -1,25 +1,25 @@
 /* Print style sheet for SVG 1.1 Second Edition, designed to be used with Prince. */
 
[email protected] { font-family: "Linux Libertine"; src: url(../../master/style/LinLibertine_Re-4.1_.8_.ttf); }
[email protected] { font-family: "Linux Libertine"; font-weight: bold; src: url(../../master/style/LinLibertine_Bd-4.0_.2_.ttf); }
[email protected] { font-family: "Linux Libertine"; font-style: italic; src: url(../../master/style/LinLibertine_It-4.0_.3_.ttf); }
[email protected] { font-family: "Linux Libertine"; font-weight: bold; font-style: italic; src: url(../../master/style/LinLibertine_BI-4.0_.3_.ttf); }
[email protected] { font-family: "Linux Libertine"; src: url(LinLibertine_Re-4.1_.8_.ttf); }
[email protected] { font-family: "Linux Libertine"; font-weight: bold; src: url(LinLibertine_Bd-4.0_.2_.ttf); }
[email protected] { font-family: "Linux Libertine"; font-style: italic; src: url(LinLibertine_It-4.0_.3_.ttf); }
[email protected] { font-family: "Linux Libertine"; font-weight: bold; font-style: italic; src: url(LinLibertine_BI-4.0_.3_.ttf); }
 
[email protected] { font-family: "Luxi Sans"; src: url(../../master/style/luxisr.ttf); }
[email protected] { font-family: "Luxi Sans"; font-weight: bold; src: url(../../master/style/luxisb.ttf); }
[email protected] { font-family: "Luxi Sans"; font-style: italic; src: url(../../master/style/luxisri.ttf); }
[email protected] { font-family: "Luxi Sans"; font-weight: bold; font-style: italic; src: url(../../master/style/luxisbi.ttf); }
[email protected] { font-family: "Luxi Sans"; src: url(luxisr.ttf); }
[email protected] { font-family: "Luxi Sans"; font-weight: bold; src: url(luxisb.ttf); }
[email protected] { font-family: "Luxi Sans"; font-style: italic; src: url(luxisri.ttf); }
[email protected] { font-family: "Luxi Sans"; font-weight: bold; font-style: italic; src: url(luxisbi.ttf); }
 
[email protected] { font-family: "Bitstream Vera Sans Mono"; src: url(../../master/style/VeraMono.ttf); }
[email protected] { font-family: "Bitstream Vera Sans Mono"; font-weight: bold; src: url(../../master/style/VeraMoBd.ttf); }
[email protected] { font-family: "Bitstream Vera Sans Mono"; font-style: italic; src: url(../../master/style/VeraMoIt.ttf); }
[email protected] { font-family: "Bitstream Vera Sans Mono"; font-weight: bold; font-style: italic; src: url(../../master/style/VeraMoBI.ttf); }
[email protected] { font-family: "Bitstream Vera Sans Mono"; src: url(VeraMono.ttf); }
[email protected] { font-family: "Bitstream Vera Sans Mono"; font-weight: bold; src: url(VeraMoBd.ttf); }
[email protected] { font-family: "Bitstream Vera Sans Mono"; font-style: italic; src: url(VeraMoIt.ttf); }
[email protected] { font-family: "Bitstream Vera Sans Mono"; font-weight: bold; font-style: italic; src: url(VeraMoBI.ttf); }
 
 @page {
   size: letter;
   padding: 0;
   margin: 1.25in 1in 2in 1.25in;
-  background: url(../../master/style/logo-PR-v.svg);
+  background: url(logo-PR-v.svg);
   background-position: top left;
   background-attachment: fixed;
   background-repeat: no-repeat;