Revision: 42262
http://brlcad.svn.sourceforge.net/brlcad/?rev=42262&view=rev
Author: starseeker
Date: 2011-01-14 15:02:32 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
Get docbook generation working in such a way that it puts files in the proper
places for build-dir hierarchy.
Modified Paths:
--------------
brlcad/branches/cmake/doc/docbook/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/articles/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/books/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/lessons/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/lessons/es/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/specifications/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/system/man1/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/system/man3/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/system/man5/en/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/system/mann/en/CMakeLists.txt
Modified: brlcad/branches/cmake/doc/docbook/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/CMakeLists.txt 2011-01-14 14:57:21 UTC
(rev 42261)
+++ brlcad/branches/cmake/doc/docbook/CMakeLists.txt 2011-01-14 15:02:32 UTC
(rev 42262)
@@ -13,21 +13,21 @@
MACRO(DOCBOOK_TO_HTML targetname_suffix xml_files targetdir)
FOREACH(filename ${${xml_files}})
STRING(REGEX REPLACE "([0-9a-z_-]*).xml" "\\1" filename_root
"${filename}")
- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.html)
+ SET(outfile
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/${filename_root}.html)
SET(targetname ${filename_root}_${targetname_suffix}_html)
ADD_CUSTOM_COMMAND(
OUTPUT ${outfile}
COMMAND XML_CATALOG_FILES=${XML_CATALOG_FILES}
${XSLTPROC_EXEC} ${XSLTPROC_FLAGS} -o ${outfile} ${XSL_XHTML_STYLESHEET}
${CMAKE_CURRENT_SOURCE_DIR}/${filename}
)
ADD_CUSTOM_TARGET(${targetname} ALL DEPENDS ${outfile})
- INSTALL(FILES ${outfile} DESTINATION ${targetdir})
+ INSTALL(FILES ${outfile} DESTINATION
${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
ENDFOREACH(filename ${${xml_files}})
ENDMACRO(DOCBOOK_TO_HTML targetname_suffix srcfile outfile targetdir)
-MACRO(DOCBOOK_TO_MAN targetname_suffix xml_files mannum manext)
+MACRO(DOCBOOK_TO_MAN targetname_suffix xml_files mannum manext targetdir)
FOREACH(filename ${${xml_files}})
STRING(REGEX REPLACE "([0-9a-z_-]*).xml" "\\1" filename_root
"${filename}")
- SET(outfile
${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.${manext})
+ SET(outfile
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/${filename_root}.${manext})
SET(targetname
${filename_root}_${targetname_suffix}_man${mannum})
ADD_CUSTOM_COMMAND(
OUTPUT ${outfile}
@@ -42,8 +42,9 @@
FOREACH(filename ${${xml_files}})
STRING(REGEX REPLACE "([0-9a-z_-]*).xml" "\\1" filename_root
"${filename}")
SET(tmp_fo_file ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.fo)
- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.pdf)
+ SET(outfile
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/${filename_root}.pdf)
SET(targetname ${filename_root}_${targetname_suffix}_pdf)
+ FILE(MAKE_DIRECTORY
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir})
ADD_CUSTOM_COMMAND(
OUTPUT ${tmp_fo_file}
COMMAND XML_CATALOG_FILES=${XML_CATALOG_FILES}
${XSLTPROC_EXEC} ${XSLTPROC_FLAGS} -o ${tmp_fo_file} ${XSL_FO_STYLESHEET}
${CMAKE_CURRENT_SOURCE_DIR}/${filename}
@@ -54,7 +55,7 @@
DEPENDS ${tmp_fo_file}
)
ADD_CUSTOM_TARGET(${targetname} ALL DEPENDS ${outfile})
- INSTALL(FILES ${outfile} DESTINATION ${targetdir})
+ INSTALL(FILES ${outfile} DESTINATION
${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
ENDFOREACH(filename ${${xml_files}})
ENDMACRO(DOCBOOK_TO_PDF targetname_suffix srcfile outfile targetdir)
Modified: brlcad/branches/cmake/doc/docbook/articles/en/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/articles/en/CMakeLists.txt
2011-01-14 14:57:21 UTC (rev 42261)
+++ brlcad/branches/cmake/doc/docbook/articles/en/CMakeLists.txt
2011-01-14 15:02:32 UTC (rev 42262)
@@ -101,9 +101,10 @@
images/tire_fig14.png
)
-DOCBOOK_TO_HTML(article docbook_articles_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/articles/en)
+DOCBOOK_TO_HTML(article docbook_articles_EN html/articles/en)
+FILE(COPY ${docbook_articles_EN_IMAGES} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/articles/en/images)
INSTALL(FILES ${docbook_articles_EN_IMAGES} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/articles/en/images)
IF(BRLCAD-BUILD_EXTRADOCS_PDF)
- DOCBOOK_TO_PDF(article docbook_articles_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pdf/articles/en)
+ DOCBOOK_TO_PDF(article docbook_articles_EN pdf/articles/en)
ENDIF(BRLCAD-BUILD_EXTRADOCS_PDF)
Modified: brlcad/branches/cmake/doc/docbook/books/en/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/books/en/CMakeLists.txt 2011-01-14
14:57:21 UTC (rev 42261)
+++ brlcad/branches/cmake/doc/docbook/books/en/CMakeLists.txt 2011-01-14
15:02:32 UTC (rev 42262)
@@ -45,9 +45,10 @@
images/tutorial_series_volIII_table_image_1.png
)
-DOCBOOK_TO_HTML(book docbook_books_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/books/en)
+DOCBOOK_TO_HTML(book docbook_books_EN html/books/en)
+FILE(COPY ${docbook_books_EN_IMAGES} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/books/en/images)
INSTALL(FILES ${docbook_books_EN_IMAGES} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/books/en/images)
IF(BRLCAD-BUILD_EXTRADOCS_PDF)
- DOCBOOK_TO_PDF(book docbook_books_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pdf/books/en)
+ DOCBOOK_TO_PDF(book docbook_books_EN pdf/books/en)
ENDIF(BRLCAD-BUILD_EXTRADOCS_PDF)
Modified: brlcad/branches/cmake/doc/docbook/lessons/en/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/lessons/en/CMakeLists.txt 2011-01-14
14:57:21 UTC (rev 42261)
+++ brlcad/branches/cmake/doc/docbook/lessons/en/CMakeLists.txt 2011-01-14
15:02:32 UTC (rev 42262)
@@ -131,7 +131,8 @@
images/mged16_radio_cutaways.png
)
-DOCBOOK_TO_HTML(lesson docbook_lessons_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/lessons/en)
+DOCBOOK_TO_HTML(lesson docbook_lessons_EN html/lessons/en)
+FILE(COPY ${docbook_lessons_EN_IMAGES} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/lessons/en/images)
INSTALL(FILES ${docbook_lessons_EN_IMAGES} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/lessons/en/images)
Modified: brlcad/branches/cmake/doc/docbook/lessons/es/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/lessons/es/CMakeLists.txt 2011-01-14
14:57:21 UTC (rev 42261)
+++ brlcad/branches/cmake/doc/docbook/lessons/es/CMakeLists.txt 2011-01-14
15:02:32 UTC (rev 42262)
@@ -128,6 +128,7 @@
)
DOCBOOK_TO_HTML(lesson_ES docbook_lessons_ES
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/lessons/es)
+FILE(COPY ${docbook_lessons_ES_IMAGES} DESTINATION
${CMAKE_BINARY_DIR}/${DATA_DIR}/html/lessons/es/images)
INSTALL(FILES ${docbook_lessons_ES_IMAGES} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/lessons/es/images)
IF(BRLCAD-BUILD_EXTRADOCS_PDF)
Modified: brlcad/branches/cmake/doc/docbook/specifications/en/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/specifications/en/CMakeLists.txt
2011-01-14 14:57:21 UTC (rev 42261)
+++ brlcad/branches/cmake/doc/docbook/specifications/en/CMakeLists.txt
2011-01-14 15:02:32 UTC (rev 42262)
@@ -2,8 +2,8 @@
BRL_CAD_g_format_V5.xml
)
-DOCBOOK_TO_HTML(specification docbook_specifications_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/specifications/en)
+DOCBOOK_TO_HTML(specification docbook_specifications_EN html/specifications/en)
IF(BRLCAD-BUILD_EXTRADOCS_PDF)
- DOCBOOK_TO_PDF(specification docbook_specifications_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pdf/specifications/en)
+ DOCBOOK_TO_PDF(specification docbook_specifications_EN
pdf/specifications/en)
ENDIF(BRLCAD-BUILD_EXTRADOCS_PDF)
Modified: brlcad/branches/cmake/doc/docbook/system/man1/en/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/system/man1/en/CMakeLists.txt
2011-01-14 14:57:21 UTC (rev 42261)
+++ brlcad/branches/cmake/doc/docbook/system/man1/en/CMakeLists.txt
2011-01-14 15:02:32 UTC (rev 42262)
@@ -13,9 +13,9 @@
tire.xml
)
-DOCBOOK_TO_HTML(man1 docbook_man1_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/man1/en)
-DOCBOOK_TO_MAN(man1 docbook_man1_EN 1 1)
+DOCBOOK_TO_HTML(man1 docbook_man1_EN html/man1/en)
+DOCBOOK_TO_MAN(man1 docbook_man1_EN 1 1 man/man1)
IF(BRLCAD-BUILD_EXTRADOCS_PDF_MAN)
- DOCBOOK_TO_PDF(man1 docbook_man1_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pdf/man1/en)
+ DOCBOOK_TO_PDF(man1 docbook_man1_EN pdf/man1/en)
ENDIF(BRLCAD-BUILD_EXTRADOCS_PDF_MAN)
Modified: brlcad/branches/cmake/doc/docbook/system/man3/en/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/system/man3/en/CMakeLists.txt
2011-01-14 14:57:21 UTC (rev 42261)
+++ brlcad/branches/cmake/doc/docbook/system/man3/en/CMakeLists.txt
2011-01-14 15:02:32 UTC (rev 42262)
@@ -2,10 +2,10 @@
libfb.xml
)
-DOCBOOK_TO_HTML(man3 docbook_man3_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/man3/en)
-DOCBOOK_TO_MAN(man3 docbook_man3_EN 3 3)
+DOCBOOK_TO_HTML(man3 docbook_man3_EN html/man3/en)
+DOCBOOK_TO_MAN(man3 docbook_man3_EN 3 3 man/man3)
IF(BRLCAD-BUILD_EXTRADOCS_PDF_MAN)
- DOCBOOK_TO_PDF(man3 docbook_man3_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pdf/man3/en)
+ DOCBOOK_TO_PDF(man3 docbook_man3_EN pdf/man3/en)
ENDIF(BRLCAD-BUILD_EXTRADOCS_PDF_MAN)
Modified: brlcad/branches/cmake/doc/docbook/system/man5/en/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/system/man5/en/CMakeLists.txt
2011-01-14 14:57:21 UTC (rev 42261)
+++ brlcad/branches/cmake/doc/docbook/system/man5/en/CMakeLists.txt
2011-01-14 15:02:32 UTC (rev 42262)
@@ -2,9 +2,9 @@
gattributes.xml
)
-DOCBOOK_TO_HTML(man5 docbook_man5_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/man5/en)
-DOCBOOK_TO_MAN(man5 docbook_man5_EN 5 5)
+DOCBOOK_TO_HTML(man5 docbook_man5_EN html/man5/en)
+DOCBOOK_TO_MAN(man5 docbook_man5_EN 5 5 man/man5)
IF(BRLCAD-BUILD_EXTRADOCS_PDF_MAN)
- DOCBOOK_TO_PDF(man5 docbook_man5_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pdf/man5/en)
+ DOCBOOK_TO_PDF(man5 docbook_man5_EN pdf/man5/en)
ENDIF(BRLCAD-BUILD_EXTRADOCS_PDF_MAN)
Modified: brlcad/branches/cmake/doc/docbook/system/mann/en/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/system/mann/en/CMakeLists.txt
2011-01-14 14:57:21 UTC (rev 42261)
+++ brlcad/branches/cmake/doc/docbook/system/mann/en/CMakeLists.txt
2011-01-14 15:02:32 UTC (rev 42262)
@@ -256,11 +256,11 @@
${UNKNOWN_LIST}")
ENDIF(NOT ALL_MANN_EN_XML_COUNT EQUAL KNOWN_MANN_EN_XML_COUNT)
-DOCBOOK_TO_HTML(mann docbook_mann_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/mann/en)
-DOCBOOK_TO_HTML(mann docbook_mann_INTRO
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/html/mann/en)
-DOCBOOK_TO_MAN(mann docbook_mann_EN n nged)
+DOCBOOK_TO_HTML(mann docbook_mann_EN html/mann/en)
+DOCBOOK_TO_HTML(mann docbook_mann_INTRO html/mann/en)
+DOCBOOK_TO_MAN(mann docbook_mann_EN n nged man/mann)
IF(BRLCAD-BUILD_EXTRADOCS_PDF_MAN)
- DOCBOOK_TO_PDF(mann docbook_mann_EN
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pdf/mann/en)
+ DOCBOOK_TO_PDF(mann docbook_mann_EN pdf/mann/en)
ENDIF(BRLCAD-BUILD_EXTRADOCS_PDF_MAN)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
