[Plplot-cvs] SF.net SVN: plplot:[12552] trunk/cmake/build_projects

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 12552
          http://sourceforge.net/p/plplot/code/12552
Author:   airwin
Date:     2013-09-29 20:59:14 +0000 (Sun, 29 Sep 2013)
Log Message:
-----------
In the interests of committing what I have on my disk to the svn
repository, commit the current snapshot of build_projects for this
PLplot release. Note, it has actually been a while since I have been
working on this subproject so this result should be considered
experimental and may not even currently work.  But at least
it preserves a snapshot of my work and will provide a starting
point for the next time I work on build_projects.

Modified Paths:
--------------
    trunk/cmake/build_projects/CMakeLists.txt
    trunk/cmake/build_projects/README
    trunk/cmake/build_projects/docbook-xml/CMakeLists.txt
    trunk/cmake/build_projects/docbook-xml/bp.cmake
    trunk/cmake/build_projects/docbook-xsl/bp.cmake
    trunk/cmake/build_projects/gtk-doc/bp.cmake
    trunk/cmake/build_projects/gtk_packages_add.xml
    trunk/cmake/build_projects/libxml2/bp.cmake
    trunk/cmake/build_projects/patch_gtk_packages.xml

Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================

--- trunk/cmake/build_projects/CMakeLists.txt	2013-09-29 20:54:34 UTC (rev 12551)
+++ trunk/cmake/build_projects/CMakeLists.txt	2013-09-29 20:59:14 UTC (rev 12552)
@@ -166,17 +166,22 @@
     determine_msys_path(MSYS_CMAKE_RC_COMPILER "${CMAKE_RC_COMPILER}")
     list(APPEND BP_CMAKE_COMMAND -DCMAKE_RC_COMPILER:FILEPATH=${MSYS_CMAKE_RC_COMPILER})
   endif(CMAKE_RC_COMPILER)
+  # No extra dropped dependencies for the MSYS_PLATFORM case.
+  set(extra_ignored_dependencies_list)
 else(MSYS_PLATFORM)
   # Propagate the overall CMake generator and install prefix to all CMake-based
   # software project builds.
   set(BP_CMAKE_COMMAND ${CMAKE_COMMAND} "-G${CMAKE_GENERATOR}" -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX})
   set(BP_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+
+  # Drop xmlcatalog-wrapper dependency since that is only suitable for
+  # the MSYS_PLATFORM case.
+  set(extra_ignored_dependencies_list xmlcatalog-wrapper)
 endif(MSYS_PLATFORM)
 
 # Propagate the install prefix to autotools-based builds
 set(BP_CONFIGURE_COMMAND configure --prefix=${BP_CMAKE_INSTALL_PREFIX})
 
-
 if(CMAKE_VERBOSE_MAKEFILE)
   # Not sure whether all contemplated back-ends support this or not, but
   # most should.

Modified: trunk/cmake/build_projects/README
===================================================================
--- trunk/cmake/build_projects/README	2013-09-29 20:54:34 UTC (rev 12551)
+++ trunk/cmake/build_projects/README	2013-09-29 20:59:14 UTC (rev 12552)
@@ -126,11 +126,40 @@
 
 Linux "Unix Makefiles"
 
+--------------
+# Source this file to setup a Linux build_packages build.
+# Put latest CMake on PATH
+PATH=/home/software/cmake/install/bin:$PATH
+
+# Put buildtools that have been built and installed by build_packages on PATH.
+PATH=/home/wine/newstart/build_script/install-linux_buildtools/bin:$PATH
+
+# Put Linux install directory on PATH (so that, e.g., the wxwidgets 
+# configuration tool will be found.
+PATH=/home/wine/newstart/build_script/install-linux/bin:$PATH
+
+# Make *.pc files that are installed by a build_packages build accessible to
+# pkg-config
+export PKG_CONFIG_PATH=/home/wine/newstart/build_script/install-linux/lib/pkgconfig/:/home/wine/newstart/build_script/install-linux/share/pkgconfig
+
+# As temporary measure also use system-installed *.pc files for dependencies
+# which are currently not built.  Put these at the end of PKG_CONFIG_PATH
+# so they are only used as a last resort.
+PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig
+--------------
+
 wine@raven> mkdir -p /home/wine/newstart/build_script/build_dir-linux
 wine@raven> cd /home/wine/newstart/build_script/build_dir-linux
 wine@raven> rm -rf /home/wine/newstart/build_script/build_dir-linux/*
+wine@raven> cmake -G"Unix Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=/home/wine/newstart/build_script/install-linux ~software/plplot_svn/HEAD/plplot_allura/cmake/build_projects >& cmake.out
 wine@raven> cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=/home/wine/newstart/build_script/install-linux ~software/plplot_svn/HEAD/plplot_allura/cmake/build_projects >& cmake.out
-wine@raven> make VERBOSE=1 build_plplot >& build_plplot.out
+# wxwidgets and pango are soft dependencies of PLplot which add value to
+# its build.
+wine@raven> make build_wxwidgets >& build_wxwidgets.out
+wine@raven> make build_pango >& build_pango.out
+# Build plplot using the above soft dependencies as well as some hard
+# dependencies it knows about.
+wine@raven> make build_plplot >& build_plplot.out
 
 Windows "MinGW Makefiles"
 
@@ -239,6 +268,10 @@
 # can be configured with a template such as libffi, we use gtk_packages_add.xml
 # (under version control) as follows:
 
-./gtk_transform.py "libffi" 1 <gtk_packages_add.xml 1>| add_packages.data
-./gtk_transform.py "intltool" 1 <gtk_packages_add.xml 1>> add_packages.data
+rm -f add_packages.data
+touch add_packages.data
+PACKAGE_LIST="libffi intltool pixman gperf"
+for PACKAGE in $PACKAGE_LIST; do
+  ./gtk_transform.py $PACKAGE 1 <gtk_packages_add.xml 1>> add_packages.data
+done
 cmake -DFILENAME:FILEPATH=add_packages.data -P configure_bp.cmake

Modified: trunk/cmake/build_projects/docbook-xml/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/docbook-xml/CMakeLists.txt	2013-09-29 20:54:34 UTC (rev 12551)
+++ trunk/cmake/build_projects/docbook-xml/CMakeLists.txt	2013-09-29 20:59:14 UTC (rev 12552)
@@ -130,9 +130,13 @@
 
 install_xml_catalog(commands "docbook")
 
+# Do this for every pattern above so using the catalog file as the catalog
+# is equivalent to using the docbook file as the catalog.
 set(commands
+"delegatePublic" "-//OASIS//DTD DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegatePublic" "-//OASIS//DTD XML Exchange" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
 "delegatePublic" "-//OASIS//ENTITIES DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-"delegatePublic" "-//OASIS//DTD DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegatePublic" "-//OASIS//ELEMENTS DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
 "delegateSystem" "http://www.oasis-open.org/docbook/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
 "delegateURI" "http://www.oasis-open.org/docbook/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
 )
@@ -162,6 +166,9 @@
     )
   install_xml_catalog(commands "docbook")
 
+  # Do this for every pattern above except the "public" one which has already
+  # been taken care of so using the catalog file as the catalog
+  # is equivalent to using the docbook file as the catalog.
   set(commands
     "delegateSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
     "delegateURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"

Modified: trunk/cmake/build_projects/docbook-xml/bp.cmake
===================================================================
--- trunk/cmake/build_projects/docbook-xml/bp.cmake	2013-09-29 20:54:34 UTC (rev 12551)
+++ trunk/cmake/build_projects/docbook-xml/bp.cmake	2013-09-29 20:59:14 UTC (rev 12552)
@@ -32,7 +32,7 @@
 
 # List of dependencies (most of which are build tools) which should be
 # ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
 
 set(docbook-xml_dependencies_LIST libxml2)
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/docbook-xsl/bp.cmake
===================================================================
--- trunk/cmake/build_projects/docbook-xsl/bp.cmake	2013-09-29 20:54:34 UTC (rev 12551)
+++ trunk/cmake/build_projects/docbook-xsl/bp.cmake	2013-09-29 20:59:14 UTC (rev 12552)
@@ -32,7 +32,7 @@
 
 # List of dependencies (most of which are build tools) which should be
 # ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
 
 set(docbook-xsl_dependencies_LIST libxml2)
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/gtk-doc/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gtk-doc/bp.cmake	2013-09-29 20:54:34 UTC (rev 12551)
+++ trunk/cmake/build_projects/gtk-doc/bp.cmake	2013-09-29 20:59:14 UTC (rev 12552)
@@ -84,7 +84,7 @@
   DEPENDS ${${BP_PACKAGE}_dependencies_targets}
   URL ${${BP_PACKAGE}_URL}
   URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --with-xml-catalog=${BP_CMAKE_INSTALL_PREFIX}/etc/xml/catalog
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --with-xml-catalog=${CMAKE_INSTALL_PREFIX}/etc/xml/catalog
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} 
   BUILD_IN_SOURCE OFF
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}  install

Modified: trunk/cmake/build_projects/gtk_packages_add.xml
===================================================================
--- trunk/cmake/build_projects/gtk_packages_add.xml	2013-09-29 20:54:34 UTC (rev 12551)
+++ trunk/cmake/build_projects/gtk_packages_add.xml	2013-09-29 20:59:14 UTC (rev 12552)
@@ -23,6 +23,14 @@
 -->
   <autotools id="libxml2" makeargs="PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages">
     <branch hash="md5:9c0cfef285d5c4a5c80d00904ddab380" module="sources/libxml2-2.9.1.tar.gz" repo="http://xmlsoft.org/" size="983500" version="2.9.1"/>
+<!-- This package (which installs nothing on Unix platforms) is
+required as a workaround for the xmlcatalog argument mangling that
+occurs when xmlcatalog (linked with the MinGW runtime as per this
+build of libxml2) is called from a programme (e.g., bash.exe) which is
+linked with the MSYS runtime -->
+    <dependencies>
+      <dep package="xmlcatalog-wrapper"/>
+    </dependencies>
   </autotools>
   <autotools id="libxslt">
     <branch hash="md5:9667bf6f9310b957254fdcf6596600b7" module="sources/libxslt-1.1.28.tar.gz" repo="http://xmlsoft.org/" size="983500" version="1.1.28"/>

Modified: trunk/cmake/build_projects/libxml2/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libxml2/bp.cmake	2013-09-29 20:54:34 UTC (rev 12551)
+++ trunk/cmake/build_projects/libxml2/bp.cmake	2013-09-29 20:59:14 UTC (rev 12552)
@@ -41,7 +41,7 @@
 # ignored.
 set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
 
-set(libxml2_dependencies_LIST )
+set(libxml2_dependencies_LIST xmlcatalog-wrapper)
 # Remove dependencies that should be ignored.
 if(libxml2_dependencies_LIST)
   list(REMOVE_ITEM libxml2_dependencies_LIST ${BP_ignored_dependencies_LIST})

Modified: trunk/cmake/build_projects/patch_gtk_packages.xml
===================================================================
--- trunk/cmake/build_projects/patch_gtk_packages.xml	2013-09-29 20:54:34 UTC (rev 12551)
+++ trunk/cmake/build_projects/patch_gtk_packages.xml	2013-09-29 20:59:14 UTC (rev 12552)
@@ -1,11 +1,11 @@
 --- gtk_packages_3.9.4.xml_original	2013-08-04 10:48:34.157911200 -0700
-+++ gtk_packages_3.9.4.xml	2013-08-04 10:59:20.797600533 -0700
++++ gtk_packages_3.9.4.xml	2013-08-07 16:08:44.571614474 -0700
 @@ -640,11 +640,13 @@
    <autotools id="gnome-common">
      <branch hash="sha256:2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b" module="gnome-common/3.7/gnome-common-3.7.4.tar.xz" repo="http://download.gnome.org/sources/" size="151864" version="3.7.4"/>
    </autotools>
 -  <autotools id="gtk-doc">
-+  <autotools autogenargs="--with-xml-catalog=${BP_CMAKE_INSTALL_PREFIX}/etc/xml/catalog" id="gtk-doc">
++  <autotools autogenargs="--with-xml-catalog=${CMAKE_INSTALL_PREFIX}/etc/xml/catalog" id="gtk-doc">
      <branch hash="sha256:27df247fa828433a9390368e2088cc22f954f2ce1f255ddbd12ab6e027b12e68" module="gtk-doc/1.19/gtk-doc-1.19.tar.xz" repo="http://download.gnome.org/sources/" size="597880" version="1.19"/>
      <dependencies>
        <dep package="libxslt"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





[Plplot-cvs] SF.net SVN: plplot:[12552] trunk/cmake/build_projects

Cross-platform, scientific graphics plotting library

[Plplot-cvs] SF.net SVN: plplot:[12552] trunk/cmake/build_projects