Thread: [brlcad-commits] SF.net SVN: brlcad:[42876] brlcad/trunk/doc/docbook/Makefile.am (Page 2)
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2011-02-02 02:12:07
|
Revision: 42876 http://brlcad.svn.sourceforge.net/brlcad/?rev=42876&view=rev Author: starseeker Date: 2011-02-02 02:12:00 +0000 (Wed, 02 Feb 2011) Log Message: ----------- catalog.xml is no more Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-02-02 01:55:29 UTC (rev 42875) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-02-02 02:12:00 UTC (rev 42876) @@ -105,7 +105,6 @@ books/README \ books/en/Makefile.am \ books/en/tutorial_series_authors.xml \ - catalog.xml \ fop.xconf.in \ lessons/en/Makefile.am \ lessons/es/Makefile.am \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-09-13 20:41:13
|
Revision: 46678 http://brlcad.svn.sourceforge.net/brlcad/?rev=46678&view=rev Author: starseeker Date: 2011-09-13 20:41:04 +0000 (Tue, 13 Sep 2011) Log Message: ----------- Sort the files for EXTRA_DIST docbook Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-13 18:12:18 UTC (rev 46677) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-13 20:41:04 UTC (rev 46678) @@ -99,42 +99,42 @@ ${mannINTRO_EN} \ ${specificationsDOCBOOK_EN} \ README \ + CMakeLists.txt \ + articles/CMakeLists.txt \ + articles/en/CMakeLists.txt \ articles/en/Makefile.am \ articles/en/images/tire_fig12.svg \ articles/en/images/tire_fig13.svg \ + books/CMakeLists.txt \ books/README \ + books/en/CMakeLists.txt \ books/en/Makefile.am \ books/en/tutorial_series_authors.xml \ fop.xconf.in \ + lessons/CMakeLists.txt \ + lessons/en/CMakeLists.txt \ lessons/en/Makefile.am \ + lessons/es/CMakeLists.txt \ lessons/es/Makefile.am \ log4j.properties \ resources \ + specifications/CMakeLists.txt \ + specifications/en/CMakeLists.txt \ specifications/en/Makefile.am \ + system/CMakeLists.txt \ system/README \ + system/man1/CMakeLists.txt \ + system/man1/en/CMakeLists.txt \ system/man1/en/Makefile.am \ - system/mann/mged_cmd_template.xml \ + system/man3/CMakeLists.txt \ + system/man3/en/CMakeLists.txt \ system/man3/en/Makefile.am \ - system/man5/en/Makefile.am \ - system/mann/en/Makefile.am \ - CMakeLists.txt \ - articles/CMakeLists.txt \ - articles/en/CMakeLists.txt \ - specifications/CMakeLists.txt \ - specifications/en/CMakeLists.txt \ - lessons/CMakeLists.txt \ - lessons/en/CMakeLists.txt \ - lessons/es/CMakeLists.txt \ - books/CMakeLists.txt \ - books/en/CMakeLists.txt \ - system/man1/CMakeLists.txt \ - system/man1/en/CMakeLists.txt \ system/man5/CMakeLists.txt \ system/man5/en/CMakeLists.txt \ - system/CMakeLists.txt \ + system/man5/en/Makefile.am \ system/mann/CMakeLists.txt \ system/mann/en/CMakeLists.txt \ - system/man3/CMakeLists.txt \ - system/man3/en/CMakeLists.txt + system/mann/en/Makefile.am \ + system/mann/mged_cmd_template.xml include $(top_srcdir)/misc/Makefile.defs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-14 12:56:17
|
Revision: 46683 http://brlcad.svn.sourceforge.net/brlcad/?rev=46683&view=rev Author: tbrowder2 Date: 2011-09-14 12:56:06 +0000 (Wed, 14 Sep 2011) Log Message: ----------- correct XSLTPROC options; add new document to tree Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-14 12:00:32 UTC (rev 46682) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-14 12:56:06 UTC (rev 46683) @@ -1,4 +1,4 @@ -XSLTPROC_FLAGS=-nonet -xinclude +XSLTPROC_FLAGS=--nonet --xinclude XSL_XHTML_STYLESHEET=$(top_srcdir)/doc/docbook/resources/standard/xsl/xhtml-1_1/docbook.xsl XSL_MAN_STYLESHEET=$(top_srcdir)/doc/docbook/resources/standard/xsl/manpages/docbook.xsl XSL_FO_STYLESHEET=$(top_srcdir)/doc/docbook/resources/standard/xsl/fo/docbook.xsl @@ -40,6 +40,7 @@ include $(srcdir)/system/man3/en/Makefile.am include $(srcdir)/system/man5/en/Makefile.am include $(srcdir)/system/mann/en/Makefile.am +include $(srcdir)/presentations/en/Makefile.am if BUILD_DOCS @@ -61,7 +62,9 @@ $(BUILTMANN_ENHTML) \ $(BUILTMANN_ENPDF) \ $(BUILTLESSONS_ESHTML) \ - $(BUILTLESSONS_ESPDF) + $(BUILTLESSONS_ESPDF) \ + $(BUILTPRESENTATIONS_ENHTML) \ + $(BUILTPRESENTATIONS_ENPDF) BUILTMAN_EN_SOURCES = \ ${man1DOCBOOK_EN:xml=1} \ @@ -97,6 +100,8 @@ ${man5DOCBOOK_EN} \ ${mannDOCBOOK_EN} \ ${mannINTRO_EN} \ + ${presentationsDOCBOOK_EN_IMAGES} \ + ${presentationsDOCBOOK_EN} \ ${specificationsDOCBOOK_EN} \ README \ CMakeLists.txt \ @@ -117,6 +122,8 @@ lessons/es/CMakeLists.txt \ lessons/es/Makefile.am \ log4j.properties \ + presentations/CMakeLists.txt \ + presentations/en/CMakeLists.txt \ resources \ specifications/CMakeLists.txt \ specifications/en/CMakeLists.txt \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-09-14 14:08:33
|
Revision: 46686 http://brlcad.svn.sourceforge.net/brlcad/?rev=46686&view=rev Author: brlcad Date: 2011-09-14 14:08:22 +0000 (Wed, 14 Sep 2011) Log Message: ----------- fully sort the list Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-14 13:41:12 UTC (rev 46685) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-14 14:08:22 UTC (rev 46686) @@ -103,8 +103,8 @@ ${presentationsDOCBOOK_EN_IMAGES} \ ${presentationsDOCBOOK_EN} \ ${specificationsDOCBOOK_EN} \ + CMakeLists.txt \ README \ - CMakeLists.txt \ articles/CMakeLists.txt \ articles/en/CMakeLists.txt \ articles/en/Makefile.am \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-14 15:32:25
|
Revision: 46689 http://brlcad.svn.sourceforge.net/brlcad/?rev=46689&view=rev Author: tbrowder2 Date: 2011-09-14 15:32:18 +0000 (Wed, 14 Sep 2011) Log Message: ----------- more file name sorting Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-14 14:50:21 UTC (rev 46688) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-14 15:32:18 UTC (rev 46689) @@ -35,36 +35,36 @@ include $(srcdir)/books/en/Makefile.am include $(srcdir)/lessons/en/Makefile.am include $(srcdir)/lessons/es/Makefile.am +include $(srcdir)/presentations/en/Makefile.am include $(srcdir)/specifications/en/Makefile.am include $(srcdir)/system/man1/en/Makefile.am include $(srcdir)/system/man3/en/Makefile.am include $(srcdir)/system/man5/en/Makefile.am include $(srcdir)/system/mann/en/Makefile.am -include $(srcdir)/presentations/en/Makefile.am if BUILD_DOCS BUILT_SOURCES = \ $(BUILTARTICLES_ENHTML) \ $(BUILTARTICLES_ENPDF) \ + $(BUILTBOOKS_ENHTML) \ + $(BUILTBOOKS_ENPDF) \ $(BUILTLESSONS_ENHTML) \ $(BUILTLESSONS_ENPDF) \ - $(BUILTBOOKS_ENHTML) \ - $(BUILTBOOKS_ENPDF) \ - $(BUILTSPECS_ENHTML) \ - $(BUILTSPECS_ENPDF) \ - $(BUILTMAN_ENHTML) \ - $(BUILTMAN_ENPDF) \ + $(BUILTLESSONS_ESHTML) \ + $(BUILTLESSONS_ESPDF) \ $(BUILTMAN3_ENHTML) \ $(BUILTMAN3_ENPDF) \ $(BUILTMAN5_ENHTML) \ $(BUILTMAN5_ENPDF) \ $(BUILTMANN_ENHTML) \ $(BUILTMANN_ENPDF) \ - $(BUILTLESSONS_ESHTML) \ - $(BUILTLESSONS_ESPDF) \ + $(BUILTMAN_ENHTML) \ + $(BUILTMAN_ENPDF) \ $(BUILTPRESENTATIONS_ENHTML) \ - $(BUILTPRESENTATIONS_ENPDF) + $(BUILTPRESENTATIONS_ENPDF) \ + $(BUILTSPECS_ENHTML) \ + $(BUILTSPECS_ENPDF) BUILTMAN_EN_SOURCES = \ ${man1DOCBOOK_EN:xml=1} \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-14 22:58:35
|
Revision: 46705 http://brlcad.svn.sourceforge.net/brlcad/?rev=46705&view=rev Author: tbrowder2 Date: 2011-09-14 22:58:29 +0000 (Wed, 14 Sep 2011) Log Message: ----------- add make target for DocBook validation Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-14 22:57:25 UTC (rev 46704) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-14 22:58:29 UTC (rev 46705) @@ -30,7 +30,30 @@ @mkdir -p $$(dirname $@) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $? +# validate docbook xml +XML_HEADER = "\<?xml version=\'1.0\' encoding=\'us-ascii\'?\>" +XML_TMPFILE = .tmp +validate: validate_xmllint +# xmllint XInclude validation +XMLLINT = xmllint +RNG_SCHEMA = ./resources/docbook-5.0/rng/docbookxi.rng +XMLLINT_VALID_ARGS = --xinclude --relaxng $(RNG_SCHEMA) --noout --nonet +validate_xmllint: + @list='$(docbook_sources)'; test -n "$(docbook_sources)" || list=; \ + for s in $$list; do \ + dir="$$(dirname $$s)"; \ + tmpfil="$$dir/$(XML_TMPFILE)"; \ + echo "=== processing file '$$s' (see file '$$tmpfil')"; \ + if [ -f $$tmpfil ] ; then rm -f $$tmpfil ; fi ; \ + echo "$(XML_HEADER)" > $$tmpfil; \ + cat $$s >> $$tmpfil; \ + echo "$(XMLLINT) $(XMLLINT_VALID_ARGS) $$tmpfil"; \ + $(XMLLINT) $(XMLLINT_VALID_ARGS) $$tmpfil; \ + echo "=== finished processing file '$$s' (see file '$$tmpfil')"; \ + done + + include $(srcdir)/articles/en/Makefile.am include $(srcdir)/books/en/Makefile.am include $(srcdir)/lessons/en/Makefile.am @@ -42,6 +65,19 @@ include $(srcdir)/system/man5/en/Makefile.am include $(srcdir)/system/mann/en/Makefile.am + +docbook_sources = \ + $(articlesDOCBOOK_EN) \ + $(booksDOCBOOK_EN) \ + $(lessonsDOCBOOK_EN) \ + $(lessonsDOCBOOK_ES) \ + $(man1DOCBOOK_EN) \ + $(man3DOCBOOK_EN) \ + $(man5DOCBOOK_EN) \ + $(mannDOCBOOK_EN) \ + $(presentationsDOCBOOK_EN) \ + $(specificationsDOCBOOK_EN) + if BUILD_DOCS BUILT_SOURCES = \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-19 21:08:44
|
Revision: 46769 http://brlcad.svn.sourceforge.net/brlcad/?rev=46769&view=rev Author: tbrowder2 Date: 2011-09-19 21:08:38 +0000 (Mon, 19 Sep 2011) Log Message: ----------- remove all DB xml validation references Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-19 21:06:52 UTC (rev 46768) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-19 21:08:38 UTC (rev 46769) @@ -30,30 +30,6 @@ @mkdir -p $$(dirname $@) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $? -# validate docbook xml -XML_HEADER = "\<?xml version=\'1.0\' encoding=\'us-ascii\'?\>" -XML_TMPFILE = .tmp - -validate: validate_xmllint -# xmllint XInclude validation -XMLLINT = xmllint -RNG_SCHEMA = ./resources/docbook-5.0/rng/docbookxi.rng -XMLLINT_VALID_ARGS = --xinclude --relaxng $(RNG_SCHEMA) --noout --nonet -validate_xmllint: - @list='$(docbook_sources)'; test -n "$(docbook_sources)" || list=; \ - for s in $$list; do \ - dir="$$(dirname $$s)"; \ - tmpfil="$$dir/$(XML_TMPFILE)"; \ - echo "=== processing file '$$s' (see file '$$tmpfil')"; \ - if [ -f $$tmpfil ] ; then rm -f $$tmpfil ; fi ; \ - echo "$(XML_HEADER)" > $$tmpfil; \ - cat $$s >> $$tmpfil; \ - echo "$(XMLLINT) $(XMLLINT_VALID_ARGS) $$tmpfil"; \ - $(XMLLINT) $(XMLLINT_VALID_ARGS) $$tmpfil; \ - echo "=== finished processing file '$$s' (see file '$$tmpfil')"; \ - done - - include $(srcdir)/articles/en/Makefile.am include $(srcdir)/books/en/Makefile.am include $(srcdir)/lessons/en/Makefile.am @@ -66,18 +42,6 @@ include $(srcdir)/system/mann/en/Makefile.am -docbook_sources = \ - $(articlesDOCBOOK_EN) \ - $(booksDOCBOOK_EN) \ - $(lessonsDOCBOOK_EN) \ - $(lessonsDOCBOOK_ES) \ - $(man1DOCBOOK_EN) \ - $(man3DOCBOOK_EN) \ - $(man5DOCBOOK_EN) \ - $(mannDOCBOOK_EN) \ - $(presentationsDOCBOOK_EN) \ - $(specificationsDOCBOOK_EN) - if BUILD_DOCS BUILT_SOURCES = \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-21 00:43:50
|
Revision: 46810 http://brlcad.svn.sourceforge.net/brlcad/?rev=46810&view=rev Author: tbrowder2 Date: 2011-09-21 00:43:43 +0000 (Wed, 21 Sep 2011) Log Message: ----------- add xml catalogs to xsltproc and fop execution Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-21 00:42:22 UTC (rev 46809) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-21 00:43:43 UTC (rev 46810) @@ -1,34 +1,50 @@ XSLTPROC_FLAGS=--nonet --xinclude -XSL_XHTML_STYLESHEET=$(top_srcdir)/doc/docbook/resources/standard/xsl/xhtml-1_1/docbook.xsl -XSL_MAN_STYLESHEET=$(top_srcdir)/doc/docbook/resources/standard/xsl/manpages/docbook.xsl -XSL_FO_STYLESHEET=$(top_srcdir)/doc/docbook/resources/standard/xsl/fo/docbook.xsl -.xml.html: +XSL_XHTML_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-xhtml-stylesheet.xsl +XSL_MAN_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-man-stylesheet.xsl +XSL_FO_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-fo-stylesheet.xsl + +# two xml catalog files +XML_CATALOG=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-xml-catalog-autogen.xml +FOP_XML_CATALOG=$(top_srcdir)/doc/docbook/resources/brlcad/CatalogManage.properties +# both files as dependencies +XML_CATALOGS=$(FOP_XML_CATALOG) $(XML_CATALOG_FILE) + +# the xml catalog generator creates the two catalog files +GEN_XML_CATALOGS=$(top_srcdir)/doc/docbook/create-xml-catalogs.pl + +# the xml catalog location must be known by xsltproc +XSLTPROC_ENV_VARS = XML_CATALOG_FILES=$(XML_CATALOG) XML_DEBUG_CATALOG=1 + +$(XML_CATALOGS): $(GEN_XML_CATALOGS) BRLCAD_DOC.pm + perl $(GEN_XML_CATALOGS) + +.xml.html: $(XML_CATALOGS) @mkdir -p $$(dirname $@) - $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_XHTML_STYLESHEET) $? + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_XHTML_STYLESHEET) $? -.xml.1: - $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? +.xml.1: $(XML_CATALOGS) + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir -.xml.3: - $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? +.xml.3: $(XML_CATALOGS) + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir -.xml.5: - $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? +.xml.5: $(XML_CATALOGS) + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir -.xml.nged: - $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? +.xml.nged: $(XML_CATALOGS) + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .fo.pdf: .xml.fo $(APACHEFOP) -c fop.xconf $? -pdf $@ -.xml.fo: +.xml.fo: $(XML_CATALOGS) @mkdir -p $$(dirname $@) - $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $? + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $? include $(srcdir)/articles/en/Makefile.am include $(srcdir)/books/en/Makefile.am @@ -42,6 +58,7 @@ include $(srcdir)/system/mann/en/Makefile.am + if BUILD_DOCS BUILT_SOURCES = \ @@ -116,6 +133,7 @@ books/en/Makefile.am \ books/en/tutorial_series_authors.xml \ fop.xconf.in \ + DBPATH.pm.in \ lessons/CMakeLists.txt \ lessons/en/CMakeLists.txt \ lessons/en/Makefile.am \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-26 12:22:05
|
Revision: 46894 http://brlcad.svn.sourceforge.net/brlcad/?rev=46894&view=rev Author: tbrowder2 Date: 2011-09-26 12:21:58 +0000 (Mon, 26 Sep 2011) Log Message: ----------- add special non-auto-build target for pdf cover generation and testing Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-26 11:17:15 UTC (rev 46893) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-26 12:21:58 UTC (rev 46894) @@ -13,6 +13,16 @@ # the xml catalog generator creates the two catalog files GEN_XML_CATALOGS=$(top_srcdir)/doc/docbook/create-xml-catalogs.pl +# the covers generator uses the covers template to create a cover fo +# xsl for a book +GEN_FO_COVER=$(top_srcdir)/doc/docbook/create-book-covers.pl +# Perl doc module is a cover dep +DOC_MODULE=$(top_srcdir)/doc/docbook/BRLCAD_DOC.pm +# the template +FO_COVER_TEMPLATE=$(top_srcdir)/doc/docbook/book-covers-fo-template.xsl +# the dependencies +FO_COVER_DEPS=$(GEN_FO_COVER) $(FO_COVER_TEMPLATE) $(DOC_MODULE) $(XML_CATALOGS) + # the xml catalog location must be known by xsltproc XSLTPROC_ENV_VARS = XML_CATALOG_FILES=$(XML_CATALOG) XML_DEBUG_CATALOG=1 @@ -21,22 +31,22 @@ .xml.html: $(XML_CATALOGS) @mkdir -p $$(dirname $@) - $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_XHTML_STYLESHEET) $? + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_XHTML_STYLESHEET) $< .xml.1: $(XML_CATALOGS) - $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.3: $(XML_CATALOGS) - $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.5: $(XML_CATALOGS) - $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.nged: $(XML_CATALOGS) - $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $? + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .fo.pdf: .xml.fo @@ -46,14 +56,33 @@ @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $? +# special for pdf books with covers +.PHONY: cover +# the cover alone for testing +cover: books/en/BRL-CAD_Tutorial_Series-VolumeI.xml $(FO_COVER_DEPS) + perl create-book-covers.pl $< + @mkdir -p $$(dirname $@) + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o cover.pdf \ + $(XSL_FO_STYLESHEET) VolumeI-cover-fo.xsl $< + +# the books with covers +#books/en/BRL-CAD_Tutorial_Series-VolumeI.fo : books/en/BRL-CAD_Tutorial_Series-VolumeI.xml $(FO_COVER_DEPS) +# perl create-book-covers.pl $< +# @mkdir -p $$(dirname $@) +# $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ \ +# $(XSL_FO_STYLESHEET) VolumeI-cover-fo.xsl $? + # new index product indexDOCBOOK_EN = \ - index.xml + index.html -indexDOCBOOK_ENhtmldir = $(BRLCAD_DATA)/html +indexDOCBOOK_ENhtmldir = $(BRLCAD_DATA) indexDOCBOOK_ENhtml_DATA = \ $(BUILTINDEX_ENHTML) +BUILTINDEX_ENHTML = \ + ${indexDOCBOOK_EN} + include $(srcdir)/articles/en/Makefile.am include $(srcdir)/books/en/Makefile.am include $(srcdir)/lessons/en/Makefile.am This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-26 15:48:00
|
Revision: 46897 http://brlcad.svn.sourceforge.net/brlcad/?rev=46897&view=rev Author: tbrowder2 Date: 2011-09-26 15:47:53 +0000 (Mon, 26 Sep 2011) Log Message: ----------- add more defs and rules for making a test pdf doc with covers Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-26 15:46:29 UTC (rev 46896) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-26 15:47:53 UTC (rev 46897) @@ -3,6 +3,10 @@ XSL_XHTML_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-xhtml-stylesheet.xsl XSL_MAN_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-man-stylesheet.xsl XSL_FO_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-fo-stylesheet.xsl +# for covers +#XSL_FO_COVERS_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-fo-stylesheet-covers.xsl +# location during initial testing +XSL_FO_COVERS_STYLESHEET=$(top_srcdir)/doc/docbook/brlcad-fo-stylesheet-covers.xsl # two xml catalog files XML_CATALOG=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-xml-catalog-autogen.xml @@ -57,14 +61,16 @@ $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $? # special for pdf books with covers -.PHONY: cover +.PHONY: cover covers # the cover alone for testing -cover: books/en/BRL-CAD_Tutorial_Series-VolumeI.xml $(FO_COVER_DEPS) +cover: covers +covers: dummy.xml $(FO_COVER_DEPS) perl create-book-covers.pl $< - @mkdir -p $$(dirname $@) - $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o cover.pdf \ - $(XSL_FO_STYLESHEET) VolumeI-cover-fo.xsl $< + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o covers.fo \ + $(XSL_FO_COVERS_STYLESHEET) $< + $(APACHEFOP) -c fop.xconf covers.fo -pdf covers.pdf + # the books with covers #books/en/BRL-CAD_Tutorial_Series-VolumeI.fo : books/en/BRL-CAD_Tutorial_Series-VolumeI.xml $(FO_COVER_DEPS) # perl create-book-covers.pl $< This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-09-28 16:57:38
|
Revision: 46960 http://brlcad.svn.sourceforge.net/brlcad/?rev=46960&view=rev Author: brlcad Date: 2011-09-28 16:57:29 +0000 (Wed, 28 Sep 2011) Log Message: ----------- avoid gnu-makeisms by expanding the list manually since we still need to portably build via autotools for a few more releases. cmake should have a better solution. Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-28 15:40:54 UTC (rev 46959) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-28 16:57:29 UTC (rev 46960) @@ -100,8 +100,12 @@ # the books with covers -enbooksxml = $(wildcard books/en/BRL-CAD_Tutorial_Series-Volume*.xml) -enbooks = $(patsubst %.xml,%.fo, $(enbooksxml)) +enbooks = \ + docbook/books/en/BRL-CAD_Tutorial_Series-VolumeI.fo \ + docbook/books/en/BRL-CAD_Tutorial_Series-VolumeII.fo \ + docbook/books/en/BRL-CAD_Tutorial_Series-VolumeIII.fo \ + docbook/books/en/BRL-CAD_Tutorial_Series-VolumeIV.fo + $(enbooks): %.fo: %.xml $(FO_COVER_DEPS) perl create-book-covers.pl $< $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-09-28 17:04:06
|
Revision: 46962 http://brlcad.svn.sourceforge.net/brlcad/?rev=46962&view=rev Author: brlcad Date: 2011-09-28 17:03:58 +0000 (Wed, 28 Sep 2011) Log Message: ----------- getting an error about 'make[1]: *** No rule to make target all'. Stop.' .. don't yet know who is supposed to be generating that. Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-28 17:00:14 UTC (rev 46961) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-28 17:03:58 UTC (rev 46962) @@ -112,8 +112,8 @@ $(XSL_FO_COVERS_STYLESHEET) $< # new index product -indexDOCBOOK_EN = \ - index.html +#indexDOCBOOK_EN = \ +# index.html indexDOCBOOK_ENhtmldir = $(BRLCAD_DATA) indexDOCBOOK_ENhtml_DATA = \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-28 18:39:24
|
Revision: 46969 http://brlcad.svn.sourceforge.net/brlcad/?rev=46969&view=rev Author: tbrowder2 Date: 2011-09-28 18:39:16 +0000 (Wed, 28 Sep 2011) Log Message: ----------- correct final location of stylesheets Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-28 17:30:27 UTC (rev 46968) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-28 18:39:16 UTC (rev 46969) @@ -4,9 +4,7 @@ XSL_MAN_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-man-stylesheet.xsl XSL_FO_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-fo-stylesheet.xsl # for covers -#XSL_FO_COVERS_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-fo-stylesheet-covers.xsl -# location during initial testing -XSL_FO_COVERS_STYLESHEET=$(top_srcdir)/doc/docbook/brlcad-fo-stylesheet-covers.xsl +XSL_FO_COVERS_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-fo-stylesheet-covers.xsl # redefine APACHEFOP--better error checking APACHEFOP = FOP_OPTS="-Djava.awt.headless=true -Dxml.catalog.files=$(XML_CATALOG)" /usr/local/src/fop-1.0/fop @@ -34,7 +32,7 @@ # Perl doc module is a cover dep DOC_MODULE=$(top_srcdir)/doc/docbook/BRLCAD_DOC.pm # the template -FO_COVER_TEMPLATE=$(top_srcdir)/doc/docbook/book-covers-fo-template.xsl +FO_COVER_TEMPLATE=$(top_srcdir)/doc/docbook/resources/brlcad/book-covers-fo-template.xsl # the dependencies FO_COVER_DEPS=$(GEN_FO_COVER) $(FO_COVER_TEMPLATE) $(DOC_MODULE) $(XML_CATALOGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-28 18:48:03
|
Revision: 46970 http://brlcad.svn.sourceforge.net/brlcad/?rev=46970&view=rev Author: tbrowder2 Date: 2011-09-28 18:47:56 +0000 (Wed, 28 Sep 2011) Log Message: ----------- only want first dependency for the commands to operate on Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-28 18:39:16 UTC (rev 46969) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-28 18:47:56 UTC (rev 46970) @@ -63,11 +63,11 @@ @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .fo.pdf: .xml.fo - $(FOP_ENV_VARS) $(APACHEFOP) -c fop.xconf $? -pdf $@ + $(FOP_ENV_VARS) $(APACHEFOP) -c fop.xconf $< -pdf $@ .xml.fo: $(XML_CATALOGS) @mkdir -p $$(dirname $@) - $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $? + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $< # special for pdf books with covers .PHONY: cover covers This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-29 03:18:44
|
Revision: 46980 http://brlcad.svn.sourceforge.net/brlcad/?rev=46980&view=rev Author: tbrowder2 Date: 2011-09-29 03:18:37 +0000 (Thu, 29 Sep 2011) Log Message: ----------- add targets for testing book covers\nexectute create-book-covers for bot fo and pdf due to files changes with color changes for each volume Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-29 03:16:24 UTC (rev 46979) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-29 03:18:37 UTC (rev 46980) @@ -7,7 +7,9 @@ XSL_FO_COVERS_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-fo-stylesheet-covers.xsl # redefine APACHEFOP--better error checking -APACHEFOP = FOP_OPTS="-Djava.awt.headless=true -Dxml.catalog.files=$(XML_CATALOG)" /usr/local/src/fop-1.0/fop +FOP_OPTS = "-Djava.awt.headless=true -Dxml.catalog.files=$(XML_CATALOG)" +APACHEFOP = FOP_OPTS=$(FOP_OPTS) /usr/local/src/fop-1.0/fop + # fop hyphenation path (fop version >= 1.0) # need v2 hphenation FOP_HYPH=$(top_srcdir)/doc/docbook/resources/offo-hyphenation-binary-v2.0/fop-hyph.jar @@ -63,19 +65,41 @@ @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .fo.pdf: .xml.fo - $(FOP_ENV_VARS) $(APACHEFOP) -c fop.xconf $< -pdf $@ + $(FOP_ENV_VARS) $(APACHEFOP) -c fop.xconf -fo $< -pdf $@ .xml.fo: $(XML_CATALOGS) @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $< # special for pdf books with covers -.PHONY: cover covers +.PHONY: cover covers clean-covers clean-fonts + # the cover alone for testing fo_out = covers.fo pdf_out = covers.pdf +# a target to help test font problems +clean-fonts: + -rm articles/en/oed.pdf + -rm system/man1/en/gqa.pdf + -rm system/mann/en/db.pdf + -rm system/mann/en/em.pdf + -rm system/mann/en/gui.pdf + -rm system/mann/en/lm.pdf + -rm system/mann/en/t.pdf + -rm system/mann/en/title.pdf +# a target to test all enbook covers +clean-covers: + -rm books/en/BRL-CAD_Tutorial_Series-VolumeI.fo + -rm books/en/BRL-CAD_Tutorial_Series-VolumeII.fo + -rm books/en/BRL-CAD_Tutorial_Series-VolumeIII.fo + -rm books/en/BRL-CAD_Tutorial_Series-VolumeIV.fo + -rm books/en/BRL-CAD_Tutorial_Series-VolumeI.pdf + -rm books/en/BRL-CAD_Tutorial_Series-VolumeII.pdf + -rm books/en/BRL-CAD_Tutorial_Series-VolumeIII.pdf + -rm books/en/BRL-CAD_Tutorial_Series-VolumeIV.pdf + cover: covers covers: covers.pdf #verbose = --verbose @@ -98,17 +122,29 @@ # the books with covers +enbooksfo = \ + books/en/BRL-CAD_Tutorial_Series-VolumeI.fo \ + books/en/BRL-CAD_Tutorial_Series-VolumeII.fo \ + books/en/BRL-CAD_Tutorial_Series-VolumeIII.fo \ + books/en/BRL-CAD_Tutorial_Series-VolumeIV.fo + enbooks = \ - docbook/books/en/BRL-CAD_Tutorial_Series-VolumeI.fo \ - docbook/books/en/BRL-CAD_Tutorial_Series-VolumeII.fo \ - docbook/books/en/BRL-CAD_Tutorial_Series-VolumeIII.fo \ - docbook/books/en/BRL-CAD_Tutorial_Series-VolumeIV.fo + books/en/BRL-CAD_Tutorial_Series-VolumeI.pdf \ + books/en/BRL-CAD_Tutorial_Series-VolumeII.pdf \ + books/en/BRL-CAD_Tutorial_Series-VolumeIII.pdf \ + books/en/BRL-CAD_Tutorial_Series-VolumeIV.pdf -$(enbooks): %.fo: %.xml $(FO_COVER_DEPS) +# we must run create-book-covers.pl for fo AND pdf because we change +# files for each book for xsltproc and fop +$(enbooksfo): %.fo: %.xml $(FO_COVER_DEPS) perl create-book-covers.pl $< $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ \ $(XSL_FO_COVERS_STYLESHEET) $< +$(enbooks): %.pdf: %.fo $(FO_COVER_DEPS) + perl create-book-covers.pl $< + $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $< -pdf $@ + # new index product #indexDOCBOOK_EN = \ # index.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-29 12:30:04
|
Revision: 46983 http://brlcad.svn.sourceforge.net/brlcad/?rev=46983&view=rev Author: tbrowder2 Date: 2011-09-29 12:29:50 +0000 (Thu, 29 Sep 2011) Log Message: ----------- trimmed some fat; added missing tools to dist list Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-29 12:22:04 UTC (rev 46982) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-29 12:29:50 UTC (rev 46983) @@ -122,29 +122,19 @@ # the books with covers -enbooksfo = \ +enbooks = \ books/en/BRL-CAD_Tutorial_Series-VolumeI.fo \ books/en/BRL-CAD_Tutorial_Series-VolumeII.fo \ books/en/BRL-CAD_Tutorial_Series-VolumeIII.fo \ books/en/BRL-CAD_Tutorial_Series-VolumeIV.fo -enbooks = \ - books/en/BRL-CAD_Tutorial_Series-VolumeI.pdf \ - books/en/BRL-CAD_Tutorial_Series-VolumeII.pdf \ - books/en/BRL-CAD_Tutorial_Series-VolumeIII.pdf \ - books/en/BRL-CAD_Tutorial_Series-VolumeIV.pdf - -# we must run create-book-covers.pl for fo AND pdf because we change -# files for each book for xsltproc and fop -$(enbooksfo): %.fo: %.xml $(FO_COVER_DEPS) +# books need special cover stylesheets, and one for each book due to +# customized colors +$(enbooks): %.fo: %.xml $(FO_COVER_DEPS) perl create-book-covers.pl $< $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ \ $(XSL_FO_COVERS_STYLESHEET) $< -$(enbooks): %.pdf: %.fo $(FO_COVER_DEPS) - perl create-book-covers.pl $< - $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $< -pdf $@ - # new index product #indexDOCBOOK_EN = \ # index.html @@ -231,9 +221,12 @@ ${presentationsDOCBOOK_EN_IMAGES} \ ${presentationsDOCBOOK_EN} \ ${specificationsDOCBOOK_EN} \ + BRLCAD_DB_VALIDATION.pm \ + BRLCAD_DOC.pm \ CMakeLists.txt \ DBPATH.pm.in \ README \ + README.DB_authors_notes \ articles/CMakeLists.txt \ articles/en/CMakeLists.txt \ articles/en/Makefile.am \ @@ -244,6 +237,7 @@ books/en/CMakeLists.txt \ books/en/Makefile.am \ books/en/tutorial_series_authors.xml \ + create-book-covers.pl \ create-index.pl \ create-xml-catalogs.pl \ find-db-files.pl \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-29 18:49:42
|
Revision: 46989 http://brlcad.svn.sourceforge.net/brlcad/?rev=46989&view=rev Author: tbrowder2 Date: 2011-09-29 18:49:34 +0000 (Thu, 29 Sep 2011) Log Message: ----------- current process for DB book covers does not allow parallel make processes so using special .NOTPARALLEL target; also requires having book pdf generation in one recipe from xml to fo to pdf Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-29 18:10:02 UTC (rev 46988) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-29 18:49:34 UTC (rev 46989) @@ -36,7 +36,7 @@ # the template FO_COVER_TEMPLATE=$(top_srcdir)/doc/docbook/resources/brlcad/book-covers-fo-template.xsl # the dependencies -FO_COVER_DEPS=$(GEN_FO_COVER) $(FO_COVER_TEMPLATE) $(DOC_MODULE) $(XML_CATALOGS) +FO_COVER_DEPS=$(GEN_FO_COVER) $(FO_COVER_TEMPLATE) $(DOC_MODULE) # the xml catalog location must be known by xsltproc XSLTPROC_ENV_VARS = XML_CATALOG_FILES=$(XML_CATALOG) XML_DEBUG_CATALOG=1 @@ -120,20 +120,26 @@ $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $(fo_out) -pdf $(pdf_out) @echo ============ finished making $(pdf_out) ============= +# we cannot get good covers at the moment if the make -j option is +# used so use the special target to prevent it from taking effect +.NOTPARALLEL: # the books with covers enbooks = \ - books/en/BRL-CAD_Tutorial_Series-VolumeI.fo \ - books/en/BRL-CAD_Tutorial_Series-VolumeII.fo \ - books/en/BRL-CAD_Tutorial_Series-VolumeIII.fo \ - books/en/BRL-CAD_Tutorial_Series-VolumeIV.fo + books/en/BRL-CAD_Tutorial_Series-VolumeI.pdf \ + books/en/BRL-CAD_Tutorial_Series-VolumeII.pdf \ + books/en/BRL-CAD_Tutorial_Series-VolumeIII.pdf \ + books/en/BRL-CAD_Tutorial_Series-VolumeIV.pdf # books need special cover stylesheets, and one for each book due to # customized colors -$(enbooks): %.fo: %.xml $(FO_COVER_DEPS) +fo_book = tmp.fo +$(enbooks): %.pdf: %.xml $(FO_COVER_DEPS) perl create-book-covers.pl $< - $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ \ + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(fo_book) \ $(XSL_FO_COVERS_STYLESHEET) $< + $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $(fo_book) -pdf $@ \ + && if test -f $(fo_book) ; then rm $(fo_book) ; fi # new index product #indexDOCBOOK_EN = \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-30 16:00:32
|
Revision: 46999 http://brlcad.svn.sourceforge.net/brlcad/?rev=46999&view=rev Author: tbrowder2 Date: 2011-09-30 16:00:21 +0000 (Fri, 30 Sep 2011) Log Message: ----------- remove unused dependencies in suffix rules Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-30 14:47:45 UTC (rev 46998) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-30 16:00:21 UTC (rev 46999) @@ -44,30 +44,30 @@ $(XML_CATALOGS): $(GEN_XML_CATALOGS) BRLCAD_DOC.pm perl $(GEN_XML_CATALOGS) -.xml.html: $(XML_CATALOGS) +.xml.html: @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_XHTML_STYLESHEET) $< -.xml.1: $(XML_CATALOGS) +.xml.1: $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir -.xml.3: $(XML_CATALOGS) +.xml.3: $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir -.xml.5: $(XML_CATALOGS) +.xml.5: $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir -.xml.nged: $(XML_CATALOGS) +.xml.nged: $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir -.fo.pdf: .xml.fo +.fo.pdf: $(FOP_ENV_VARS) $(APACHEFOP) -c fop.xconf -fo $< -pdf $@ -.xml.fo: $(XML_CATALOGS) +.xml.fo: @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $< This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-09-30 20:38:05
|
Revision: 47003 http://brlcad.svn.sourceforge.net/brlcad/?rev=47003&view=rev Author: tbrowder2 Date: 2011-09-30 20:37:58 +0000 (Fri, 30 Sep 2011) Log Message: ----------- added a test for the xml catalog, and regeneration if necessary, to all suffix rules that use xsltproc; added xml catalog as a dependency to other rules using xsltproc Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-09-30 19:22:12 UTC (rev 47002) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-09-30 20:37:58 UTC (rev 47003) @@ -45,29 +45,36 @@ perl $(GEN_XML_CATALOGS) .xml.html: + if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_XHTML_STYLESHEET) $< .xml.1: + if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.3: + if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.5: + if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.nged: + if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .fo.pdf: + if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(FOP_ENV_VARS) $(APACHEFOP) -c fop.xconf -fo $< -pdf $@ .xml.fo: + if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $< @@ -104,7 +111,7 @@ covers: covers.pdf #verbose = --verbose #fobdebug = -d -covers.fo: dummy.xml $(FO_COVER_DEPS) +covers.fo: dummy.xml $(FO_COVER_DEPS) $(XML_CATALOG) perl create-book-covers.pl $< @echo ============ making fo... ============= $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(verbose) -o $(fo_out) \ @@ -134,7 +141,7 @@ # books need special cover stylesheets, and one for each book due to # customized colors fo_book = tmp.fo -$(enbooks): %.pdf: %.xml $(FO_COVER_DEPS) +$(enbooks): %.pdf: %.xml $(FO_COVER_DEPS) $(XML_CATALOG) perl create-book-covers.pl $< $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(fo_book) \ $(XSL_FO_COVERS_STYLESHEET) $< This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-10-02 17:34:14
|
Revision: 47022 http://brlcad.svn.sourceforge.net/brlcad/?rev=47022&view=rev Author: tbrowder2 Date: 2011-10-02 17:34:07 +0000 (Sun, 02 Oct 2011) Log Message: ----------- mods to allow en book pdf generation with no parallel make restrictions; some convenience definition macros used Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-10-02 17:32:27 UTC (rev 47021) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-10-02 17:34:07 UTC (rev 47022) @@ -2,9 +2,8 @@ XSL_XHTML_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-xhtml-stylesheet.xsl XSL_MAN_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-man-stylesheet.xsl +# not used for docs without covers: XSL_FO_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-fo-stylesheet.xsl -# for covers -XSL_FO_COVERS_STYLESHEET=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-fo-stylesheet-covers.xsl # redefine APACHEFOP--better error checking FOP_OPTS = "-Djava.awt.headless=true -Dxml.catalog.files=$(XML_CATALOG)" @@ -73,8 +72,8 @@ if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(FOP_ENV_VARS) $(APACHEFOP) -c fop.xconf -fo $< -pdf $@ +# this rule must not be applied to books .xml.fo: - if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $< @@ -127,10 +126,6 @@ $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $(fo_out) -pdf $(pdf_out) @echo ============ finished making $(pdf_out) ============= -# we cannot get good covers at the moment if the make -j option is -# used so use the special target to prevent it from taking effect -.NOTPARALLEL: - # the books with covers enbooks = \ books/en/BRL-CAD_Tutorial_Series-VolumeI.pdf \ @@ -140,14 +135,73 @@ # books need special cover stylesheets, and one for each book due to # customized colors -fo_book = tmp.fo -$(enbooks): %.pdf: %.xml $(FO_COVER_DEPS) $(XML_CATALOG) - perl create-book-covers.pl $< - $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(fo_book) \ - $(XSL_FO_COVERS_STYLESHEET) $< - $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $(fo_book) -pdf $@ \ - && if test -f $(fo_book) ; then rm $(fo_book) ; fi +foss=doc/docbook/resources/brlcad/brlcad-fo-stylesheet-covers +covers_ss_v1=$(top_srcdir)/$(foss)-v1.xsl +covers_ss_v2=$(top_srcdir)/$(foss)-v2.xsl +covers_ss_v3=$(top_srcdir)/$(foss)-v3.xsl +covers_ss_v4=$(top_srcdir)/$(foss)-v4.xsl + +# the actual cover ss +autofoss=doc/docbook/resources/brlcad/book-covers-fo-autogen +autogen_covers_ss_v1=$(top_srcdir)/$(autofoss)-v1.xsl +autogen_covers_ss_v2=$(top_srcdir)/$(autofoss)-v2.xsl +autogen_covers_ss_v3=$(top_srcdir)/$(autofoss)-v3.xsl +autogen_covers_ss_v4=$(top_srcdir)/$(autofoss)-v4.xsl + +booksen1 = books/en/BRL-CAD_Tutorial_Series-VolumeI +booksen2 = books/en/BRL-CAD_Tutorial_Series-VolumeII +booksen3 = books/en/BRL-CAD_Tutorial_Series-VolumeIII +booksen4 = books/en/BRL-CAD_Tutorial_Series-VolumeIV + +$(autogen_covers_ss_v1): $(booksen1).xml $(FOP_COVER_DEPS) + ./create-book-covers.pl $< + +$(autogen_covers_ss_v2): $(booksen2).xml $(FOP_COVER_DEPS) + ./create-book-covers.pl $< + +$(autogen_covers_ss_v3): $(booksen3).xml $(FOP_COVER_DEPS) + ./create-book-covers.pl $< + +$(autogen_covers_ss_v4): $(booksen4).xml $(FOP_COVER_DEPS) + ./create-book-covers.pl $< + +# en book fo +$(booksen1).fo : $(booksen1).xml $(FO_COVER_DEPS) $(XML_CATALOG) $(autogen_covers_ss_v1) + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ \ + $(covers_ss_v1) $< + +$(booksen2).fo : $(booksen2).xml $(FO_COVER_DEPS) $(XML_CATALOG) $(autogen_covers_ss_v2) + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ \ + $(covers_ss_v2) $< + +$(booksen3).fo : $(booksen3).xml $(FO_COVER_DEPS) $(XML_CATALOG) $(autogen_covers_ss_v3) + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ \ + $(covers_ss_v3) $< + +$(booksen4).fo : $(booksen4).xml $(FO_COVER_DEPS) $(XML_CATALOG) $(autogen_covers_ss_v4) + $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ \ + $(covers_ss_v4) $< + +# en book pdf +# && if test -f $< ; then rm $< ; fi +$(booksen1).pdf : $(booksen1).fo $(XML_CATALOG) + $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $< -pdf $@ \ + && if test -f $< ; then rm $< ; fi + +$(booksen2).pdf : $(booksen2).fo $(XML_CATALOG) + $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $< -pdf $@ \ + && if test -f $< ; then rm $< ; fi + +$(booksen3).pdf : $(booksen3).fo $(XML_CATALOG) + $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $< -pdf $@ \ + && if test -f $< ; then rm $< ; fi + +$(booksen4).pdf : $(booksen4).fo $(XML_CATALOG) + $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $< -pdf $@ \ + && if test -f $< ; then rm $< ; fi + + # new index product #indexDOCBOOK_EN = \ # index.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-10-03 16:45:09
|
Revision: 47030 http://brlcad.svn.sourceforge.net/brlcad/?rev=47030&view=rev Author: tbrowder2 Date: 2011-10-03 16:45:03 +0000 (Mon, 03 Oct 2011) Log Message: ----------- add suffix rule dependencies portably; remove recipe statements no longer needed; add helpful comments Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-10-03 16:43:08 UTC (rev 47029) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-10-03 16:45:03 UTC (rev 47030) @@ -43,33 +43,37 @@ $(XML_CATALOGS): $(GEN_XML_CATALOGS) BRLCAD_DOC.pm perl $(GEN_XML_CATALOGS) +XSLTPROC_DEPS=$(XML_CATALOGS) $(XSL_FO_STYLESHEET) $(XSL_XHTML_STYLESHEET) $(XSL_MAN_STYLESHEET) + +# define extra dependencies for some double suffix rules: +.html: resources/brlcad/brlcad-xhtml-stylesheet.xsl $(XSLTPROC_DEPS) +.1: resources/brlcad/brlcad-xhtml-stylesheet.xsl $(XSLTPROC_DEPS) +.3: resources/brlcad/brlcad-xhtml-stylesheet.xsl $(XSLTPROC_DEPS) +.5: resources/brlcad/brlcad-xhtml-stylesheet.xsl $(XSLTPROC_DEPS) +.nged: resources/brlcad/brlcad-xhtml-stylesheet.xsl $(XSLTPROC_DEPS) +.fo: $(XSLTPROC_DEPS) + .xml.html: - if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_XHTML_STYLESHEET) $< .xml.1: - if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.3: - if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.5: - if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.nged: - if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .fo.pdf: - if test ! -f $(XML_CATALOG) ; then ./create-xml-catalogs.pl ; fi $(FOP_ENV_VARS) $(APACHEFOP) -c fop.xconf -fo $< -pdf $@ # this rule must not be applied to books @@ -185,6 +189,7 @@ # en book pdf # && if test -f $< ; then rm $< ; fi +# for fo debugging, comment out the lines that remove the fo files $(booksen1).pdf : $(booksen1).fo $(XML_CATALOG) $(FOP_ENV_VARS) $(APACHEFOP) $(fopdebug) -c fop.xconf -fo $< -pdf $@ \ && if test -f $< ; then rm $< ; fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-10-03 19:02:00
|
Revision: 47033 http://brlcad.svn.sourceforge.net/brlcad/?rev=47033&view=rev Author: tbrowder2 Date: 2011-10-03 19:01:49 +0000 (Mon, 03 Oct 2011) Log Message: ----------- ensure doc/docbook/css dir and files are installed Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-10-03 16:46:41 UTC (rev 47032) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-10-03 19:01:49 UTC (rev 47033) @@ -275,12 +275,16 @@ $(BUILTMAN_EN_SOURCES) \ $(BUILT_SOURCES) +# source and dest dir for BRLCAD html css stylesheets +cssBRLCADdir = $(BRLCAD_DATA)/html/css +cssBRLCAD_DATA = css/brlcad.css EXTRA_DIST = \ ${articlesDOCBOOK_EN_IMAGES} \ ${articlesDOCBOOK_EN} \ ${booksDOCBOOK_EN_IMAGES} \ ${booksDOCBOOK_EN} \ + ${cssBRLCAD_DATA} \ ${lessonsDOCBOOK_EN_IMAGES} \ ${lessonsDOCBOOK_EN} \ ${lessonsDOCBOOK_ES_IMAGES} \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2011-10-04 20:39:58
|
Revision: 47079 http://brlcad.svn.sourceforge.net/brlcad/?rev=47079&view=rev Author: tbrowder2 Date: 2011-10-04 20:39:51 +0000 (Tue, 04 Oct 2011) Log Message: ----------- correct path for new offo hyphenation binary Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-10-04 20:35:53 UTC (rev 47078) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-10-04 20:39:51 UTC (rev 47079) @@ -11,7 +11,7 @@ # fop hyphenation path (fop version >= 1.0) # need v2 hphenation -FOP_HYPH=$(top_srcdir)/doc/docbook/resources/offo-hyphenation-binary-v2.0/fop-hyph.jar +FOP_HYPH=$(top_srcdir)/doc/docbook/resources/other/offo/binary/fop-hyph.jar # fop hyphenation path (fop version < 1.0) #FOP_HYPH=$(top_srcdir)/doc/docbook/resources/offo-hyphenation-fop-stable-binary-v1.2/fop-hyph.jar @@ -40,7 +40,7 @@ # the xml catalog location must be known by xsltproc XSLTPROC_ENV_VARS = XML_CATALOG_FILES=$(XML_CATALOG) XML_DEBUG_CATALOG=1 -$(XML_CATALOGS): $(GEN_XML_CATALOGS) BRLCAD_DOC.pm +$(XML_CATALOG): $(GEN_XML_CATALOGS) BRLCAD_DOC.pm perl $(GEN_XML_CATALOGS) XSLTPROC_DEPS=$(XML_CATALOGS) $(XSL_FO_STYLESHEET) $(XSL_XHTML_STYLESHEET) $(XSL_MAN_STYLESHEET) @@ -53,23 +53,30 @@ .nged: resources/brlcad/brlcad-xhtml-stylesheet.xsl $(XSLTPROC_DEPS) .fo: $(XSLTPROC_DEPS) +# the xml_catalog dependency doesn't seem to work--hard wire it then +# if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi .xml.html: + if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_XHTML_STYLESHEET) $< .xml.1: + if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.3: + if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.5: + if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.nged: + if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir @@ -78,6 +85,7 @@ # this rule must not be applied to books .xml.fo: + if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $< This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-10-12 22:03:41
|
Revision: 47208 http://brlcad.svn.sourceforge.net/brlcad/?rev=47208&view=rev Author: brlcad Date: 2011-10-12 22:03:35 +0000 (Wed, 12 Oct 2011) Log Message: ----------- this seems to get things working for an out-of-dir build. needed to tell perl where the perl module resided and not assume the generated catalog generator file is in the source dir. Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-10-12 22:02:19 UTC (rev 47207) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-10-12 22:03:35 UTC (rev 47208) @@ -19,7 +19,7 @@ FOP_ENV_VARS = FOP_HYPHENATION_PATH=$(FOP_HYPH) CLASSPATH=$(top_srcdir)/doc/docbook # two xml catalog files -XML_CATALOG=$(top_srcdir)/doc/docbook/resources/brlcad/brlcad-xml-catalog-autogen.xml +XML_CATALOG=resources/brlcad/brlcad-xml-catalog-autogen.xml FOP_XML_CATALOG=$(top_srcdir)/doc/docbook/resources/brlcad/CatalogManage.properties # both files as dependencies XML_CATALOGS=$(FOP_XML_CATALOG) $(XML_CATALOG) @@ -41,7 +41,7 @@ XSLTPROC_ENV_VARS = XML_CATALOG_FILES=$(XML_CATALOG) XML_DEBUG_CATALOG=1 $(XML_CATALOG): $(GEN_XML_CATALOGS) BRLCAD_DOC.pm - perl $(GEN_XML_CATALOGS) + perl -I $(top_srcdir)/doc/docbook $(GEN_XML_CATALOGS) XSLTPROC_DEPS=$(XML_CATALOGS) $(XSL_FO_STYLESHEET) $(XSL_XHTML_STYLESHEET) $(XSL_MAN_STYLESHEET) @@ -54,29 +54,28 @@ .fo: $(XSLTPROC_DEPS) # the xml_catalog dependency doesn't seem to work--hard wire it then -# if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi .xml.html: - if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi + if test ! -f $(XML_CATALOG) ; then perl -I $(top_srcdir)/doc/docbook $(GEN_XML_CATALOGS) ; fi @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_XHTML_STYLESHEET) $< .xml.1: - if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi + if test ! -f $(XML_CATALOG) ; then perl -I $(top_srcdir)/doc/docbook $(GEN_XML_CATALOGS) ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.3: - if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi + if test ! -f $(XML_CATALOG) ; then perl -I $(top_srcdir)/doc/docbook $(GEN_XML_CATALOGS) ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.5: - if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi + if test ! -f $(XML_CATALOG) ; then perl -I $(top_srcdir)/doc/docbook $(GEN_XML_CATALOGS) ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir .xml.nged: - if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi + if test ! -f $(XML_CATALOG) ; then perl -I $(top_srcdir)/doc/docbook $(GEN_XML_CATALOGS) ; fi $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSL_MAN_STYLESHEET) $< @dir="$$(dirname $@)" && mkdir -p $$dir && mv '$(@F)' $$dir @@ -85,7 +84,7 @@ # this rule must not be applied to books .xml.fo: - if test ! -f $(XML_CATALOG) ; then perl $(GEN_XML_CATALOGS) ; fi + if test ! -f $(XML_CATALOG) ; then perl -I $(top_srcdir)/doc/docbook $(GEN_XML_CATALOGS) ; fi @mkdir -p $$(dirname $@) $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) -o $@ $(XSL_FO_STYLESHEET) $< @@ -123,7 +122,7 @@ #verbose = --verbose #fobdebug = -d covers.fo: dummy.xml $(FO_COVER_DEPS) $(XML_CATALOG) - perl create-book-covers.pl $< + perl -I $(top_srcdir)/doc/docbook create-book-covers.pl $< @echo ============ making fo... ============= $(XSLTPROC_ENV_VARS) $(XSLTPROC) $(XSLTPROC_FLAGS) $(verbose) -o $(fo_out) \ $(XSL_FO_COVERS_STYLESHEET) $< This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-10-19 02:40:12
|
Revision: 47300 http://brlcad.svn.sourceforge.net/brlcad/?rev=47300&view=rev Author: brlcad Date: 2011-10-19 02:40:05 +0000 (Wed, 19 Oct 2011) Log Message: ----------- typo, should be CatalogManager.properties Modified Paths: -------------- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am =================================================================== --- brlcad/trunk/doc/docbook/Makefile.am 2011-10-19 02:16:16 UTC (rev 47299) +++ brlcad/trunk/doc/docbook/Makefile.am 2011-10-19 02:40:05 UTC (rev 47300) @@ -20,7 +20,7 @@ # two xml catalog files XML_CATALOG=resources/brlcad/brlcad-xml-catalog-autogen.xml -FOP_XML_CATALOG=$(top_srcdir)/doc/docbook/resources/brlcad/CatalogManage.properties +FOP_XML_CATALOG=$(top_srcdir)/doc/docbook/resources/brlcad/CatalogManager.properties # both files as dependencies XML_CATALOGS=$(FOP_XML_CATALOG) $(XML_CATALOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |