plplot-cvs — For PLplot svn commit messages

[Plplot-cvs] SF.net SVN: plplot:[12464] trunk/cmake/build_projects/xmlcatalog_wrapper.sh

[<ai...@us...>]

Revision: 12464
          http://sourceforge.net/p/plplot/code/12464
Author:   airwin
Date:     2013-08-03 17:29:37 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Initial commit of a script that makes it convenient to check XML
catalogs on MSYS using the xmlcatalog --shell environment.

With two arguments (with the first a reference to a file assumed to be
a catalog file) this script goes into xmlcatalog shell mode to look up
entities with both the public and system attributes.  Otherwise, it
just falls through to the equivalent raw xmlcatalog command.

The only point of this script is it provides a reasonably convenient
human workaround for the raw xmlcatalog issue on MSYS platforms where
that environment mangles entity names on the command line (it
interprets them as a path and does some substitution into the entity
which completely messes it up, see
https://mail.gnome.org/archives/xml/2013-January/msg00009.html).  I
have not been able to figure out how to make this script respond
identically to what the raw xmlcatalog command should actually be
doing if the entities didn't get mangled. So this script is only for
convenient human use to check catalogs, but cannot be used in scripts
itself as a replacement for raw xmlcatalog.

Added Paths:
-----------
    trunk/cmake/build_projects/xmlcatalog_wrapper.sh

Added: trunk/cmake/build_projects/xmlcatalog_wrapper.sh
===================================================================
--- trunk/cmake/build_projects/xmlcatalog_wrapper.sh	                        (rev 0)
+++ trunk/cmake/build_projects/xmlcatalog_wrapper.sh	2013-08-03 17:29:37 UTC (rev 12464)
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Wrapper for xmlcatalog command to workaround entity mangling
+
+if [ "$#" == "2" -a -f $1 ]; then
+    xmlcatalog --shell $1 <<EOF
+public "$2"
+system "$2"
+exit
+EOF
+echo $?
+else
+    xmlcatalog $*
+fi


Property changes on: trunk/cmake/build_projects/xmlcatalog_wrapper.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ai...@us...>]

Revision: 12463
          http://sourceforge.net/p/plplot/code/12463
Author:   airwin
Date:     2013-08-02 22:05:10 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Add additional docbook-xml and docbook-xsl build dependencies of
gtk-doc.

ToDo.  The result works on Linux, but there are still some PATH issues I
am sorting out on MSYS.

Modified Paths:
--------------
    trunk/cmake/build_projects/gtk-doc/bp.cmake

Added Paths:
-----------
    trunk/cmake/build_projects/docbook-xml/
    trunk/cmake/build_projects/docbook-xml/CMakeLists.txt
    trunk/cmake/build_projects/docbook-xml/bp.cmake
    trunk/cmake/build_projects/docbook-xsl/
    trunk/cmake/build_projects/docbook-xsl/CMakeLists.txt
    trunk/cmake/build_projects/docbook-xsl/bp.cmake

Added: trunk/cmake/build_projects/docbook-xml/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/docbook-xml/CMakeLists.txt	                        (rev 0)
+++ trunk/cmake/build_projects/docbook-xml/CMakeLists.txt	2013-08-02 22:05:10 UTC (rev 12463)
@@ -0,0 +1,159 @@
+# Top-level CMakeLists.txt for the CMake-based build system
+# of the docbook-xml software.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; version 2 of the License.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+project(docbook-xml NONE)
+
+message(STATUS "CMake version = ${CMAKE_VERSION}")
+message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
+
+cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
+
+# Define useful function.
+find_program(XMLCATALOG_EXECUTABLE xmlcatalog)
+function(install_xml_catalog arguments_LIST3 catalog)
+  # Install an XML catalog using the information supplied in
+  # arguments_LIST3, which is a list of arguments grouped by
+  # threes where each group of three arguments correspond to
+  # the three arguments of the "xmlcatalog --add" command.
+  
+  # Create the catalog if it does not exist.
+  install(CODE "
+if(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+message(STATUS \"Creating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout 
+  --create 
+  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+endif(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+")
+
+  list(LENGTH ${arguments_LIST3} narguments_LIST3)
+  set(group_size 3)
+  set(remove_indices 0 1 2)
+  math(EXPR max_index "(${narguments_LIST3}/${group_size}) - 1")
+  foreach(index RANGE 0 ${max_index})
+    list(GET ${arguments_LIST3} 0 type)
+    list(GET ${arguments_LIST3} 1 orig)
+    list(GET ${arguments_LIST3} 2 replace)
+    list(REMOVE_AT ${arguments_LIST3} ${remove_indices})
+    install(CODE "
+message(STATUS \"Updating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout
+  --add \"${type}\" \"${orig}\" \"${replace}\" 
+  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+"
+      )
+  endforeach(index RANGE 0 ${max_index})
+endfunction(install_xml_catalog)
+
+# Nothing to build.  Just follow directions at
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/DocBook.html to
+# install files that are in the source tree.
+
+# Install top-level source tree files.
+set(globs
+  ${CMAKE_SOURCE_DIR}/docbook.cat
+  ${CMAKE_SOURCE_DIR}/*.dtd
+  ${CMAKE_SOURCE_DIR}/*.mod
+  )
+# Make elements of path_list absolute PATH names.
+file(GLOB path_list
+  ${globs}
+  )
+# Add the ent subdirectory to path_list
+list(APPEND path_list ${CMAKE_SOURCE_DIR}/ent)
+
+find_program(INSTALL_EXECUTABLE install)
+find_program(CP_EXECUTABLE cp)
+
+install(CODE "
+message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5\")
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5\")
+"
+  )
+
+install(CODE "
+execute_process(
+COMMAND ${CP_EXECUTABLE} -v -af ${path_list}
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5\")
+"
+  )
+
+install(CODE "
+message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/etc/xml\")
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml\")
+"
+  )
+
+set(commands
+"public" "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
+"public" "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/calstblx.dtd"
+"public" "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/soextblx.dtd"
+"public" "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod"
+"public" "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbhierx.mod"
+"public" "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/htmltblx.mod"
+"public" "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod"
+"public" "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbcentx.mod"
+"public" "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbgenent.mod"
+"rewriteSystem" "http://www.oasis-open.org/docbook/xml/4.5" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
+"rewriteURI" "http://www.oasis-open.org/docbook/xml/4.5" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5")
+
+install_xml_catalog(commands "docbook")
+
+set(commands
+"delegatePublic" "-//OASIS//ENTITIES DocBook XML" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegatePublic" "-//OASIS//DTD DocBook XML" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegateSystem" "http://www.oasis-open.org/docbook/" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegateURI" "http://www.oasis-open.org/docbook/" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+)
+
+install_xml_catalog(commands "catalog")
+
+# LFS instructions at 
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/DocBook.html
+# are open to interpretation for this part, but I think it means
+# these previous versions should be dropped if they are handled
+# a different way.  But I am not doing that so leave them in
+# unless some issue is found in the future that I am not aware of
+# now.
+
+set(previous_versions
+  4.1.2
+  4.2
+  4.3
+  4.4
+  )
+
+foreach(DTDVERSION ${previous_versions})
+  set(commands
+    "public" "-//OASIS//DTD DocBook XML V${DTDVERSION}//EN" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/docbookx.dtd"
+    "rewriteSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
+    "rewriteURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
+    )
+  install_xml_catalog(commands "docbook")
+
+  set(commands
+    "delegateSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+    "delegateURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+    )
+  install_xml_catalog(commands "catalog")
+
+endforeach(DTDVERSION ${previous_versions})


Property changes on: trunk/cmake/build_projects/docbook-xml/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/cmake/build_projects/docbook-xml/bp.cmake
===================================================================
--- trunk/cmake/build_projects/docbook-xml/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/docbook-xml/bp.cmake	2013-08-02 22:05:10 UTC (rev 12463)
@@ -0,0 +1,102 @@
+# docbook-xml/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of docbook-xml.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(docbook-xml_configured)
+  return()
+endif(docbook-xml_configured)
+set(docbook-xml_configured ON)
+
+# 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(docbook-xml_dependencies_LIST libxml2)
+# Remove dependencies that should be ignored.
+if(docbook-xml_dependencies_LIST)
+  list(REMOVE_ITEM docbook-xml_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(docbook-xml_dependencies_LIST)
+
+set(docbook-xml_dependencies_targets)
+foreach(build_configuration ${docbook-xml_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND docbook-xml_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of docbook-xml has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${docbook-xml_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE docbook-xml)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 03083e288e87a7e829e437358da7ef9e)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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_CMAKE_COMMAND} ${EP_BASE}/Source/build_${BP_PACKAGE}
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
+  BUILD_IN_SOURCE OFF
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
+  )
+
+# Add custom commands to the current no-command update step.
+add_custom_command(
+  OUTPUT
+  ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-update
+  COMMAND ${CMAKE_COMMAND} -E copy
+  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+  ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
+  COMMENT "Custom updating of ${BP_PACKAGE}"
+  DEPENDS
+  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+  APPEND
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/docbook-xsl/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/docbook-xsl/CMakeLists.txt	                        (rev 0)
+++ trunk/cmake/build_projects/docbook-xsl/CMakeLists.txt	2013-08-02 22:05:10 UTC (rev 12463)
@@ -0,0 +1,168 @@
+# Top-level CMakeLists.txt for the CMake-based build system
+# of the docbook-xsl software.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; version 2 of the License.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+project(docbook-xsl NONE)
+
+message(STATUS "CMake version = ${CMAKE_VERSION}")
+message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
+
+cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
+
+# Define useful function.
+find_program(XMLCATALOG_EXECUTABLE xmlcatalog)
+function(install_xml_catalog arguments_LIST3 catalog)
+  # Install an XML catalog using the information supplied in
+  # arguments_LIST3, which is a list of arguments grouped by
+  # threes where each group of three arguments correspond to
+  # the three arguments of the "xmlcatalog --add" command.
+  
+  # Create the catalog if it does not exist.
+  install(CODE "
+if(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+message(STATUS \"Creating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout 
+  --create 
+  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+endif(NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+")
+
+  list(LENGTH ${arguments_LIST3} narguments_LIST3)
+  set(group_size 3)
+  set(remove_indices 0 1 2)
+  math(EXPR max_index "(${narguments_LIST3}/${group_size}) - 1")
+  foreach(index RANGE 0 ${max_index})
+    list(GET ${arguments_LIST3} 0 type)
+    list(GET ${arguments_LIST3} 1 orig)
+    list(GET ${arguments_LIST3} 2 replace)
+    list(REMOVE_AT ${arguments_LIST3} ${remove_indices})
+    install(CODE "
+message(STATUS \"Updating \${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+execute_process(COMMAND ${XMLCATALOG_EXECUTABLE} --noout
+  --add \"${type}\" \"${orig}\" \"${replace}\" 
+  \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml/${catalog}\")
+"
+      )
+  endforeach(index RANGE 0 ${max_index})
+endfunction(install_xml_catalog)
+
+# Nothing to build.  Just follow directions at
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html to
+# install files that are in the source tree.
+
+find_program(INSTALL_EXECUTABLE install)
+find_program(CP_EXECUTABLE cp)
+find_program(LN_EXECUTABLE ln)
+
+set(path_list
+  ${CMAKE_SOURCE_DIR}/VERSION
+  ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/eclipse
+  ${CMAKE_SOURCE_DIR}/epub
+  ${CMAKE_SOURCE_DIR}/extensions
+  ${CMAKE_SOURCE_DIR}/fo
+  ${CMAKE_SOURCE_DIR}/highlighting
+  ${CMAKE_SOURCE_DIR}/html
+  ${CMAKE_SOURCE_DIR}/htmlhelp
+  ${CMAKE_SOURCE_DIR}/images
+  ${CMAKE_SOURCE_DIR}/javahelp
+  ${CMAKE_SOURCE_DIR}/lib
+  ${CMAKE_SOURCE_DIR}/manpages
+  ${CMAKE_SOURCE_DIR}/params
+  ${CMAKE_SOURCE_DIR}/profiling
+  ${CMAKE_SOURCE_DIR}/roundtrip
+  ${CMAKE_SOURCE_DIR}/slides
+  ${CMAKE_SOURCE_DIR}/template
+  ${CMAKE_SOURCE_DIR}/tests
+  ${CMAKE_SOURCE_DIR}/tools
+  ${CMAKE_SOURCE_DIR}/webhelp
+  ${CMAKE_SOURCE_DIR}/website
+  ${CMAKE_SOURCE_DIR}/xhtml
+  ${CMAKE_SOURCE_DIR}/xhtml-1_1
+)
+
+install(CODE "
+message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1\")
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1\")
+"
+  )
+
+install(CODE "
+execute_process(
+COMMAND ${CP_EXECUTABLE} -v -R ${path_list}
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1\")
+"
+  )
+
+install(CODE "
+execute_process(
+COMMAND ${LN_EXECUTABLE} -s VERSION
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl\")
+"
+  )
+
+install(CODE "
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -m644 -D ${CMAKE_SOURCE_DIR}/README
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/doc/docbook-xsl-1.78.1/README.txt\")
+"
+  )
+
+set(globs
+  ${CMAKE_SOURCE_DIR}/RELEASE-NOTES*
+  ${CMAKE_SOURCE_DIR}/NEWS*
+  )
+# Make elements of path_list absolute PATH names.
+file(GLOB path_list
+  ${globs}
+  )
+install(CODE "
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -m644 ${path_list}
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/doc/docbook-xsl-1.78.1\")
+"
+  )
+
+install(CODE "
+message(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/etc/xml\")
+execute_process(
+COMMAND ${INSTALL_EXECUTABLE} -v -d -m755 
+\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/xml\")
+"
+  )
+
+set(commands
+  "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/1.78.1" "\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+  "rewriteURI" "http://docbook.sourceforge.net/release/xsl/1.78.1" "\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+  "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/current" "\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+  "rewriteURI" "http://docbook.sourceforge.net/release/xsl/current" "\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+)
+
+install_xml_catalog(commands "catalog")
+
+# LFS instructions at
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html
+# state what to do if other previous versions of docbook-xsl are
+# required.  Essentially, the steps are to install the older
+# docbook-xsl package as well, then run xmlcatalog --add <type> <orig>
+# <replace> where <type> is first rewriteSystem then rewriteURI.  Note
+# it is a different scenario then what is done for docbook-xml where
+# old versions of docbook-xml do not have to be installed.  With luck,
+# we won't need to install different versions of docbook-xsl so ignore
+# these docbook-xsl multiversion instructions for now.


Property changes on: trunk/cmake/build_projects/docbook-xsl/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/cmake/build_projects/docbook-xsl/bp.cmake
===================================================================
--- trunk/cmake/build_projects/docbook-xsl/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/docbook-xsl/bp.cmake	2013-08-02 22:05:10 UTC (rev 12463)
@@ -0,0 +1,102 @@
+# docbook-xsl/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of docbook-xsl.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(docbook-xsl_configured)
+  return()
+endif(docbook-xsl_configured)
+set(docbook-xsl_configured ON)
+
+# 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(docbook-xsl_dependencies_LIST libxml2)
+# Remove dependencies that should be ignored.
+if(docbook-xsl_dependencies_LIST)
+  list(REMOVE_ITEM docbook-xsl_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(docbook-xsl_dependencies_LIST)
+
+set(docbook-xsl_dependencies_targets)
+foreach(build_configuration ${docbook-xsl_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND docbook-xsl_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of docbook-xsl has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${docbook-xsl_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE docbook-xsl)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL  http://downloads.sourceforge.net/docbook/docbook-xsl-1.78.1.tar.bz2)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 6dd0f89131cc35bf4f2ed105a1c17771)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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_CMAKE_COMMAND} ${EP_BASE}/Source/build_${BP_PACKAGE}
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
+  BUILD_IN_SOURCE OFF
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
+  )
+
+# Add custom commands to the current no-command update step.
+add_custom_command(
+  OUTPUT
+  ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-update
+  COMMAND ${CMAKE_COMMAND} -E copy
+  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+  ${EP_BASE}/Source/build_${BP_PACKAGE}/CMakeLists.txt
+  COMMENT "Custom updating of ${BP_PACKAGE}"
+  DEPENDS
+  ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/CMakeLists.txt
+  APPEND
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Modified: trunk/cmake/build_projects/gtk-doc/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gtk-doc/bp.cmake	2013-08-01 04:25:44 UTC (rev 12462)
+++ trunk/cmake/build_projects/gtk-doc/bp.cmake	2013-08-02 22:05:10 UTC (rev 12463)
@@ -34,7 +34,7 @@
 # ignored.
 set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
-set(gtk-doc_dependencies_LIST libxslt;yelp-tools)
+set(gtk-doc_dependencies_LIST libxslt;yelp-tools;docbook-xml;docbook-xsl)
 # Remove dependencies that should be ignored.
 if(gtk-doc_dependencies_LIST)
   list(REMOVE_ITEM gtk-doc_dependencies_LIST ${BP_ignored_dependencies_LIST})
@@ -77,7 +77,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} 
+  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
   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

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

[Plplot-cvs] SF.net SVN: plplot:[12462] trunk/cmake/build_projects/update_pango_packages .sh

[<ai...@us...>]

Revision: 12462
          http://sourceforge.net/p/plplot/code/12462
Author:   airwin
Date:     2013-08-01 04:25:44 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
Initial commit of a bash script to update all the pango-generated
build configurations.

Added Paths:
-----------
    trunk/cmake/build_projects/update_pango_packages.sh

Added: trunk/cmake/build_projects/update_pango_packages.sh
===================================================================
--- trunk/cmake/build_projects/update_pango_packages.sh	                        (rev 0)
+++ trunk/cmake/build_projects/update_pango_packages.sh	2013-08-01 04:25:44 UTC (rev 12462)
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Update build configurations of pango packages that are described by
+# GTK+ jhbuild build configuration
+
+GTK_VERSION=3.9.4
+rm -rf $GTK_VERSION
+mkdir $GTK_VERSION
+cd $GTK_VERSION
+# This downloads all the relevant xml build configuration files
+# for the given version of GTK
+wget -nd  ftp://ftp.acc.umu.se/pub/GNOME/teams/releng/$GTK_VERSION/*
+cd ..
+./gtk_xml_recursive_process.py \
+$GTK_VERSION/gnome-apps-$GTK_VERSION.modules \
+>|gtk_packages_$GTK_VERSION.xml
+rm -rf $GTK_VERSION
+patch --no-backup-if-mismatch gtk_packages_$GTK_VERSION.xml patch_gtk_packages.xml
+
+./gtk_transform.py pango 1 <gtk_packages_$GTK_VERSION.xml 1>| pango_packages.data
+cmake -DFILENAME:FILEPATH=pango_packages.data -P configure_bp.cmake


Property changes on: trunk/cmake/build_projects/update_pango_packages.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ai...@us...>]

Revision: 12461
          http://sourceforge.net/p/plplot/code/12461
Author:   airwin
Date:     2013-08-01 04:24:41 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
Reconfigure all the build configurations that are pango-generated.
The net effect of this reconfiguration is libXft is now ignored as a dependency for
all of these generated build configurations which suppresses a CMake
warning when build_projects is configured.

Modified Paths:
--------------
    trunk/cmake/build_projects/cairo/bp.cmake
    trunk/cmake/build_projects/fontconfig/bp.cmake
    trunk/cmake/build_projects/glib/bp.cmake
    trunk/cmake/build_projects/gobject-introspection/bp.cmake
    trunk/cmake/build_projects/gtk-doc/bp.cmake
    trunk/cmake/build_projects/harfbuzz/bp.cmake
    trunk/cmake/build_projects/itstool/bp.cmake
    trunk/cmake/build_projects/pango/bp.cmake
    trunk/cmake/build_projects/yelp-tools/bp.cmake
    trunk/cmake/build_projects/yelp-xsl/bp.cmake

Modified: trunk/cmake/build_projects/cairo/bp.cmake
===================================================================
--- trunk/cmake/build_projects/cairo/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
+++ trunk/cmake/build_projects/cairo/bp.cmake	2013-08-01 04:24:41 UTC (rev 12461)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(cairo_dependencies_LIST fontconfig;gtk-doc;pixman;pkg-config)
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/fontconfig/bp.cmake
===================================================================
--- trunk/cmake/build_projects/fontconfig/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
+++ trunk/cmake/build_projects/fontconfig/bp.cmake	2013-08-01 04:24:41 UTC (rev 12461)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(fontconfig_dependencies_LIST gperf)
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/glib/bp.cmake
===================================================================
--- trunk/cmake/build_projects/glib/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
+++ trunk/cmake/build_projects/glib/bp.cmake	2013-08-01 04:24:41 UTC (rev 12461)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(glib_dependencies_LIST gtk-doc;libffi)
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/gobject-introspection/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gobject-introspection/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
+++ trunk/cmake/build_projects/gobject-introspection/bp.cmake	2013-08-01 04:24:41 UTC (rev 12461)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(gobject-introspection_dependencies_LIST bison;cairo;flex;glib;python2-devel)
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/gtk-doc/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gtk-doc/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
+++ trunk/cmake/build_projects/gtk-doc/bp.cmake	2013-08-01 04:24:41 UTC (rev 12461)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(gtk-doc_dependencies_LIST libxslt;yelp-tools)
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/harfbuzz/bp.cmake
===================================================================
--- trunk/cmake/build_projects/harfbuzz/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
+++ trunk/cmake/build_projects/harfbuzz/bp.cmake	2013-08-01 04:24:41 UTC (rev 12461)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(harfbuzz_dependencies_LIST glib;ragel)
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/itstool/bp.cmake
===================================================================
--- trunk/cmake/build_projects/itstool/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
+++ trunk/cmake/build_projects/itstool/bp.cmake	2013-08-01 04:24:41 UTC (rev 12461)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(itstool_dependencies_LIST )
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/pango/bp.cmake
===================================================================
--- trunk/cmake/build_projects/pango/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
+++ trunk/cmake/build_projects/pango/bp.cmake	2013-08-01 04:24:41 UTC (rev 12461)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(pango_dependencies_LIST cairo;fontconfig;glib;gobject-introspection;gtk-doc;harfbuzz;libXft)
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/yelp-tools/bp.cmake
===================================================================
--- trunk/cmake/build_projects/yelp-tools/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
+++ trunk/cmake/build_projects/yelp-tools/bp.cmake	2013-08-01 04:24:41 UTC (rev 12461)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(yelp-tools_dependencies_LIST intltool;itstool;libxml2;libxslt;yelp-xsl)
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/yelp-xsl/bp.cmake
===================================================================
--- trunk/cmake/build_projects/yelp-xsl/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
+++ trunk/cmake/build_projects/yelp-xsl/bp.cmake	2013-08-01 04:24:41 UTC (rev 12461)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(yelp-xsl_dependencies_LIST intltool;itstool;libxml2;libxslt)
 # Remove dependencies that should be ignored.

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

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

[<ai...@us...>]

Revision: 12460
          http://sourceforge.net/p/plplot/code/12460
Author:   airwin
Date:     2013-08-01 03:59:57 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
Implement a build_plplot_lite target (which disables wxwidgets, qt,
and cairo device drivers and which therefore has fewer dependencies and
builds and tests 5 times as fast).

Meanwhile, the build_plplot target now has properly implemented
wxwidgets and pango build configuration dependencies, i.e., wxwidgets
and pango and their dependencies will be built first, then plplot
which will depend on those built and installed results.

Tested by Alan W. Irwin <ai...@us...> using both the
build_plplot_lite (5 minutes) and build_plplot (25 minutes) targets on Linux.

Modified Paths:
--------------
    trunk/cmake/build_projects/plplot/bp.cmake

Modified: trunk/cmake/build_projects/plplot/bp.cmake
===================================================================
--- trunk/cmake/build_projects/plplot/bp.cmake	2013-07-31 20:31:09 UTC (rev 12459)
+++ trunk/cmake/build_projects/plplot/bp.cmake	2013-08-01 03:59:57 UTC (rev 12460)
@@ -35,30 +35,47 @@
 endif(plplot_configured)
 set(plplot_configured ON)
 
-set(plplot_dependencies_LIST
+# Distinguish between plplot_lite dependencies and complete dependencies
+# for a heavy-duty build of PLplot.
+set(plplot_lite_dependencies_LIST
   libagg
   libharu
   libqhull
   shapelib
-# TEMPORARY
-# For debugging speed ignore wxwidgets soft dependency of PLplot for
-# now.
-#  wxwidgets
 )
 
+# Turn off wxwidgets devices and library, and cairo device drivers for lite version
+set(plplot_lite_cmake_args
+  -DPLD_wxwidgets=OFF
+  -DENABLE_wxwidgets=OFF
+  -DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON
+  -DDEFAULT_NO_QT_DEVICES:BOOL=ON
+  -DENABLE_qt=OFF
+  )
+
+set(plplot_lite_dependencies_targets)
+foreach(build_configuration ${plplot_lite_dependencies_LIST})
+  list(APPEND plplot_lite_dependencies_targets build_${build_configuration})
+endforeach(build_configuration ${plplot_lite_dependences_LIST})
+
+set(plplot_dependencies_LIST
+  ${plplot_lite_dependencies_LIST}
+  wxwidgets
+  pango
+  )
+
+set(plplot_dependencies_targets)
 foreach(build_configuration ${plplot_dependencies_LIST})
   include(${build_configuration}/bp.cmake)
+  list(APPEND plplot_dependencies_targets build_${build_configuration})
 endforeach(build_configuration ${plplot_dependences_LIST})
 
+# Leave eveything ON by default for normal plplot.
+set(plplot_cmake_args)
+
 # This can be safely done only after above includes.
 set(BP_PACKAGE plplot)
 
-set(${BP_PACKAGE}_dependencies_targets)
-foreach(build_configuration ${${BP_PACKAGE}_dependencies_LIST})
-  list(APPEND ${BP_PACKAGE}_dependencies_targets build_${build_configuration})
-endforeach(build_configuration ${${BP_PACKAGE}_dependences_LIST})
-message(STATUS "${BP_PACKAGE}_dependencies_targets = ${${BP_PACKAGE}_dependencies_targets}")
-
 # Note could retrieve the latest release, but that is pretty dated.
 # So ideally, would use a subversion client to get the trunk version,
 # but that means (on Windows) you must build a subversion client.
@@ -72,44 +89,48 @@
 set(PLPLOT_LOCAL_SOURCE_DIR /home/software/${BP_PACKAGE}_svn/HEAD/${BP_PACKAGE}_allura)
 file(TO_NATIVE_PATH ${PLPLOT_LOCAL_SOURCE_DIR} PLPLOT_LOCAL_SOURCE_DIR)
 
-# Data that is related to the PATH that must be used.
-if(MSYS_PLATFORM)
-  set(BP_PATH_NODLL "${BP_PATH}")
-  set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
-  message(STATUS "Original BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
-  determine_msys_path(BP_PATH "${BP_PATH}")
-  # TEMPORARY (already in the _required_ native form for the cmake -E
-  # copy_directory command below except for the drive letter which is
-  # z: for this local result.)
-  set(PLPLOT_LOCAL_SOURCE_DIR z:${PLPLOT_LOCAL_SOURCE_DIR})
-endif(MSYS_PLATFORM)
-message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+set(tags "" "_lite")
+foreach(tag IN LISTS tags)
+  # Data that is related to the PATH that must be used.
+  if(MSYS_PLATFORM)
+    set(BP_PATH_NODLL "${BP_PATH}")
+    set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}${tag}/dll;${BP_PATH_NODLL}")
+    message(STATUS "Original BP_PATH for ${BP_PACKAGE}${tag} = ${BP_PATH}")
+    determine_msys_path(BP_PATH "${BP_PATH}")
+    # TEMPORARY (already in the _required_ native form for the cmake -E
+    # copy_directory command below except for the drive letter which is
+    # z: for this local result.)
+    set(PLPLOT_LOCAL_SOURCE_DIR z:${PLPLOT_LOCAL_SOURCE_DIR})
+  endif(MSYS_PLATFORM)
+  message(STATUS "modified BP_PATH for ${BP_PACKAGE}${tag} = ${BP_PATH}")
 
-# Build PLplot itself.  The pdf device is turned on since the haru library
-# is built with a fix to avoid segfaults for example 24.
-ExternalProject_Add(
-  build_${BP_PACKAGE}
-  DEPENDS "${${BP_PACKAGE}_dependencies_targets}"
-  #TEMPORARY
-  DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLPLOT_LOCAL_SOURCE_DIR} ${EP_BASE}/Source/build_${BP_PACKAGE}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON -DPLD_pdf=ON ${EP_BASE}/Source/build_${BP_PACKAGE}
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
-  TEST_BEFORE_INSTALL OFF
-  TEST_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} test_noninteractive
-  STEP_TARGETS configure build install test
-  )
+  # Build PLplot (or PLplot-lite). The pdf device is turned on since the
+  # haru library is built with a fix to avoid segfaults for example 24.
+  ExternalProject_Add(
+    build_${BP_PACKAGE}${tag}
+    DEPENDS "${${BP_PACKAGE}${tag}_dependencies_targets}"
+    #TEMPORARY
+    DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLPLOT_LOCAL_SOURCE_DIR} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
+    CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON -DPLD_pdf=ON ${${BP_PACKAGE}${tag}_cmake_args} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
+    BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
+    INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
+    TEST_BEFORE_INSTALL OFF
+    TEST_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} test_noninteractive
+    #STEP_TARGETS configure build install test
+    )
 
-# Add custom commands to the current test step.
-add_custom_command(
-  OUTPUT
-  ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-test
-  COMMAND echo made_it_to_extra_test
-  COMMENT "Test installed examples from ${BP_PACKAGE}"
-  APPEND
-  )
+  # Add custom commands to the current test step.
+  add_custom_command(
+    OUTPUT
+    ${EP_BASE}/Stamp/build_${BP_PACKAGE}${tag}/build_${BP_PACKAGE}${tag}-test
+    COMMAND echo made_it_to_extra_test
+    COMMENT "Test installed examples from ${BP_PACKAGE}${tag}"
+    APPEND
+    )
 
-list(APPEND build_target_LIST build_${BP_PACKAGE})
-# Restore BP_PATH to original state.
-set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
-#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")
+  list(APPEND build_target_LIST build_${BP_PACKAGE}${tag})
+
+  # Restore BP_PATH to original state.
+  set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+  #message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")
+endforeach(tag IN LISTS tags)

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

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

[<ai...@us...>]

Revision: 12459
          http://sourceforge.net/p/plplot/code/12459
Author:   airwin
Date:     2013-07-31 20:31:09 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Add ragel build configuration.  This is the last required build
configuration (other than obvious build tools and libXft) that the
jhbuild configuration data indicates is required for pango and all
its dependencies.  So in theory the build of pango should also work
on MSYS, but undoubtedly there are other dependencies that the
jhbuild configuration files currently fail to identify.

Tested by Alan W. Irwin <ai...@us...> by running the
update_added_packages.sh script to automatically generate/regenerate all added
build_configurations (which now includes ragel) and afterward running the
build_harfbuzz target (which indirectly runs the build_ragel target) on
Linux.

Modified Paths:
--------------
    trunk/cmake/build_projects/gtk_packages_add.xml
    trunk/cmake/build_projects/update_added_packages.sh

Added Paths:
-----------
    trunk/cmake/build_projects/ragel/
    trunk/cmake/build_projects/ragel/bp.cmake

Modified: trunk/cmake/build_projects/gtk_packages_add.xml
===================================================================
--- trunk/cmake/build_projects/gtk_packages_add.xml	2013-07-31 19:37:14 UTC (rev 12458)
+++ trunk/cmake/build_projects/gtk_packages_add.xml	2013-07-31 20:31:09 UTC (rev 12459)
@@ -30,4 +30,7 @@
       <dep package="libxml2"/>
     </dependencies>
   </autotools>
+  <autotools id="ragel">
+    <branch hash="sha256:dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764" module="ragel/ragel-6.8.tar.gz" repo="http://www.complang.org/" size="1211146" version="6.8"/>
+  </autotools>
  </moduleset>

Added: trunk/cmake/build_projects/ragel/bp.cmake
===================================================================
--- trunk/cmake/build_projects/ragel/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/ragel/bp.cmake	2013-07-31 20:31:09 UTC (rev 12459)
@@ -0,0 +1,89 @@
+# ragel/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of ragel.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(ragel_configured)
+  return()
+endif(ragel_configured)
+set(ragel_configured ON)
+
+# 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(ragel_dependencies_LIST )
+# Remove dependencies that should be ignored.
+if(ragel_dependencies_LIST)
+  list(REMOVE_ITEM ragel_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(ragel_dependencies_LIST)
+
+set(ragel_dependencies_targets)
+foreach(build_configuration ${ragel_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND ragel_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of ragel has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${ragel_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE ragel)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://www.complang.org/ragel/ragel-6.8.tar.gz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Modified: trunk/cmake/build_projects/update_added_packages.sh
===================================================================
--- trunk/cmake/build_projects/update_added_packages.sh	2013-07-31 19:37:14 UTC (rev 12458)
+++ trunk/cmake/build_projects/update_added_packages.sh	2013-07-31 20:31:09 UTC (rev 12459)
@@ -5,7 +5,7 @@
 rm -f add_packages.data
 touch add_packages.data
 # Ignore libxml2 since that is sucked in by the libxslt dependency.
-PACKAGE_LIST="libffi intltool pixman gperf libxslt"
+PACKAGE_LIST="libffi intltool pixman gperf libxslt ragel"
 for PACKAGE in $PACKAGE_LIST; do
   ./gtk_transform.py $PACKAGE 1 <gtk_packages_add.xml 1>> add_packages.data
 done

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

[Plplot-cvs] SF.net SVN: plplot:[12458] trunk/cmake/build_projects/update_added_packages .sh

[<ai...@us...>]

Revision: 12458
          http://sourceforge.net/p/plplot/code/12458
Author:   airwin
Date:     2013-07-31 19:37:14 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Initial commit of script to automatically generate
(or regenerate) build configurations for the following
list of packages:

libffi intltool pixman gperf libxslt libxml2

Tested by Alan W. Irwin <ai...@us...> by
running the script and testing all the relevant build targets
for these packages on Linux.

Added Paths:
-----------
    trunk/cmake/build_projects/update_added_packages.sh

Added: trunk/cmake/build_projects/update_added_packages.sh
===================================================================
--- trunk/cmake/build_projects/update_added_packages.sh	                        (rev 0)
+++ trunk/cmake/build_projects/update_added_packages.sh	2013-07-31 19:37:14 UTC (rev 12458)
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Update build configurations of added packages that are described by
+# gtk_packages_add.xml
+
+rm -f add_packages.data
+touch add_packages.data
+# Ignore libxml2 since that is sucked in by the libxslt dependency.
+PACKAGE_LIST="libffi intltool pixman gperf libxslt"
+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


Property changes on: trunk/cmake/build_projects/update_added_packages.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ai...@us...>]

Revision: 12457
          http://sourceforge.net/p/plplot/code/12457
Author:   airwin
Date:     2013-07-31 19:33:53 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Ignore libXft in dependencies for all automatically generated
build configurations.

Modified Paths:
--------------
    trunk/cmake/build_projects/configure_bp.cmake

Modified: trunk/cmake/build_projects/configure_bp.cmake
===================================================================
--- trunk/cmake/build_projects/configure_bp.cmake	2013-07-31 19:32:46 UTC (rev 12456)
+++ trunk/cmake/build_projects/configure_bp.cmake	2013-07-31 19:33:53 UTC (rev 12457)
@@ -9,7 +9,9 @@
   flex
   python2-devel
   # dependencies which we want to ignore
-  # (none so far).
+  # ignore libXft since that is an X library that
+  # presumably won't be needed on Windows systems.
+  libXft
 )
 
 file(STRINGS ${FILENAME} lines)

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

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

[<ai...@us...>]

Revision: 12456
          http://sourceforge.net/p/plplot/code/12456
Author:   airwin
Date:     2013-07-31 19:32:46 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Add (automatically generated) build configurations for
libxslt and libxml2.

Tested by: Alan W. Irwin <ai...@us...> using the
build_libxslt target on Linux.

Modified Paths:
--------------
    trunk/cmake/build_projects/gtk_packages_add.xml

Added Paths:
-----------
    trunk/cmake/build_projects/libxml2/
    trunk/cmake/build_projects/libxml2/bp.cmake
    trunk/cmake/build_projects/libxslt/
    trunk/cmake/build_projects/libxslt/bp.cmake

Modified: trunk/cmake/build_projects/gtk_packages_add.xml
===================================================================
--- trunk/cmake/build_projects/gtk_packages_add.xml	2013-07-31 19:29:47 UTC (rev 12455)
+++ trunk/cmake/build_projects/gtk_packages_add.xml	2013-07-31 19:32:46 UTC (rev 12456)
@@ -1,4 +1,9 @@
 <?xml version="1.0" ?>
+<!--
+Most of these data derived from http://www.linuxfromscratch.org, a
+wonderful site that provides fundamental build information for a lot
+of different free software packages.
+-->
 <moduleset>
   <autotools id="libffi">
     <branch hash="sha256:1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c" module="libffi/libffi-3.0.13.tar.gz" repo="ftp://sourceware.org/pub/" size="845747" version="3.0.13"/>
@@ -10,7 +15,19 @@
     <pkg-config/>
     <branch hash="sha256:1d812f9f60215099355f5c13c6f06d7db1135c99f34ff03535b71b64435125fd" module="releases/pixman-0.30.0.tar.gz" repo="http://cairographics.org/" size="801692" version="0.30.0"/>
   </autotools>
- <autotools id="gperf">
+  <autotools id="gperf">
     <branch hash="sha256:767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e" module="gnu/gperf/gperf-3.0.4.tar.gz" repo="http://ftp.gnu.org/" size="983500" version="3.0.4"/>
   </autotools>
+<!-- without these python shenanigans the python components of libxml2 are
+installed with the system prefix rather than desired special prefix
+-->
+  <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"/>
+  </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"/>
+    <dependencies>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
  </moduleset>

Added: trunk/cmake/build_projects/libxml2/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libxml2/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/libxml2/bp.cmake	2013-07-31 19:32:46 UTC (rev 12456)
@@ -0,0 +1,89 @@
+# libxml2/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of libxml2.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(libxml2_configured)
+  return()
+endif(libxml2_configured)
+set(libxml2_configured ON)
+
+# 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(libxml2_dependencies_LIST )
+# Remove dependencies that should be ignored.
+if(libxml2_dependencies_LIST)
+  list(REMOVE_ITEM libxml2_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(libxml2_dependencies_LIST)
+
+set(libxml2_dependencies_targets)
+foreach(build_configuration ${libxml2_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND libxml2_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of libxml2 has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${libxml2_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE libxml2)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://xmlsoft.org/sources/libxml2-2.9.1.tar.gz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 9c0cfef285d5c4a5c80d00904ddab380)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages
+  BUILD_IN_SOURCE OFF
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages install
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/libxslt/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libxslt/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/libxslt/bp.cmake	2013-07-31 19:32:46 UTC (rev 12456)
@@ -0,0 +1,89 @@
+# libxslt/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of libxslt.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(libxslt_configured)
+  return()
+endif(libxslt_configured)
+set(libxslt_configured ON)
+
+# 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(libxslt_dependencies_LIST libxml2)
+# Remove dependencies that should be ignored.
+if(libxslt_dependencies_LIST)
+  list(REMOVE_ITEM libxslt_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(libxslt_dependencies_LIST)
+
+set(libxslt_dependencies_targets)
+foreach(build_configuration ${libxslt_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND libxslt_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of libxslt has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${libxslt_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE libxslt)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://xmlsoft.org/sources/libxslt-1.1.28.tar.gz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 9667bf6f9310b957254fdcf6596600b7)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

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

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

[<ai...@us...>]

Revision: 12455
          http://sourceforge.net/p/plplot/code/12455
Author:   airwin
Date:     2013-07-31 19:29:47 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Reconfigure with update_added_packages.sh script (which will soon be
committed).  This reconfiguration imposes a small
change to ignore the libXft package if it occurs in the list of
dependencies.

Modified Paths:
--------------
    trunk/cmake/build_projects/gperf/bp.cmake
    trunk/cmake/build_projects/intltool/bp.cmake
    trunk/cmake/build_projects/libffi/bp.cmake
    trunk/cmake/build_projects/pixman/bp.cmake

Modified: trunk/cmake/build_projects/gperf/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gperf/bp.cmake	2013-07-31 19:20:00 UTC (rev 12454)
+++ trunk/cmake/build_projects/gperf/bp.cmake	2013-07-31 19:29:47 UTC (rev 12455)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(gperf_dependencies_LIST )
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/intltool/bp.cmake
===================================================================
--- trunk/cmake/build_projects/intltool/bp.cmake	2013-07-31 19:20:00 UTC (rev 12454)
+++ trunk/cmake/build_projects/intltool/bp.cmake	2013-07-31 19:29:47 UTC (rev 12455)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(intltool_dependencies_LIST )
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/libffi/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libffi/bp.cmake	2013-07-31 19:20:00 UTC (rev 12454)
+++ trunk/cmake/build_projects/libffi/bp.cmake	2013-07-31 19:29:47 UTC (rev 12455)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(libffi_dependencies_LIST )
 # Remove dependencies that should be ignored.

Modified: trunk/cmake/build_projects/pixman/bp.cmake
===================================================================
--- trunk/cmake/build_projects/pixman/bp.cmake	2013-07-31 19:20:00 UTC (rev 12454)
+++ trunk/cmake/build_projects/pixman/bp.cmake	2013-07-31 19:29:47 UTC (rev 12455)
@@ -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)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
 
 set(pixman_dependencies_LIST pkg-config)
 # Remove dependencies that should be ignored.

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

[Plplot-cvs] SF.net SVN: plplot:[12454] trunk/cmake/build_projects/CMakeLists.txt

[<ai...@us...>]

Revision: 12454
          http://sourceforge.net/p/plplot/code/12454
Author:   airwin
Date:     2013-07-31 19:20:00 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Add python to the list of necessary executables and figure out
PYTHON_VERSION (used in some build configurations).

Modified Paths:
--------------
    trunk/cmake/build_projects/CMakeLists.txt

Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt	2013-07-31 15:55:51 UTC (rev 12453)
+++ trunk/cmake/build_projects/CMakeLists.txt	2013-07-31 19:20:00 UTC (rev 12454)
@@ -82,6 +82,7 @@
   # available so might as well check it here.
   bash
   make
+  python
   )
 
 foreach(executable ${executables_LIST})
@@ -95,6 +96,15 @@
   endif(NOT ${EXECUTABLE}_EXECUTABLE)
 endforeach(executable ${executables_LIST})
 
+# Get the Python version.
+execute_process(
+  COMMAND
+  ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_version())"
+  OUTPUT_VARIABLE PYTHON_VERSION
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+message(STATUS "PYTHON_VERSION = ${PYTHON_VERSION}")
+
 # Use modified version of ExternalProject where cmake -E touch has
 # been replaced with the TOUCH_EXECUTABLE command (to work around
 # cmake bug 14020)

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

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

[<ai...@us...>]

Revision: 12453
          http://sourceforge.net/p/plplot/code/12453
Author:   airwin
Date:     2013-07-31 15:55:51 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Add gperf build configuration to help satisfy an indirect pango build dependency.

Tested by: Alan W. Irwin <ai...@us...> using the
build_gperf target on Linux.

Modified Paths:
--------------
    trunk/cmake/build_projects/gtk_packages_add.xml

Added Paths:
-----------
    trunk/cmake/build_projects/gperf/
    trunk/cmake/build_projects/gperf/bp.cmake

Added: trunk/cmake/build_projects/gperf/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gperf/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/gperf/bp.cmake	2013-07-31 15:55:51 UTC (rev 12453)
@@ -0,0 +1,89 @@
+# gperf/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of gperf.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(gperf_configured)
+  return()
+endif(gperf_configured)
+set(gperf_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(gperf_dependencies_LIST )
+# Remove dependencies that should be ignored.
+if(gperf_dependencies_LIST)
+  list(REMOVE_ITEM gperf_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(gperf_dependencies_LIST)
+
+set(gperf_dependencies_targets)
+foreach(build_configuration ${gperf_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND gperf_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of gperf has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${gperf_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE gperf)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://ftp.gnu.org/gnu/gperf/gperf-3.0.4.tar.gz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Modified: trunk/cmake/build_projects/gtk_packages_add.xml
===================================================================
--- trunk/cmake/build_projects/gtk_packages_add.xml	2013-07-31 15:28:47 UTC (rev 12452)
+++ trunk/cmake/build_projects/gtk_packages_add.xml	2013-07-31 15:55:51 UTC (rev 12453)
@@ -10,4 +10,7 @@
     <pkg-config/>
     <branch hash="sha256:1d812f9f60215099355f5c13c6f06d7db1135c99f34ff03535b71b64435125fd" module="releases/pixman-0.30.0.tar.gz" repo="http://cairographics.org/" size="801692" version="0.30.0"/>
   </autotools>
-</moduleset>
+ <autotools id="gperf">
+    <branch hash="sha256:767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e" module="gnu/gperf/gperf-3.0.4.tar.gz" repo="http://ftp.gnu.org/" size="983500" version="3.0.4"/>
+  </autotools>
+ </moduleset>

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

[Plplot-cvs] SF.net SVN: plplot:[12452] trunk/cmake/build_projects/gtk_packages_add.xml

[<ai...@us...>]

Revision: 12452
          http://sourceforge.net/p/plplot/code/12452
Author:   airwin
Date:     2013-07-31 15:28:47 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Update size, version information to the correct values (even though
those values are currently unused).

Modified Paths:
--------------
    trunk/cmake/build_projects/gtk_packages_add.xml

Modified: trunk/cmake/build_projects/gtk_packages_add.xml
===================================================================
--- trunk/cmake/build_projects/gtk_packages_add.xml	2013-07-31 15:10:16 UTC (rev 12451)
+++ trunk/cmake/build_projects/gtk_packages_add.xml	2013-07-31 15:28:47 UTC (rev 12452)
@@ -4,10 +4,10 @@
     <branch hash="sha256:1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c" module="libffi/libffi-3.0.13.tar.gz" repo="ftp://sourceware.org/pub/" size="845747" version="3.0.13"/>
   </autotools>
   <autotools id="intltool">
-    <branch hash="md5:23fbd879118253cb99aeac067da5f591" module="intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz" repo="http://launchpad.net/" version="0.50.2"/>
+    <branch hash="md5:23fbd879118253cb99aeac067da5f591" module="intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz" repo="http://launchpad.net/" size="189483" version="0.50.2"/>
   </autotools>
   <autotools autogenargs="--disable-gtk" id="pixman">
     <pkg-config/>
-    <branch hash="sha256:1d812f9f60215099355f5c13c6f06d7db1135c99f34ff03535b71b64435125fd" module="releases/pixman-0.30.0.tar.gz" repo="http://cairographics.org/" size="542724" version="0.20.2"/>
+    <branch hash="sha256:1d812f9f60215099355f5c13c6f06d7db1135c99f34ff03535b71b64435125fd" module="releases/pixman-0.30.0.tar.gz" repo="http://cairographics.org/" size="801692" version="0.30.0"/>
   </autotools>
 </moduleset>

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

[Plplot-cvs] SF.net SVN: plplot:[12451] trunk/cmake/build_projects/patch_gtk_packages. xml

[<ai...@us...>]

Revision: 12451
          http://sourceforge.net/p/plplot/code/12451
Author:   airwin
Date:     2013-07-31 15:10:16 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Although size is currently ignored, it might not be ignored in the
future so update this patch to the correct size for the new version of harfbuzz.

Modified Paths:
--------------
    trunk/cmake/build_projects/patch_gtk_packages.xml

Modified: trunk/cmake/build_projects/patch_gtk_packages.xml
===================================================================
--- trunk/cmake/build_projects/patch_gtk_packages.xml	2013-07-31 02:50:36 UTC (rev 12450)
+++ trunk/cmake/build_projects/patch_gtk_packages.xml	2013-07-31 15:10:16 UTC (rev 12451)
@@ -1,11 +1,11 @@
 --- gtk_packages_3.9.4.xml_original	2013-07-30 14:52:57.038048491 -0700
-+++ gtk_packages_3.9.4.xml	2013-07-30 15:06:23.922792828 -0700
++++ gtk_packages_3.9.4.xml	2013-07-31 08:06:20.965414047 -0700
 @@ -925,7 +925,7 @@
      </suggests>
    </autotools>
    <autotools autogenargs="" id="harfbuzz">
 -    <branch hash="sha256:fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908" module="harfbuzz-0.9.18.tar.bz2" repo="http://www.freedesktop.org/software/harfbuzz/release/" size="902395" version="0.9.18"/>
-+    <branch hash="sha256:d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35" module="harfbuzz-0.9.19.tar.bz2" repo="http://www.freedesktop.org/software/harfbuzz/release/" size="902395" version="0.9.19"/>
++    <branch hash="sha256:d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35" module="harfbuzz-0.9.19.tar.bz2" repo="http://www.freedesktop.org/software/harfbuzz/release/" size="926632" version="0.9.19"/>
      <branch checkoutdir="harfbuzz" module="harfbuzz" repo="git.freedesktop.org"/>
      <dependencies>
        <dep package="glib"/>

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

[Plplot-cvs] SF.net SVN: plplot:[12450] trunk/cmake/build_projects/CMakeLists.txt

[<ai...@us...>]

Revision: 12450
          http://sourceforge.net/p/plplot/code/12450
Author:   airwin
Date:     2013-07-31 02:50:36 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Implement AUTOTOOLS_PARALLEL_BUILD option which defaults to ON (and
which works well on Linux).  It might be useful to set this to OFF for
MSYS/Wine builds because that reduces some strain caused by running
many large libtool bash scripts simultaneously and which appears to
pop some error boxes from time to time under MSYS wine.

Reduce the number of builds that are directly configured since their
dependencies indirectly bring in the rest.

Tested by: Alan W. Irwin <ai...@us...> on Linux using
the build_wxwidgets, build_pango, and build_plplot targets.  These tests
are for the recent cumulation of commits up to this one.  wxwidgets
built in parallel with no issues, but because of a minor PATH issue
was ignored by the plplot build.  The pango build (and the build of all its many
dependencies) showed no issues and finished in 7.5 minutes.  The
PLplot build (and all its specific small dependencies) had no issues
(except for ignoring the wxwidgets build results and a few additional
dependency issues to be discussed).  The
cairo device driver was linked with all the pango-related libraries that
were built and the cairo non-interactive devices tested well.  Limited
tests of the cairo non-interactive devices also seemed fine.

In sum, this is a breakthrough for the build_packages project where
for the first time with this project we have built essentially the
latest version of pango and its dependencies without issues, and used
those libraries to produce excellent results for the PLplot cairo
devices on Linux.

ToDo: the libfreetype and libpng dependencies are not yet part of
build_packages so the above PLplot results used the system versions of
those instead on Linux.  There may be other dependencies that are
required (to be discussed on the plplot-devel list) as well.

Modified Paths:
--------------
    trunk/cmake/build_projects/CMakeLists.txt

Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt	2013-07-31 02:28:59 UTC (rev 12449)
+++ trunk/cmake/build_projects/CMakeLists.txt	2013-07-31 02:50:36 UTC (rev 12450)
@@ -67,7 +67,7 @@
 
 # List of executables required by build_projects CMake logic.
 set(executables_LIST
-  # ExternalProject
+  # ExternalProject workarounds
   touch
   # Unpacking
   unzip
@@ -182,7 +182,12 @@
 set(BP_PARALLEL_BUILD_COMMAND "${BP_BUILD_COMMAND}" -j4)
 set(BP_PARALLEL_CTEST_COMMAND "${BP_CTEST_COMMAND}" -j4)
 # For autotools based builds.
-set(BP_PARALLEL_MAKE_COMMAND "${BP_MAKE_COMMAND}" -j4)
+option(AUTOTOOLS_PARALLEL_BUILD "Build autotools projects using parallel make unless a specific project is expressely configured otherwise" ON)
+if(AUTOTOOLS_PARALLEL_BUILD)
+  set(BP_PARALLEL_MAKE_COMMAND "${BP_MAKE_COMMAND}" -j4)
+else(AUTOTOOLS_PARALLEL_BUILD)
+  set(BP_PARALLEL_MAKE_COMMAND "${BP_MAKE_COMMAND}")
+endif(AUTOTOOLS_PARALLEL_BUILD)
 
 message(STATUS "BP_CMAKE_COMMAND = ${BP_CMAKE_COMMAND}")
 message(STATUS "BP_CONFIGURE_COMMAND = ${BP_CONFIGURE_COMMAND}")
@@ -238,15 +243,11 @@
   # List of all configurations.  Order doesn't matter because multiple
   # attempts to include the same configuration (via dependencies) are ignored.
   set(build_configuration_LIST
-    libagg
-    libharu
-    libqhull
     ndiff
     plplot
-    shapelib
     wxwidgets
-    #glib
-    ffi
+    glib
+    pango
     )
 endif(BUILD_THE_BUILDTOOLS)
 

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

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

[<ai...@us...>]

Revision: 12449
          http://sourceforge.net/p/plplot/code/12449
Author:   airwin
Date:     2013-07-31 02:28:59 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Improve instructions related to GTK+ configuration of all
pango-related packages.

Modified Paths:
--------------
    trunk/cmake/build_projects/README

Modified: trunk/cmake/build_projects/README
===================================================================
--- trunk/cmake/build_projects/README	2013-07-31 02:27:16 UTC (rev 12448)
+++ trunk/cmake/build_projects/README	2013-07-31 02:28:59 UTC (rev 12449)
@@ -184,24 +184,27 @@
 files in xml form.  Here is how you convert that form of build-configuration
 data to the build_projects form.
 
-pushd <tmpdir>
+# Chose this latest version (as of August 2013) because it probably has
+# improved build and dependency instructions compared to previous versions.
+# For example, the glib version (2.37.4) is known to solve a build issue
+# that I ran into for earlier glib versions.
+export GTK_VERSION=3.9.4
+mkdir -p $GTK_VERSION
+cd $GTK_VERSION
 # This downloads all the relevant xml build configuration files
 # for the given version of GTK
-wget -nd  ftp://ftp.acc.umu.se/pub/GNOME/teams/releng/3.4.1/*
-popd
+wget -nd  ftp://ftp.acc.umu.se/pub/GNOME/teams/releng/$GTK_VERSION/*
+cd ..
 ./gtk_xml_recursive_process.py \
-<tmpdir>/gnome-apps-3.4.1.modules \
->gtk_packages.xml
+$GTK_VERSION/gnome-apps-$GTK_VERSION.modules \
+>gtk_packages_$GTK_VERSION.xml
 
-Where GNOME-3.4.1 comes fairly close to the individual
-package versions that currently work well together for Debian wheezy.
-
 To create the schema for gtk_packages.xml use
 
-trang -I xml gtk_packages.xml gtk_packages_xml.rnc
+trang -I xml gtk_packages_$GTK_VERSION.xml gtk_packages_$GTK_VERSION.rnc
 
 # That resulting schema file is quite helpful in figuring out
-# how to process gtk_packages.xml as below.
+# how to process gtk_packages_$GTK_VERSION.xml as below.
 
 # Transform the xml form to a form that can be used by a cmake script.
 # Note, there will be some information messages sent to stderr by this
@@ -217,7 +220,7 @@
 # dependencies.  Currently I use a command variable of 1 to keep
 # the number of packages configured for building pango and
 # (hard) dependencies to a minimum.
-./gtk_transform.py "pango" 1 <gtk_packages.xml 1>| pango_packages.data
+./gtk_transform.py "pango" 1 <gtk_packages_$GTK_VERSION.xml 1>| pango_packages.data
 
 # N.B. there are no plans to keep gtk_packages.xml, gtk_packages.rnc,
 # or pango_packages.data under version control.  However, if a patch
@@ -229,3 +232,13 @@
 
 cmake -DFILENAME:FILEPATH=pango_packages.data -P configure_bp.cmake
 
+# One known issue with the gtk+ stack is certain package dependencies
+# are completely missing such as pkg-config and libffi which have to
+# be built independently.  For pkg-config we use a hand-generated
+# configuration, pkg-config/bp.cmake.  Other missing packages that
+# 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
+cmake -DFILENAME:FILEPATH=add_packages.data -P configure_bp.cmake

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

[Plplot-cvs] SF.net SVN: plplot:[12448] trunk/cmake/build_projects/libffi/bp.cmake

[<ai...@us...>]

Revision: 12448
          http://sourceforge.net/p/plplot/code/12448
Author:   airwin
Date:     2013-07-31 02:27:16 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Reconfigure libffi using the latest gtk_packages_add.xml,
gtk_transform.py, configure_bp.cmake, and template.bp.in.

The new configuration continues to build.

Modified Paths:
--------------
    trunk/cmake/build_projects/libffi/bp.cmake

Modified: trunk/cmake/build_projects/libffi/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libffi/bp.cmake	2013-07-31 02:23:21 UTC (rev 12447)
+++ trunk/cmake/build_projects/libffi/bp.cmake	2013-07-31 02:27:16 UTC (rev 12448)
@@ -30,20 +30,29 @@
 endif(libffi_configured)
 set(libffi_configured ON)
 
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
 set(libffi_dependencies_LIST )
+# Remove dependencies that should be ignored.
+if(libffi_dependencies_LIST)
+  list(REMOVE_ITEM libffi_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(libffi_dependencies_LIST)
 
+set(libffi_dependencies_targets)
 foreach(build_configuration ${libffi_dependencies_LIST})
-  include(${build_configuration}/bp.cmake)
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND libffi_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of libffi has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
 endforeach(build_configuration ${libffi_dependences_LIST})
 
 # This can be safely done only after above includes.
 set(BP_PACKAGE libffi)
 
-set(${BP_PACKAGE}_dependencies_targets)
-foreach(build_configuration ${${BP_PACKAGE}_dependencies_LIST})
-  list(APPEND ${BP_PACKAGE}_dependencies_targets build_${build_configuration})
-endforeach(build_configuration ${${BP_PACKAGE}_dependences_LIST})
-
 # Data that is related to downloads.
 set(${BP_PACKAGE}_URL ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz)
 set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
@@ -69,8 +78,9 @@
   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} 
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
+  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
   )
 
 list(APPEND build_target_LIST build_${BP_PACKAGE})

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

[Plplot-cvs] SF.net SVN: plplot:[12447] trunk/cmake/build_projects/wxwidgets/bp.cmake

[<ai...@us...>]

Revision: 12447
          http://sourceforge.net/p/plplot/code/12447
Author:   airwin
Date:     2013-07-31 02:23:21 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Move back to parallel builds in general.  I now have more experience
with autotools type builds on MSYS/Wine, and they all seem to pop
several error boxes (probably due to some Wine-1.6 issue) typically
during runs of the enormous libtool bash script configured for each
project and typically run (twice!) for each compilation.  My
hypothesis now is the parallel builds are putting extreme pressure on
bash running those libtool scripts so the number of error boxes that
are popped for MSYS should be reduced if parallel builds are not
allowed for autotools-configured projects.  But I will handle that
with an overall option (see next commit) rather than specifically
turning off parallel builds for each separate autotools project.

Modified Paths:
--------------
    trunk/cmake/build_projects/wxwidgets/bp.cmake

Modified: trunk/cmake/build_projects/wxwidgets/bp.cmake
===================================================================
--- trunk/cmake/build_projects/wxwidgets/bp.cmake	2013-07-31 02:14:21 UTC (rev 12446)
+++ trunk/cmake/build_projects/wxwidgets/bp.cmake	2013-07-31 02:23:21 UTC (rev 12447)
@@ -54,18 +54,13 @@
 endif(MSYS_PLATFORM)
 #message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
 
-# Got intermittent failures using ${BP_PARALLEL_MAKE} both
-# historically and recently which are likely due to a parallel make
-# race condition for wxwidgets.  So I have decided to use
-# slow but sure ${BP_MAKE_COMMAND} instead.
-
 ExternalProject_Add(
   build_${BP_PACKAGE}
   URL ${${BP_PACKAGE}_URL}
   URL_MD5 ${${BP_PACKAGE}_URL_MD5}
   CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_MAKE_COMMAND}
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_MAKE_COMMAND} install
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
   )
 
 list(APPEND build_target_LIST build_${BP_PACKAGE})

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

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

[<ai...@us...>]

Revision: 12446
          http://sourceforge.net/p/plplot/code/12446
Author:   airwin
Date:     2013-07-31 02:14:21 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Configure additional features for build configurations (typically those
from jhbuild build configuration data collected from GTK+) that are
generated by configure_bp.cmake.

Those features include improved processing of dependencies (ignoring
specific dependencies (mostly dependencies which can be assumed
to be part of the normal build tools) contained in a list in configure_bp.cmake and dropping
all dependencies which don't have a build configuration yet) and
configuring the configure script arguments and the make command
arguments.

Modified Paths:
--------------
    trunk/cmake/build_projects/configure_bp.cmake
    trunk/cmake/build_projects/template.bp.in

Modified: trunk/cmake/build_projects/configure_bp.cmake
===================================================================
--- trunk/cmake/build_projects/configure_bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
+++ trunk/cmake/build_projects/configure_bp.cmake	2013-07-31 02:14:21 UTC (rev 12446)
@@ -1,24 +1,61 @@
 cmake_policy(SET CMP0007 NEW)
+
+# List of dependencies (mostly these are build-tools) which should be
+# ignored.
+set(ignored_dependencies_LIST
+  # build tools
+  pkg-config
+  bison
+  flex
+  python2-devel
+  # dependencies which we want to ignore
+  # (none so far).
+)
+
 file(STRINGS ${FILENAME} lines)
 list(LENGTH lines nlines)
 # There are currently groups of 9 lines for each
 # gtk software package specifying the required
 # build-configuration information.
-set(group_size 9)
-set(remove_indices 0 1 2 3 4 5 6 7 8)
+set(group_size 12)
+set(remove_indices 0 1 2 3 4 5 6 7 8 9 10 11)
 math(EXPR max_index "(${nlines}/${group_size}) - 1")
 foreach(index RANGE 0 ${max_index})
   list(GET lines 0 package)
   list(GET lines 1 config_type)
-  list(GET lines 2 config_arguments)
-  list(GET lines 3 download_hash_type)
-  list(GET lines 4 download_hash)
-  list(GET lines 5 download_href)
-  list(GET lines 6 dependencies)
-  list(GET lines 7 suggests)
-  list(GET lines 8 after)
+  list(GET lines 2 supports_non_srcdir_builds)
+  list(GET lines 3 supports_parallel_builds)
+  list(GET lines 4 config_arguments)
+  list(GET lines 5 make_arguments)
+  list(GET lines 6 download_hash_type)
+  list(GET lines 7 download_hash)
+  list(GET lines 8 download_href)
+  list(GET lines 9 dependencies)
+  list(GET lines 10 suggests)
+  list(GET lines 11 after)
   list(REMOVE_AT lines ${remove_indices})
 
+  if(supports_non_srcdir_builds)
+    set(BUILD_IN_SOURCE OFF)
+  else(supports_non_srcdir_builds)
+    set(BUILD_IN_SOURCE ON)
+  endif(supports_non_srcdir_builds)
+
+  if(supports_parallel_builds)
+    set(BUILD_COMMAND BP_PARALLEL_MAKE_COMMAND)
+  else(supports_parallel_builds)
+    set(BUILD_COMMAND BP_MAKE_COMMAND)
+  endif(supports_parallel_builds)
+
+  # Extra CFLAGS fixups for individual packages.
+  if(package STREQUAL "glib")
+    set(MSYS_EXTRA_CFLAGS "-march=native ")
+    set(UNIX_EXTRA_CFLAGS)
+  else(package STREQUAL "glib")
+    set(MSYS_EXTRA_CFLAGS)
+    set(UNIX_EXTRA_CFLAGS)
+  endif(package STREQUAL "glib")
+
   # Turn colon-separated lists into official CMake lists.
   string(REGEX REPLACE ":" ";" dependencies "${dependencies}")
   string(REGEX REPLACE ":" ";" suggests "${suggests}")

Modified: trunk/cmake/build_projects/template.bp.in
===================================================================
--- trunk/cmake/build_projects/template.bp.in	2013-07-31 01:54:31 UTC (rev 12445)
+++ trunk/cmake/build_projects/template.bp.in	2013-07-31 02:14:21 UTC (rev 12446)
@@ -30,20 +30,29 @@
 endif(@package@_configured)
 set(@package@_configured ON)
 
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST @ignored_dependencies_LIST@)
+
 set(@package@_dependencies_LIST @dependencies@)
+# Remove dependencies that should be ignored.
+if(@package@_dependencies_LIST)
+  list(REMOVE_ITEM @package@_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(@package@_dependencies_LIST)
 
+set(@package@_dependencies_targets)
 foreach(build_configuration ${@package@_dependencies_LIST})
-  include(${build_configuration}/bp.cmake)
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND @package@_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of @package@ has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
 endforeach(build_configuration ${@package@_dependences_LIST})
 
 # This can be safely done only after above includes.
 set(BP_PACKAGE @package@)
 
-set(${BP_PACKAGE}_dependencies_targets)
-foreach(build_configuration ${${BP_PACKAGE}_dependencies_LIST})
-  list(APPEND ${BP_PACKAGE}_dependencies_targets build_${build_configuration})
-endforeach(build_configuration ${${BP_PACKAGE}_dependences_LIST})
-
 # Data that is related to downloads.
 set(${BP_PACKAGE}_URL @download_href@)
 set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE @download_hash_type@)
@@ -68,9 +77,10 @@
   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} 
-  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
-  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} @config_arguments@
+  BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${@BUILD_COMMAND@} @make_arguments@
+  BUILD_IN_SOURCE @BUILD_IN_SOURCE@
+  INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${@BUILD_COMMAND@} @make_arguments@ install
   )
 
 list(APPEND build_target_LIST build_${BP_PACKAGE})

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

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

[<ai...@us...>]

Revision: 12445
          http://sourceforge.net/p/plplot/code/12445
Author:   airwin
Date:     2013-07-31 01:54:31 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Initial configurations (generated as discussed in REAME from the
jhbuild configuration of GTK+ version 3.9.4) of pango and most/all of
its dependencies.

Added Paths:
-----------
    trunk/cmake/build_projects/cairo/
    trunk/cmake/build_projects/cairo/bp.cmake
    trunk/cmake/build_projects/fontconfig/
    trunk/cmake/build_projects/fontconfig/bp.cmake
    trunk/cmake/build_projects/glib/
    trunk/cmake/build_projects/glib/bp.cmake
    trunk/cmake/build_projects/gobject-introspection/
    trunk/cmake/build_projects/gobject-introspection/bp.cmake
    trunk/cmake/build_projects/gtk-doc/
    trunk/cmake/build_projects/gtk-doc/bp.cmake
    trunk/cmake/build_projects/harfbuzz/
    trunk/cmake/build_projects/harfbuzz/bp.cmake
    trunk/cmake/build_projects/intltool/
    trunk/cmake/build_projects/intltool/bp.cmake
    trunk/cmake/build_projects/itstool/
    trunk/cmake/build_projects/itstool/bp.cmake
    trunk/cmake/build_projects/pango/
    trunk/cmake/build_projects/pango/bp.cmake
    trunk/cmake/build_projects/pixman/
    trunk/cmake/build_projects/pixman/bp.cmake
    trunk/cmake/build_projects/yelp-tools/
    trunk/cmake/build_projects/yelp-tools/bp.cmake
    trunk/cmake/build_projects/yelp-xsl/
    trunk/cmake/build_projects/yelp-xsl/bp.cmake

Added: trunk/cmake/build_projects/cairo/bp.cmake
===================================================================
--- trunk/cmake/build_projects/cairo/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/cairo/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# cairo/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of cairo.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(cairo_configured)
+  return()
+endif(cairo_configured)
+set(cairo_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(cairo_dependencies_LIST fontconfig;gtk-doc;pixman;pkg-config)
+# Remove dependencies that should be ignored.
+if(cairo_dependencies_LIST)
+  list(REMOVE_ITEM cairo_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(cairo_dependencies_LIST)
+
+set(cairo_dependencies_targets)
+foreach(build_configuration ${cairo_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND cairo_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of cairo has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${cairo_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE cairo)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://cairographics.org/releases/cairo-1.12.14.tar.xz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} --enable-xlib
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/fontconfig/bp.cmake
===================================================================
--- trunk/cmake/build_projects/fontconfig/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/fontconfig/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# fontconfig/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of fontconfig.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(fontconfig_configured)
+  return()
+endif(fontconfig_configured)
+set(fontconfig_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(fontconfig_dependencies_LIST gperf)
+# Remove dependencies that should be ignored.
+if(fontconfig_dependencies_LIST)
+  list(REMOVE_ITEM fontconfig_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(fontconfig_dependencies_LIST)
+
+set(fontconfig_dependencies_targets)
+foreach(build_configuration ${fontconfig_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND fontconfig_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of fontconfig has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${fontconfig_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE fontconfig)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.10.93.tar.bz2)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} --disable-docs
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/glib/bp.cmake
===================================================================
--- trunk/cmake/build_projects/glib/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/glib/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# glib/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of glib.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(glib_configured)
+  return()
+endif(glib_configured)
+set(glib_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(glib_dependencies_LIST gtk-doc;libffi)
+# Remove dependencies that should be ignored.
+if(glib_dependencies_LIST)
+  list(REMOVE_ITEM glib_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(glib_dependencies_LIST)
+
+set(glib_dependencies_targets)
+foreach(build_configuration ${glib_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND glib_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of glib has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${glib_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE glib)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://download.gnome.org/sources/glib/2.37/glib-2.37.4.tar.xz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 7e76a32e6ea0ced118aa64f87e46cdf5c3e90527f1f0eb93eabe42a03cebd1e7)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=-march=native $ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} --enable-installed-tests
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/gobject-introspection/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gobject-introspection/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/gobject-introspection/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# gobject-introspection/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of gobject-introspection.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(gobject-introspection_configured)
+  return()
+endif(gobject-introspection_configured)
+set(gobject-introspection_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(gobject-introspection_dependencies_LIST bison;cairo;flex;glib;python2-devel)
+# Remove dependencies that should be ignored.
+if(gobject-introspection_dependencies_LIST)
+  list(REMOVE_ITEM gobject-introspection_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(gobject-introspection_dependencies_LIST)
+
+set(gobject-introspection_dependencies_targets)
+foreach(build_configuration ${gobject-introspection_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND gobject-introspection_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of gobject-introspection has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${gobject-introspection_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE gobject-introspection)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://download.gnome.org/sources/gobject-introspection/1.37/gobject-introspection-1.37.4.tar.xz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 431dae811626d18f1f02ff3842f291cc21b3c5e4a47b24d52d46e25e93036591)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/gtk-doc/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gtk-doc/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/gtk-doc/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# gtk-doc/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of gtk-doc.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(gtk-doc_configured)
+  return()
+endif(gtk-doc_configured)
+set(gtk-doc_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(gtk-doc_dependencies_LIST libxslt;yelp-tools)
+# Remove dependencies that should be ignored.
+if(gtk-doc_dependencies_LIST)
+  list(REMOVE_ITEM gtk-doc_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(gtk-doc_dependencies_LIST)
+
+set(gtk-doc_dependencies_targets)
+foreach(build_configuration ${gtk-doc_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND gtk-doc_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of gtk-doc has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${gtk-doc_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE gtk-doc)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://download.gnome.org/sources/gtk-doc/1.19/gtk-doc-1.19.tar.xz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 27df247fa828433a9390368e2088cc22f954f2ce1f255ddbd12ab6e027b12e68)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/harfbuzz/bp.cmake
===================================================================
--- trunk/cmake/build_projects/harfbuzz/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/harfbuzz/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# harfbuzz/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of harfbuzz.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(harfbuzz_configured)
+  return()
+endif(harfbuzz_configured)
+set(harfbuzz_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(harfbuzz_dependencies_LIST glib;ragel)
+# Remove dependencies that should be ignored.
+if(harfbuzz_dependencies_LIST)
+  list(REMOVE_ITEM harfbuzz_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(harfbuzz_dependencies_LIST)
+
+set(harfbuzz_dependencies_targets)
+foreach(build_configuration ${harfbuzz_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND harfbuzz_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of harfbuzz has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${harfbuzz_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE harfbuzz)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.19.tar.bz2)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/intltool/bp.cmake
===================================================================
--- trunk/cmake/build_projects/intltool/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/intltool/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# intltool/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of intltool.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(intltool_configured)
+  return()
+endif(intltool_configured)
+set(intltool_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(intltool_dependencies_LIST )
+# Remove dependencies that should be ignored.
+if(intltool_dependencies_LIST)
+  list(REMOVE_ITEM intltool_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(intltool_dependencies_LIST)
+
+set(intltool_dependencies_targets)
+foreach(build_configuration ${intltool_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND intltool_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of intltool has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${intltool_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE intltool)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 23fbd879118253cb99aeac067da5f591)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/itstool/bp.cmake
===================================================================
--- trunk/cmake/build_projects/itstool/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/itstool/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# itstool/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of itstool.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(itstool_configured)
+  return()
+endif(itstool_configured)
+set(itstool_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(itstool_dependencies_LIST )
+# Remove dependencies that should be ignored.
+if(itstool_dependencies_LIST)
+  list(REMOVE_ITEM itstool_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(itstool_dependencies_LIST)
+
+set(itstool_dependencies_targets)
+foreach(build_configuration ${itstool_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND itstool_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of itstool has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${itstool_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE itstool)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/pango/bp.cmake
===================================================================
--- trunk/cmake/build_projects/pango/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/pango/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# pango/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of pango.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(pango_configured)
+  return()
+endif(pango_configured)
+set(pango_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(pango_dependencies_LIST cairo;fontconfig;glib;gobject-introspection;gtk-doc;harfbuzz;libXft)
+# Remove dependencies that should be ignored.
+if(pango_dependencies_LIST)
+  list(REMOVE_ITEM pango_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(pango_dependencies_LIST)
+
+set(pango_dependencies_targets)
+foreach(build_configuration ${pango_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND pango_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of pango has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${pango_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE pango)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://download.gnome.org/sources/pango/1.35/pango-1.35.0.tar.xz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH c21f7277b5c088f334748b38f2c3abd6399024d653ab7663f567234acbdc7f92)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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-cairo --enable-installed-tests
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/pixman/bp.cmake
===================================================================
--- trunk/cmake/build_projects/pixman/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/pixman/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# pixman/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of pixman.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(pixman_configured)
+  return()
+endif(pixman_configured)
+set(pixman_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(pixman_dependencies_LIST pkg-config)
+# Remove dependencies that should be ignored.
+if(pixman_dependencies_LIST)
+  list(REMOVE_ITEM pixman_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(pixman_dependencies_LIST)
+
+set(pixman_dependencies_targets)
+foreach(build_configuration ${pixman_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND pixman_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of pixman has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${pixman_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE pixman)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://cairographics.org/releases/pixman-0.30.0.tar.gz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 1d812f9f60215099355f5c13c6f06d7db1135c99f34ff03535b71b64435125fd)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} --disable-gtk
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/yelp-tools/bp.cmake
===================================================================
--- trunk/cmake/build_projects/yelp-tools/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/yelp-tools/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# yelp-tools/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of yelp-tools.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(yelp-tools_configured)
+  return()
+endif(yelp-tools_configured)
+set(yelp-tools_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(yelp-tools_dependencies_LIST intltool;itstool;libxml2;libxslt;yelp-xsl)
+# Remove dependencies that should be ignored.
+if(yelp-tools_dependencies_LIST)
+  list(REMOVE_ITEM yelp-tools_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(yelp-tools_dependencies_LIST)
+
+set(yelp-tools_dependencies_targets)
+foreach(build_configuration ${yelp-tools_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND yelp-tools_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of yelp-tools has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${yelp-tools_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE yelp-tools)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://download.gnome.org/sources/yelp-tools/3.6/yelp-tools-3.6.1.tar.xz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 5226e8245bb87f10e485aa65f5bf18d9e4fb5ef82f2e3c3734dd91bdf6f5c19a)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

Added: trunk/cmake/build_projects/yelp-xsl/bp.cmake
===================================================================
--- trunk/cmake/build_projects/yelp-xsl/bp.cmake	                        (rev 0)
+++ trunk/cmake/build_projects/yelp-xsl/bp.cmake	2013-07-31 01:54:31 UTC (rev 12445)
@@ -0,0 +1,89 @@
+# yelp-xsl/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of yelp-xsl.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+# Protect against configuring a build twice in one CMake call
+if(yelp-xsl_configured)
+  return()
+endif(yelp-xsl_configured)
+set(yelp-xsl_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel)
+
+set(yelp-xsl_dependencies_LIST intltool;itstool;libxml2;libxslt)
+# Remove dependencies that should be ignored.
+if(yelp-xsl_dependencies_LIST)
+  list(REMOVE_ITEM yelp-xsl_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(yelp-xsl_dependencies_LIST)
+
+set(yelp-xsl_dependencies_targets)
+foreach(build_configuration ${yelp-xsl_dependencies_LIST})
+  if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    include(${build_configuration}/bp.cmake)
+    list(APPEND yelp-xsl_dependencies_targets build_${build_configuration})
+  else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+    message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of yelp-xsl has been installed another way.")
+  endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${yelp-xsl_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE yelp-xsl)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://download.gnome.org/sources/yelp-xsl/3.8/yelp-xsl-3.8.1.tar.xz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH afc519be07ffcbdcc20d1acfd1d901cfd03c7b4cf0667036534f2726bb68b40d)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+  #set(BP_PATH_NODLL "${BP_PATH}")
+  #set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+  determine_msys_path(BP_PATH "${BP_PATH}")
+  # Must have all elements of env command in MSYS platform form
+  determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+  set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+  build_${BP_PACKAGE}
+  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} 
+  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
+  )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")

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

[Plplot-cvs] SF.net SVN: plplot:[12444] trunk/cmake/build_projects/gtk_packages_add.xml

[<ai...@us...>]

Revision: 12444
          http://sourceforge.net/p/plplot/code/12444
Author:   airwin
Date:     2013-07-31 01:49:15 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Initial commit of a file containing build-configuration data in xml
form that can be processed by gtk_transform.py.  Here we add build
configuration data for libffi, intltool, and pixman.

Added Paths:
-----------
    trunk/cmake/build_projects/gtk_packages_add.xml

Added: trunk/cmake/build_projects/gtk_packages_add.xml
===================================================================
--- trunk/cmake/build_projects/gtk_packages_add.xml	                        (rev 0)
+++ trunk/cmake/build_projects/gtk_packages_add.xml	2013-07-31 01:49:15 UTC (rev 12444)
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<moduleset>
+  <autotools id="libffi">
+    <branch hash="sha256:1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c" module="libffi/libffi-3.0.13.tar.gz" repo="ftp://sourceware.org/pub/" size="845747" version="3.0.13"/>
+  </autotools>
+  <autotools id="intltool">
+    <branch hash="md5:23fbd879118253cb99aeac067da5f591" module="intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz" repo="http://launchpad.net/" version="0.50.2"/>
+  </autotools>
+  <autotools autogenargs="--disable-gtk" id="pixman">
+    <pkg-config/>
+    <branch hash="sha256:1d812f9f60215099355f5c13c6f06d7db1135c99f34ff03535b71b64435125fd" module="releases/pixman-0.30.0.tar.gz" repo="http://cairographics.org/" size="542724" version="0.20.2"/>
+  </autotools>
+</moduleset>

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

[Plplot-cvs] SF.net SVN: plplot:[12443] trunk/cmake/build_projects/gtk_transform.py

[<ai...@us...>]

Revision: 12443
          http://sourceforge.net/p/plplot/code/12443
Author:   airwin
Date:     2013-07-31 01:45:12 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Do more complete processing of data in the generated
gtk_packages<version>.xml file, and all special processing of
particular dependencies is now dropped, i.e., gtk-doc is now allowed
to be a valid dependency.

(For more on gtk_packages<version>.xml see README.) The additional
processing includes collecting make arguments data, deciding on
whether non-srcdir-builds are allowed, deciding on whether parallel
builds are allowed, and replacing "${version}" if it occurs in the URL
by the value of the version attribute.  

Modified Paths:
--------------
    trunk/cmake/build_projects/gtk_transform.py

Modified: trunk/cmake/build_projects/gtk_transform.py
===================================================================
--- trunk/cmake/build_projects/gtk_transform.py	2013-07-31 01:31:26 UTC (rev 12442)
+++ trunk/cmake/build_projects/gtk_transform.py	2013-07-31 01:45:12 UTC (rev 12443)
@@ -48,14 +48,42 @@
     config_type = package.tag
     if config_type == "autotools":
         config_arguments = package.get("autogenargs")
+
+        make_arguments = package.get("makeargs")
+        if make_arguments == None:
+            make_arguments = ""
+
+        supports_non_srcdir_builds = package.get("supports-non-srcdir-builds")
+        if supports_non_srcdir_builds == "no":
+           supports_non_srcdir_builds = "OFF"
+        else:
+           supports_non_srcdir_builds = "ON" 
+
+        supports_parallel_builds = package.get("supports-parallel-builds")
+        if supports_parallel_builds == "no":
+           supports_parallel_builds = "OFF"
+        else:
+           supports_parallel_builds = "ON" 
     elif config_type == "cmake":
         config_arguments = package.get("cmakeargs")
+        make_arguments = ""
+        # Assume both non-source builds and parallel builds work for
+        # CMake-based build systems.
+        supports_non_srcdir_builds = "ON" 
+        supports_parallel_builds = "ON" 
     elif config_type == "tarball":
         config_arguments = ""
+        make_arguments = ""
+        # Assume both non-source builds and parallel builds work for
+        # the tarball config type.  This may require review.
+        supports_non_srcdir_builds = "ON" 
+        supports_parallel_builds = "ON" 
     else:
         return None
+
     if config_arguments == None:
         config_arguments = ""
+
     # Parse branch or source element of package
     if config_type == "tarball":
         branch = package.findall("source[@hash]")
@@ -98,9 +126,17 @@
         # Make sure there is a trailing "/" on the repo
         index = download_repo.rfind("/")
         if len(download_repo)-1 != index:
-            download_repo = download_rep + "/"
+            download_repo = download_repo + "/"
         download_href = download_repo + download_module
     
+    # Replace ${version} string that is sometimes in download_href
+    index = download_href.find("${version}")
+    if index >=0:
+        version = branch.get("version")
+        if version == None:
+            return None
+        download_href = download_href.replace("${version}", version)
+    
     # Parse various kinds of jhbuild dependencies.
     # Note from 
     # http://stackoverflow.com/questions/9974957/what-is-the-after-element-used-for-in-jhbuild
@@ -141,14 +177,6 @@
         for dep_element in package.findall("after/dep"):
             after[dep_element.get("package")] = None
     
-    # As a temporary? measure drop all references to gtk-doc
-    if dependencies.has_key("gtk-doc"):
-        del dependencies["gtk-doc"]
-    if suggests.has_key("gtk-doc"):
-        del suggests["gtk-doc"]
-    if after.has_key("gtk-doc"):
-        del after["gtk-doc"]
-
     if if_dependencies:
         overall_dependencies = {}
         overall_dependencies.update(dependencies)
@@ -178,7 +206,10 @@
     else:
         sys.stdout.write(id + "\n")
         sys.stdout.write(config_type + "\n")
+        sys.stdout.write(supports_non_srcdir_builds + "\n")
+        sys.stdout.write(supports_parallel_builds + "\n")
         sys.stdout.write(config_arguments + "\n")
+        sys.stdout.write(make_arguments + "\n")
         sys.stdout.write(download_hash_type + "\n")
         sys.stdout.write(download_hash + "\n")
         sys.stdout.write(download_href + "\n")

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

[Plplot-cvs] SF.net SVN: plplot:[12442] trunk/cmake/build_projects/patch_gtk_packages. xml

[<ai...@us...>]

Revision: 12442
          http://sourceforge.net/p/plplot/code/12442
Author:   airwin
Date:     2013-07-31 01:31:26 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Initial commit of file that keeps track of changes to
gtk_packages<version>.xml which is not under version control
because it is a generated file (for those wanting to update
the build configurations related to GTK+, see README).

In this case we replace harfbuzz 0.9.18 by harfbuzz 0.9.19 because the
former has a showstopping build error.

Added Paths:
-----------
    trunk/cmake/build_projects/patch_gtk_packages.xml

Added: trunk/cmake/build_projects/patch_gtk_packages.xml
===================================================================
--- trunk/cmake/build_projects/patch_gtk_packages.xml	                        (rev 0)
+++ trunk/cmake/build_projects/patch_gtk_packages.xml	2013-07-31 01:31:26 UTC (rev 12442)
@@ -0,0 +1,11 @@
+--- gtk_packages_3.9.4.xml_original	2013-07-30 14:52:57.038048491 -0700
++++ gtk_packages_3.9.4.xml	2013-07-30 15:06:23.922792828 -0700
+@@ -925,7 +925,7 @@
+     </suggests>
+   </autotools>
+   <autotools autogenargs="" id="harfbuzz">
+-    <branch hash="sha256:fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908" module="harfbuzz-0.9.18.tar.bz2" repo="http://www.freedesktop.org/software/harfbuzz/release/" size="902395" version="0.9.18"/>
++    <branch hash="sha256:d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35" module="harfbuzz-0.9.19.tar.bz2" repo="http://www.freedesktop.org/software/harfbuzz/release/" size="902395" version="0.9.19"/>
+     <branch checkoutdir="harfbuzz" module="harfbuzz" repo="git.freedesktop.org"/>
+     <dependencies>
+       <dep package="glib"/>

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

[Plplot-cvs] SF.net SVN: plplot:[12441] trunk/cmake/build_projects/libffi/bp.cmake

[<ai...@us...>]

Revision: 12441
          http://sourceforge.net/p/plplot/code/12441
Author:   airwin
Date:     2013-07-29 17:44:42 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Add template results for dependencies and extra CFLAGS.  libffi has
none of those so the extra CMake code that is configured
should have no effect for libffi.

Tested by: Alan W. Irwin <ai...@us...> using the
build_libffi target (or build_glib target that depends on the
build_libffi target) for both Linux and "MSYS Makefiles" on Wine. In
the latter case there was a popup error box with the last command
executed being the install script. But when I ran that command by hand
afterwards everything worked fine.  I suspect this intermittent error
is due to a race condition for parallel builds so I will try turning
off parallel builds for libffi for future tests.

Modified Paths:
--------------
    trunk/cmake/build_projects/libffi/bp.cmake

Modified: trunk/cmake/build_projects/libffi/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libffi/bp.cmake	2013-07-29 17:37:32 UTC (rev 12440)
+++ trunk/cmake/build_projects/libffi/bp.cmake	2013-07-29 17:44:42 UTC (rev 12441)
@@ -24,14 +24,26 @@
 # used below that configure how the External_Project functions
 # operate.
 
-set(BP_PACKAGE libffi)
-
 # Protect against configuring a build twice in one CMake call
-if(${BP_PACKAGE}_configured)
+if(libffi_configured)
   return()
-endif(${BP_PACKAGE}_configured)
-set(${BP_PACKAGE}_configured ON)
+endif(libffi_configured)
+set(libffi_configured ON)
 
+set(libffi_dependencies_LIST )
+
+foreach(build_configuration ${libffi_dependencies_LIST})
+  include(${build_configuration}/bp.cmake)
+endforeach(build_configuration ${libffi_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE libffi)
+
+set(${BP_PACKAGE}_dependencies_targets)
+foreach(build_configuration ${${BP_PACKAGE}_dependencies_LIST})
+  list(APPEND ${BP_PACKAGE}_dependencies_targets build_${build_configuration})
+endforeach(build_configuration ${${BP_PACKAGE}_dependences_LIST})
+
 # Data that is related to downloads.
 set(${BP_PACKAGE}_URL ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz)
 set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
@@ -44,16 +56,19 @@
   determine_msys_path(BP_PATH "${BP_PATH}")
   # Must have all elements of env command in MSYS platform form
   determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
 else(MSYS_PLATFORM)
   set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
 endif(MSYS_PLATFORM)
 #message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
 
 ExternalProject_Add(
   build_${BP_PACKAGE}
+  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} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
   )

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

[Plplot-cvs] SF.net SVN: plplot:[12440] trunk/cmake/build_projects/template.bp.in

[<ai...@us...>]

Revision: 12440
          http://sourceforge.net/p/plplot/code/12440
Author:   airwin
Date:     2013-07-29 17:37:32 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Add template for handling extra CFLAGS.

Modified Paths:
--------------
    trunk/cmake/build_projects/template.bp.in

Modified: trunk/cmake/build_projects/template.bp.in
===================================================================
--- trunk/cmake/build_projects/template.bp.in	2013-07-28 04:22:21 UTC (rev 12439)
+++ trunk/cmake/build_projects/template.bp.in	2013-07-29 17:37:32 UTC (rev 12440)
@@ -56,8 +56,10 @@
   determine_msys_path(BP_PATH "${BP_PATH}")
   # Must have all elements of env command in MSYS platform form
   determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=@MSYS_EXTRA_CFLAGS@$ENV{CFLAGS}")
 else(MSYS_PLATFORM)
   set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+  set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=@UNIX_EXTRA_CFLAGS@$ENV{CFLAGS}")
 endif(MSYS_PLATFORM)
 #message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
 
@@ -66,7 +68,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} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
   )

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