Menu
▾
▴
plplot-cvs
|
From: <sm...@us...> - 2008-07-24 13:45:11
|
Revision: 8579
http://plplot.svn.sourceforge.net/plplot/?rev=8579&view=rev
Author: smekal
Date: 2008-07-24 13:45:20 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
The file documentation.php in plplot/www directory,which is created during the cmake configuration phase, is copied to the webspace here by calling "make www-install" - not perfect, but there is no other easy possibility.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2008-07-24 13:11:19 UTC (rev 8578)
+++ trunk/doc/docbook/src/CMakeLists.txt 2008-07-24 13:45:20 UTC (rev 8579)
@@ -503,6 +503,7 @@
set(INFO_TARBALL ${BASE_INFO}.tar.gz)
set(MAN_TARBALL ${BASE_MAN}.tar.gz)
set(INDEX_HTML ${CMAKE_CURRENT_BINARY_DIR}/../www/index.html)
+ set(DOCUMENTATION_PHP ${CMAKE_CURRENT_BINARY_DIR}/../../../www/documentation.php)
set(WWW_USERAT ${WWW_USER}@)
set(RCP_PREFIX ${WWW_USERAT}${WWW_HOST}:)
@@ -565,6 +566,7 @@
${BASE}.dvi
-C ${CMAKE_CURRENT_SOURCE_DIR}/.. COPYING
-C ${CMAKE_CURRENT_BINARY_DIR}/../www index.html
+ -C ${CMAKE_CURRENT_BINARY_DIR}/../../../www documentation.php
DEPENDS
${HTML_TARBALL}
${INFO_TARBALL}
@@ -574,6 +576,7 @@
${BASE}.dvi
${CMAKE_CURRENT_SOURCE_DIR}/../COPYING
${INDEX_HTML}
+ ${DOCUMENTATION_PHP}
)
add_custom_target(www-uninstall COMMAND ${RSH_COMMAND} rm -rf ${WWW_DIR})
@@ -584,6 +587,7 @@
COMMAND ${RCP} ${TARBALL} ${RCP_PREFIX}${WWW_DIR}
COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/${TARBALL} -C ${WWW_DIR}
COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/${HTML_TARBALL} -C ${WWW_DIR}
+ COMMAND ${RSH_COMMAND} mv ${WWW_DIR}/documentation.php ${WWW_DIR}/../documentation.php
COMMAND ${RSH_COMMAND} chgrp -R ${WWW_GROUP} ${WWW_DIR}
COMMAND ${RSH_COMMAND} chmod -R g=u ${WWW_DIR}
COMMAND ${RSH_COMMAND} rm -f ${WWW_DIR}/${TARBALL}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2008-07-24 22:09:01
|
Revision: 8589
http://plplot.svn.sourceforge.net/plplot/?rev=8589&view=rev
Author: airwin
Date: 2008-07-24 22:09:09 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
Use full pathname for html, info, man, and overall tarballs. This seems
to give a much more reliable result for make www-install.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2008-07-24 21:59:31 UTC (rev 8588)
+++ trunk/doc/docbook/src/CMakeLists.txt 2008-07-24 22:09:09 UTC (rev 8589)
@@ -510,7 +510,7 @@
set(RSH_COMMAND ${RSH} ${WWW_USERAT}${WWW_HOST})
add_custom_command(
- OUTPUT ${HTML_TARBALL}
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HTML_TARBALL}
COMMAND rm -rf ${BASE_HTML}
COMMAND mkdir ${BASE_HTML}
COMMAND cp `cat ${HTML_MANIFEST}` ${BASE_HTML}
@@ -521,7 +521,7 @@
)
add_custom_command(
- OUTPUT ${INFO_TARBALL}
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${INFO_TARBALL}
COMMAND rm -rf ${BASE_INFO}
COMMAND mkdir ${BASE_INFO}
COMMAND cp `cat ${INFO_MANIFEST}` ${BASE_INFO}
@@ -531,7 +531,7 @@
)
add_custom_command(
- OUTPUT ${MAN_TARBALL}
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MAN_TARBALL}
COMMAND rm -rf ${BASE_MAN}
COMMAND mkdir ${BASE_MAN}
COMMAND cp `cat ${MAN_MANIFEST}` ${BASE_MAN}
@@ -550,13 +550,13 @@
${BASE}.ps.gz
${BASE}.pdf
${BASE}.dvi
- ${INFO_TARBALL}
- ${MAN_TARBALL}
- ${HTML_TARBALL}
+ ${CMAKE_CURRENT_BINARY_DIR}/${INFO_TARBALL}
+ ${CMAKE_CURRENT_BINARY_DIR}/${MAN_TARBALL}
+ ${CMAKE_CURRENT_BINARY_DIR}/${HTML_TARBALL}
)
add_custom_command(
- OUTPUT ${TARBALL}
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL}
COMMAND tar cfz ${TARBALL}
${HTML_TARBALL}
${INFO_TARBALL}
@@ -568,9 +568,9 @@
-C ${CMAKE_CURRENT_BINARY_DIR}/../www index.html
-C ${CMAKE_CURRENT_BINARY_DIR}/../../../www documentation.php
DEPENDS
- ${HTML_TARBALL}
- ${INFO_TARBALL}
- ${MAN_TARBALL}
+ ${CMAKE_CURRENT_BINARY_DIR}/${HTML_TARBALL}
+ ${CMAKE_CURRENT_BINARY_DIR}/${INFO_TARBALL}
+ ${CMAKE_CURRENT_BINARY_DIR}/${MAN_TARBALL}
${BASE}.ps.gz
${BASE}.pdf
${BASE}.dvi
@@ -592,7 +592,7 @@
COMMAND ${RSH_COMMAND} chmod -R g=u ${WWW_DIR}
COMMAND ${RSH_COMMAND} rm -f ${WWW_DIR}/${TARBALL}
DEPENDS
- ${TARBALL}
+ ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL}
)
if(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2008-07-26 17:12:47
|
Revision: 8594
http://plplot.svn.sourceforge.net/plplot/?rev=8594&view=rev
Author: airwin
Date: 2008-07-26 17:12:56 +0000 (Sat, 26 Jul 2008)
Log Message:
-----------
Serialize builds of the print, info, and html targets since their file
dependency chains all create the inline.ent symlink in different ways. This
change allows parallel builds of the prebuild_dist target (i.e., "make -j3
prebuild_dist") to work correctly.
The validate target also sets the inline.ent symlink, but the validate
target is always run completely independently of the others so don't include
it in this logic.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2008-07-25 11:47:48 UTC (rev 8593)
+++ trunk/doc/docbook/src/CMakeLists.txt 2008-07-26 17:12:56 UTC (rev 8594)
@@ -320,6 +320,8 @@
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi
)
+ # Use this variable to serialize inline.ent use in parallel builds.
+ set(SERIALIZE_INLINE_DEPENDS)
if(BUILD_PRINT)
add_custom_target(
print ALL
@@ -339,7 +341,9 @@
add_dependencies(print
docbook_plplot-symbols_txt
docbook_plplot-structs_txt
+ ${SERIALIZE_INLINE_DEPENDS}
)
+ list(APPEND SERIALIZE_INLINE_DEPENDS print)
endif(BUILD_PRINT)
# Custom commands for building info version of documentation
@@ -405,7 +409,9 @@
add_dependencies(info
docbook_plplot-symbols_txt
docbook_plplot-structs_txt
+ ${SERIALIZE_INLINE_DEPENDS}
)
+ list(APPEND SERIALIZE_INLINE_DEPENDS info)
endif(BUILD_INFO)
# Custom commands for building man version of documentation
@@ -458,7 +464,9 @@
add_dependencies(html
docbook_plplot-symbols_txt
docbook_plplot-structs_txt
+ ${SERIALIZE_INLINE_DEPENDS}
)
+ list(APPEND SERIALIZE_INLINE_DEPENDS html)
endif(BUILD_HTML)
endif(BUILD_DOC)
endif(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2008-10-26 02:22:44
|
Revision: 8967
http://plplot.svn.sourceforge.net/plplot/?rev=8967&view=rev
Author: airwin
Date: 2008-10-26 01:30:34 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Remove all reference to documentation.php since that is configured and
uploaded to the website elsewhere (via commands set up in www/CMakeLists.txt).
Append /htdocs/docbook-manual to all references to ${WWW_DIR}. This makes
external setting of WWW_DIR consistent with external script use and other
Makefile targets.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2008-10-25 19:28:19 UTC (rev 8966)
+++ trunk/doc/docbook/src/CMakeLists.txt 2008-10-26 01:30:34 UTC (rev 8967)
@@ -511,7 +511,6 @@
set(HTML_TARBALL ${BASE_HTML}.tar.gz)
set(INFO_TARBALL ${BASE_INFO}.tar.gz)
set(MAN_TARBALL ${BASE_MAN}.tar.gz)
- set(DOCUMENTATION_PHP ${CMAKE_CURRENT_BINARY_DIR}/../../../www/documentation.php)
set(WWW_USERAT ${WWW_USER}@)
set(RCP_PREFIX ${WWW_USERAT}${WWW_HOST}:)
@@ -558,7 +557,6 @@
${BASE}.pdf
${BASE}.dvi
-C ${CMAKE_CURRENT_SOURCE_DIR}/.. COPYING
- -C ${CMAKE_CURRENT_BINARY_DIR}/../../../www documentation.php
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${HTML_TARBALL}
${CMAKE_CURRENT_BINARY_DIR}/${INFO_TARBALL}
@@ -567,21 +565,19 @@
${BASE}.pdf
${BASE}.dvi
${CMAKE_CURRENT_SOURCE_DIR}/../COPYING
- ${DOCUMENTATION_PHP}
)
- add_custom_target(www-uninstall COMMAND ${RSH_COMMAND} rm -rf ${WWW_DIR})
+ add_custom_target(www-uninstall COMMAND ${RSH_COMMAND} rm -rf ${WWW_DIR}/htdocs/docbook-manual)
add_custom_target(
www-install
- COMMAND ${RSH_COMMAND} mkdir -p ${WWW_DIR}
- COMMAND ${RCP} ${TARBALL} ${RCP_PREFIX}${WWW_DIR}
- COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/${TARBALL} -C ${WWW_DIR}
- COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/${HTML_TARBALL} -C ${WWW_DIR}
- COMMAND ${RSH_COMMAND} mv ${WWW_DIR}/documentation.php ${WWW_DIR}/../documentation.php
- COMMAND ${RSH_COMMAND} chgrp -R ${WWW_GROUP} ${WWW_DIR}
- COMMAND ${RSH_COMMAND} chmod -R g=u ${WWW_DIR}
- COMMAND ${RSH_COMMAND} rm -f ${WWW_DIR}/${TARBALL}
+ COMMAND ${RSH_COMMAND} mkdir -p ${WWW_DIR}/htdocs/docbook-manual
+ COMMAND ${RCP} ${TARBALL} ${RCP_PREFIX}${WWW_DIR}/htdocs/docbook-manual
+ COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/htdocs/docbook-manual/${TARBALL} -C ${WWW_DIR}/htdocs/docbook-manual
+ COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/htdocs/docbook-manual/${HTML_TARBALL} -C ${WWW_DIR}/htdocs/docbook-manual
+ COMMAND ${RSH_COMMAND} chgrp -R ${WWW_GROUP} ${WWW_DIR}/htdocs/docbook-manual
+ COMMAND ${RSH_COMMAND} chmod -R g=u ${WWW_DIR}/htdocs/docbook-manual
+ COMMAND ${RSH_COMMAND} rm -f ${WWW_DIR}/htdocs/docbook-manual/${TARBALL}
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${TARBALL}
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-11-19 20:08:35
|
Revision: 11336
http://plplot.svn.sourceforge.net/plplot/?rev=11336&view=rev
Author: airwin
Date: 2010-11-19 20:08:26 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
Small cleanup: plplotdoc.xml --> ${MASTER_XML}
Use -b utf-8 option for all openjade calls. This does not appear to
hurt anything while allowing the egrave entity to work properly.
N.B. For some reason (most likely the result of the dated DocBook tool
chain we are using?) utf-8 still does not work in our DocBook source
despite clear documentation that it should.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2010-11-17 18:12:23 UTC (rev 11335)
+++ trunk/doc/docbook/src/CMakeLists.txt 2010-11-19 20:08:26 UTC (rev 11336)
@@ -196,9 +196,9 @@
COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
${CMAKE_CURRENT_BINARY_DIR}/inline.ent
- COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.xml > ${VALIDATE_OUTPUT}
+ COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML} > ${VALIDATE_OUTPUT}
DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.xml
+ ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
)
add_dependencies(validate
@@ -238,7 +238,7 @@
COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}/inline-print.ent
${CMAKE_CURRENT_BINARY_DIR}/inline.ent
- COMMAND ${OPENJADE}
+ COMMAND ${OPENJADE} -b utf-8
${SGML_CATALOGS} -d ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT}
-t tex -o ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
@@ -448,7 +448,7 @@
COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
${CMAKE_CURRENT_BINARY_DIR}/inline.ent
- COMMAND ${OPENJADE}
+ COMMAND ${OPENJADE} -b utf-8
${SGML_CATALOGS} -d ${STYLESHEET_HTML} -t sgml ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
COMMAND ${PERL_EXECUTABLE}
-pi -e 's/&\#13;//g' `cat ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-09 23:38:31
|
Revision: 12479
http://sourceforge.net/p/plplot/code/12479
Author: airwin
Date: 2013-08-09 23:38:29 +0000 (Fri, 09 Aug 2013)
Log Message:
-----------
Remove \$ENV{DESTDIR} references from install(CODE...) commands and
also reformat those commands to make them more human-readable.
Note, these are all examples of where file(INSTALL...) is used inside
install(CODE...). According to the documentation file(INSTALL...) is
the workhorse signature normall used for install commands so it is
reasonable to infer that file(INSTALL...) already does its own
\$ENV{DESTDIR} handling. Anyhow, it turns out our own use of
\$ENV{DESTDIR} is redundant and causes an error (double use of DESTDIR
for the docbook documentation) found by Orion Poplawski and which I
have confirmed. Note, for all other uses of install(CODE...) that
does not have a call to file(INSTALL...) inside the code fragment
(e.g., doc/CMakeLists.txt) it is necessary to use \$ENV{DESTDIR}.
Tested by Alan W. Irwin <ai...@us...> using the
cmake options -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOC=ON -DBUILD_DOX_DOC=ON
and "make -j4 DESTDIR=tmp install >& install.out". The
resulting files (including both doxgen-generated ones and
docbook-generated ones) were all installed to tmp/usr/... in the build_tree
with no double use of DESTDIR and no attempt to install files to /usr.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-08-09 22:40:34 UTC (rev 12478)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-08-09 23:38:29 UTC (rev 12479)
@@ -492,8 +492,14 @@
# command. This makes for slightly ugly looking code.
if(BUILD_HTML OR PREBUILT_DOC)
- install(CODE "file(GLOB HTML_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${HTML_EXT})\n foreach(file \${HTML_FILES}) \n file(INSTALL DESTINATION \$ENV{DESTDIR}${DOC_DIR}/html TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${HTML_FILES}\")")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} stylesheet.css DESTINATION ${DOC_DIR}/html )
+ install(CODE "
+file(GLOB HTML_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${HTML_EXT})
+foreach(file \${HTML_FILES})
+ file(INSTALL DESTINATION ${DOC_DIR}/html TYPE FILE FILES \"\${file}\")
+endforeach (file \"\${HTML_FILES}\")
+"
+ )
endif(BUILD_HTML OR PREBUILT_DOC)
if(BUILD_PRINT OR PREBUILT_DOC)
@@ -501,13 +507,25 @@
endif(BUILD_PRINT OR PREBUILT_DOC)
if(BUILD_MAN OR PREBUILT_DOC)
- install(CODE "file(GLOB MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${MANVOL})\n foreach(file \${MAN_FILES}) \n file(INSTALL DESTINATION \$ENV{DESTDIR}${MAN_DIR}/man3 TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${MAN_FILES}\")")
-# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST} DESTINATION ${MAN_DIR}/man3 )
+ #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST} DESTINATION ${MAN_DIR}/man3 )
+ install(CODE "
+file(GLOB MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${MANVOL})
+foreach(file \${MAN_FILES})
+ file(INSTALL DESTINATION ${MAN_DIR}/man3 TYPE FILE FILES \"\${file}\")
+endforeach(file \"\${MAN_FILES}\")
+"
+ )
endif(BUILD_MAN OR PREBUILT_DOC)
if(BUILD_INFO OR PREBUILT_DOC)
- install(CODE "file(GLOB INFO_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.info*)\n foreach(file \${INFO_FILES}) \n file(INSTALL DESTINATION \$ENV{DESTDIR}${INFO_DIR} TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${INFO_FILES}\")")
-# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST} DESTINATION ${INFO_DIR} )
+ #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST} DESTINATION ${INFO_DIR} )
+ install(CODE "
+file(GLOB INFO_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.info*)
+foreach(file \${INFO_FILES})
+ file(INSTALL DESTINATION ${INFO_DIR} TYPE FILE FILES \"\${file}\")
+endforeach (file \"\${INFO_FILES}\")
+"
+ )
endif(BUILD_INFO OR PREBUILT_DOC)
# Everything below here has to do with the custom target www-install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-30 16:41:32
|
Revision: 12500
http://sourceforge.net/p/plplot/code/12500
Author: airwin
Date: 2013-08-30 16:41:29 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
install(CODE ... changes.
Attempt to deal with issues found recently by Orion Poplawski on Fedora.
Suppress warnings about setting policy and change from undocumented to
documented form of the file(INSTALL ... signature.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-08-28 01:05:27 UTC (rev 12499)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-08-30 16:41:29 UTC (rev 12500)
@@ -682,6 +682,9 @@
install(CODE "
# Suppress empty element warning.
cmake_policy(SET CMP0007 NEW)
+# Suppress warning about setting the above policy!
+cmake_policy(SET CMP0011 NEW)
+
file(READ ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST} INFO_FILES)
# Convert to list with trailing empty element
string(REGEX REPLACE \"\n\" \";\" INFO_FILES \"\${INFO_FILES}\")
@@ -689,7 +692,7 @@
list(REMOVE_ITEM INFO_FILES \"\")
foreach(file \${INFO_FILES})
# INSTALL_DESTINATION signature automatically honors DESTDIR.
- file(INSTALL DESTINATION ${INFO_DIR} TYPE FILE FILES \"\${file}\")
+ file(INSTALL \"${CMAKE_CURRENT_BINARY_DIR}/\${file}\" DESTINATION ${INFO_DIR})
endforeach (file \"\${INFO_FILES}\")
"
)
@@ -699,6 +702,8 @@
install(CODE "
# Suppress empty element warning.
cmake_policy(SET CMP0007 NEW)
+# Suppress warning about setting the above policy!
+cmake_policy(SET CMP0011 NEW)
file(READ ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST} MAN_FILES)
# Convert to list with trailing empty element
string(REGEX REPLACE \"\n\" \";\" MAN_FILES \"\${MAN_FILES}\")
@@ -706,7 +711,7 @@
list(REMOVE_ITEM MAN_FILES \"\")
foreach(file \${MAN_FILES})
# INSTALL_DESTINATION signature automatically honors DESTDIR.
- file(INSTALL DESTINATION ${MAN_DIR}/man3 TYPE FILE FILES \"\${file}\")
+ file(INSTALL \"${CMAKE_CURRENT_BINARY_DIR}/\${file}\" DESTINATION ${MAN_DIR}/man3)
endforeach (file \"\${MAN_FILES}\")
"
)
@@ -717,6 +722,8 @@
install(CODE "
# Suppress empty element warning.
cmake_policy(SET CMP0007 NEW)
+# Suppress warning about setting the above policy!
+cmake_policy(SET CMP0011 NEW)
file(READ ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} HTML_FILES)
# Convert to list with trailing empty element
string(REGEX REPLACE \"\n\" \";\" HTML_FILES \"\${HTML_FILES}\")
@@ -724,7 +731,7 @@
list(REMOVE_ITEM HTML_FILES \"\")
foreach(file \${HTML_FILES})
# INSTALL_DESTINATION signature automatically honors DESTDIR.
- file(INSTALL DESTINATION ${DOC_DIR}/html TYPE FILE FILES \"\${file}\")
+ file(INSTALL \"${CMAKE_CURRENT_BINARY_DIR}/\${file}\" DESTINATION ${DOC_DIR}/html)
endforeach (file \"\${HTML_FILES}\")
"
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-30 19:13:45
|
Revision: 12501
http://sourceforge.net/p/plplot/code/12501
Author: airwin
Date: 2013-08-30 19:13:41 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
CMake code fixups.
Move creation of jadetex.cfg from a place that is always executed
to the appropriate Boolean block.
Do not remove info directory that is initially created at cmake time.
This solves a bug when the info target is reinvoked at make time after
a change to the docbook source.
Specifically ignore environment variable DESTDIR when xmlto --with-fop
is invoked. This works around a bug in xmlto which (on Debian at
least) craps out when DESTDIR is specified.
Tested by: Alan W. Irwin <ai...@us...> using the
-DBUILD_DOC=ON -DBUILD_DOX_DOC=ON cmake options and the install
target invoked in the following ways:
make -j4 install
make DESTDIR=whatever -j4 install
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-08-30 16:41:29 UTC (rev 12500)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-08-30 19:13:41 UTC (rev 12501)
@@ -71,13 +71,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/math.ent
)
-execute_process(
- COMMAND
- ${CMAKE_COMMAND} -E copy_if_different
- ${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
- ${CMAKE_CURRENT_BINARY_DIR}/jadetex.cfg
- )
-
if(
PREBUILT_DOC
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
@@ -247,7 +240,6 @@
-E chdir ${INFO_TMPDIR} ls |cat > ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST}
COMMAND mv
${INFO_TMPDIR}/* ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND rmdir ${INFO_TMPDIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi
)
@@ -398,13 +390,16 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz
- COMMAND ${XMLTO} -vv --with-fop -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} ps ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
+ # xmlto --with-fop is currently (at least on Debian) craps out
+ # if DESTDIR is specified so make sure it is NOT specified.
+ COMMAND env DESTDIR= ${XMLTO} -vv --with-fop -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} ps ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-print.ps ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps
COMMAND ${GZIP} -f ${BASE}.ps
DEPENDS
${SOURCE_FILES}
${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
${CMAKE_CURRENT_SOURCE_DIR}/inline-print_xsl.ent
+ VERBATIM
)
add_custom_target(
ps_target ALL
@@ -425,12 +420,15 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf
- COMMAND ${XMLTO} -vv --with-fop -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} pdf ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
+ # xmlto --with-fop is currently (at least on Debian) craps out
+ # if DESTDIR is specified so make sure it is NOT specified.
+ COMMAND env DESTDIR= ${XMLTO} -vv --with-fop -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} pdf ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-print.pdf ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf
DEPENDS
${SOURCE_FILES}
${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
${CMAKE_CURRENT_SOURCE_DIR}/inline-print_xsl.ent
+ VERBATIM
)
add_custom_target(
pdf_target ALL
@@ -519,6 +517,13 @@
${CMAKE_CURRENT_BINARY_DIR}/pdftex.map
)
+ execute_process(
+ COMMAND
+ ${CMAKE_COMMAND} -E copy_if_different
+ ${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
+ ${CMAKE_CURRENT_BINARY_DIR}/jadetex.cfg
+ )
+
# Custom commands for building print version of documentation
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-06 18:36:30
|
Revision: 12583
http://sourceforge.net/p/plplot/code/12583
Author: airwin
Date: 2013-10-06 18:36:27 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Add dependency for dblatex_stylesheet.xsl to the pdf build.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-10-05 23:29:44 UTC (rev 12582)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-10-06 18:36:27 UTC (rev 12583)
@@ -396,6 +396,7 @@
${SOURCE_FILES}
${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
${CMAKE_CURRENT_SOURCE_DIR}/inline-print_xsl.ent
+ ${CMAKE_CURRENT_SOURCE_DIR}/dblatex_stylesheet.xsl
VERBATIM
)
add_custom_target(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-17 16:55:29
|
Revision: 12601
http://sourceforge.net/p/plplot/code/12601
Author: airwin
Date: 2013-10-17 16:55:28 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Remove empty plplotdoc-html.proc file that is generated by xmlto,
but which we don't want in the html manifest. Thanks to Orion Poplawski
for spotting this issue.
Tested by Alan W. Irwin <ai...@us...> using
-DBUILD_DOCS=ON cmake option, and the html target.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-10-15 22:15:00 UTC (rev 12600)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-10-17 16:55:28 UTC (rev 12601)
@@ -316,6 +316,9 @@
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}
COMMAND ${CMAKE_COMMAND} -E remove_directory ${HTML_TMPDIR}
COMMAND ${XMLTO} -vv -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_HTML} -o ${HTML_TMPDIR} html ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-html.xml
+ # Remove empty plplotdoc-html.proc file that is generated by xmlto,
+ # but which we don't want in the html manifest.
+ COMMAND ${CMAKE_COMMAND} -E remove ${HTML_TMPDIR}/plplotdoc-html.proc
COMMAND ${CMAKE_COMMAND}
-E chdir ${HTML_TMPDIR} ls |cat > ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}
COMMAND mv ${HTML_TMPDIR}/* ${CMAKE_CURRENT_BINARY_DIR}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-17 23:21:38
|
Revision: 12604
http://sourceforge.net/p/plplot/code/12604
Author: airwin
Date: 2013-10-17 23:21:35 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Fix build-system bug by removing an attempt to install the PostScript
form of our DocBook-generated documentation. That form of our
documentation is no longer generated by our build system.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-10-17 20:33:55 UTC (rev 12603)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-10-17 23:21:35 UTC (rev 12604)
@@ -820,7 +820,11 @@
if(BUILD_DVI)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi DESTINATION ${DOC_DIR})
endif(BUILD_DVI)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz DESTINATION ${DOC_DIR})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf DESTINATION ${DOC_DIR})
+ if(NOT DOCBOOK_XML_BACKEND)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz DESTINATION ${DOC_DIR})
+ endif(NOT DOCBOOK_XML_BACKEND)
+
endif(BUILD_PRINT OR PREBUILT_DOC)
# Everything below here has to do with the custom target www-install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-01-29 16:52:38
|
Revision: 12972
http://sourceforge.net/p/plplot/code/12972
Author: airwin
Date: 2014-01-29 16:52:35 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Adjust to new version of H?\199?\142ili?\195?\160ng W?\195?\161ng's check programme which now has
a -incdir argument to specify where the configured headers included by
plplot.h are located.
This change in "check" means it is no longer necessary to copy plplot.h from
the source to the build directory in order to get this
application to work.
Tested on Linux using the check_api_xml_consistency target which
still produces a clean result on the consistency of api.xml with
our API as defined by plplot.h.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2014-01-29 02:27:57 UTC (rev 12971)
+++ trunk/doc/docbook/src/CMakeLists.txt 2014-01-29 16:52:35 UTC (rev 12972)
@@ -36,12 +36,7 @@
find_program(API_XML_CONSISTENCY_CHECKER api.xml_consistency_checker)
if(API_XML_CONSISTENCY_CHECKER)
add_custom_target(check_api_xml_consistency
- # Currently the checker needs plplot.h to be in the same directory
- # as the configured header files.
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${CMAKE_SOURCE_DIR}/include/plplot.h
- ${CMAKE_BINARY_DIR}/include/plplot.h
- COMMAND ${API_XML_CONSISTENCY_CHECKER} -header=${CMAKE_BINARY_DIR}/include/plplot.h -apixml=${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
+ COMMAND ${API_XML_CONSISTENCY_CHECKER} -header=${CMAKE_SOURCE_DIR}/include/plplot.h -incdir=${CMAKE_BINARY_DIR}/include -apixml=${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
)
else(API_XML_CONSISTENCY_CHECKER)
message(STATUS "WARNING: cannot find the api.xml_consistency_checker application so cannot check the consistency of api.xml with plplot.h")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-06-07 22:11:46
|
Revision: 11066
http://plplot.svn.sourceforge.net/plplot/?rev=11066&view=rev
Author: airwin
Date: 2010-06-07 22:11:40 +0000 (Mon, 07 Jun 2010)
Log Message:
-----------
Correct info directory issue the old-fashioned way using sed.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2010-06-07 15:51:51 UTC (rev 11065)
+++ trunk/doc/docbook/src/CMakeLists.txt 2010-06-07 22:11:40 UTC (rev 11066)
@@ -375,9 +375,12 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
- COMMAND ${DB2X_TEXIXML}
- ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
+ COMMAND ${DB2X_TEXIXML} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi_raw
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
+ COMMAND sed "s?The PLplot Plotting Library: (plplotdoc)?PLplot: (plplotdoc)?" < ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi_raw > ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
+ VERBATIM
)
set(INFO_TMPDIR ${CMAKE_CURRENT_BINARY_DIR}/info)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X