plplot-cvs

[Plplot-cvs] SF.net SVN: plplot:[12791] trunk/cmake/epa_build/configured_pango.patch

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

Revision: 12791
          http://sourceforge.net/p/plplot/code/12791
Author:   airwin
Date:     2013-12-01 08:26:52 +0000 (Sun, 01 Dec 2013)
Log Message:
-----------
Update the reversed patch that includes all hand-edited fixes
to automatically configured builds after 

cmake -DFILENAME:FILEPATH=pango_packages.data -P configure_bp.cmake

was run.

Tested by: Alan W. Irwin <ai...@us...> on Linux using
the build_plplot target for the epa_build project.  This test was a
comprehensive check of all recent epa_build changes. 

Modified Paths:
--------------
    trunk/cmake/epa_build/configured_pango.patch

Modified: trunk/cmake/epa_build/configured_pango.patch
===================================================================
--- trunk/cmake/epa_build/configured_pango.patch	2013-12-01 08:18:33 UTC (rev 12790)
+++ trunk/cmake/epa_build/configured_pango.patch	2013-12-01 08:26:52 UTC (rev 12791)
@@ -1,6 +1,6 @@
 Index: itstool/bp.cmake
 ===================================================================
---- itstool/bp.cmake	(revision 12780)
+--- itstool/bp.cmake	(revision 12790)
 +++ itstool/bp.cmake	(working copy)
 @@ -64,7 +64,6 @@
  set(${BP_PACKAGE}_URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2)
@@ -10,11 +10,11 @@
  
  # Data that is related to the PATH that must be used.
  if(MSYS_PLATFORM)
-@@ -85,7 +84,6 @@
+@@ -93,7 +92,6 @@
    DEPENDS ${${BP_PACKAGE}_dependencies_targets}
    URL ${${BP_PACKAGE}_URL}
    URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
 -  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${${BP_PACKAGE}_PATCH}
-   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} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
    BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} 
    BUILD_IN_SOURCE OFF

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

[Plplot-cvs] SF.net SVN: plplot:[12796] trunk/cmake/epa_build/configured_pango.patch

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

Revision: 12796
          http://sourceforge.net/p/plplot/code/12796
Author:   airwin
Date:     2013-12-02 00:33:22 +0000 (Mon, 02 Dec 2013)
Log Message:
-----------
Change the name of the file being patched from bp.cmake to
CMakeLists.txt

Modified Paths:
--------------
    trunk/cmake/epa_build/configured_pango.patch

Modified: trunk/cmake/epa_build/configured_pango.patch
===================================================================
--- trunk/cmake/epa_build/configured_pango.patch	2013-12-02 00:27:33 UTC (rev 12795)
+++ trunk/cmake/epa_build/configured_pango.patch	2013-12-02 00:33:22 UTC (rev 12796)
@@ -1,7 +1,7 @@
-Index: itstool/bp.cmake
+Index: itstool/CMakeLists.txt
 ===================================================================
---- itstool/bp.cmake	(revision 12790)
-+++ itstool/bp.cmake	(working copy)
+--- itstool/CMakeLists.txt	(revision 12790)
++++ itstool/CMakeLists.txt	(working copy)
 @@ -64,7 +64,6 @@
  set(${BP_PACKAGE}_URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2)
  set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)

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

[Plplot-cvs] SF.net SVN: plplot:[12803] trunk/cmake/epa_build/configured_pango.patch

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

Revision: 12803
          http://sourceforge.net/p/plplot/code/12803
Author:   airwin
Date:     2013-12-02 07:43:42 +0000 (Mon, 02 Dec 2013)
Log Message:
-----------
Update patch to be consistent with other recent changes.

Modified Paths:
--------------
    trunk/cmake/epa_build/configured_pango.patch

Modified: trunk/cmake/epa_build/configured_pango.patch
===================================================================
--- trunk/cmake/epa_build/configured_pango.patch	2013-12-02 07:39:09 UTC (rev 12802)
+++ trunk/cmake/epa_build/configured_pango.patch	2013-12-02 07:43:42 UTC (rev 12803)
@@ -18,3 +18,41 @@
    CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
    BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} 
    BUILD_IN_SOURCE OFF
+Index: configured_pango.patch
+===================================================================
+--- configured_pango.patch	(revision 12800)
++++ configured_pango.patch	(working copy)
+@@ -1,20 +1,20 @@
+ Index: itstool/CMakeLists.txt
+ ===================================================================
+---- itstool/CMakeLists.txt	(revision 12790)
++--- itstool/CMakeLists.txt	(revision 12802)
+ +++ itstool/CMakeLists.txt	(working copy)
+-@@ -64,7 +64,6 @@
+- 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)
+--set(${BP_PACKAGE}_PATCH itstool-1.2.0-python-location-fixes.patch)
++@@ -71,7 +71,6 @@
++ set(URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2)
++ set(DOWNLOAD_HASH_TYPE SHA256)
++ set(DOWNLOAD_HASH 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa)
++-set(PATCH itstool-1.2.0-python-location-fixes.patch)
+  
+  # Data that is related to the PATH that must be used.
+  if(MSYS_PLATFORM)
+-@@ -93,7 +92,6 @@
+-   DEPENDS ${${BP_PACKAGE}_dependencies_targets}
+-   URL ${${BP_PACKAGE}_URL}
+-   URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
+--  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${${BP_PACKAGE}_PATCH}
+-   CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
+-   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} 
++@@ -98,7 +97,6 @@
++   DEPENDS ${dependencies_targets}
++   URL ${URL}
++   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
++-  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${PATCH}
++   CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${SET_CFLAGS} ${SET_CXXFLAGS} ${source_PATH}/${EPA_CONFIGURE_COMMAND} 
++   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BP_PARALLEL_MAKE_COMMAND} 
+    BUILD_IN_SOURCE OFF

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

[Plplot-cvs] SF.net SVN: plplot:[12816] trunk/cmake/epa_build/configured_pango.patch

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

Revision: 12816
          http://sourceforge.net/p/plplot/code/12816
Author:   airwin
Date:     2013-12-05 22:56:28 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
Update this reversed patch to the latest automatically configured version of
itstools/CMakeLists.txt.

Modified Paths:
--------------
    trunk/cmake/epa_build/configured_pango.patch

Modified: trunk/cmake/epa_build/configured_pango.patch
===================================================================
--- trunk/cmake/epa_build/configured_pango.patch	2013-12-05 22:52:36 UTC (rev 12815)
+++ trunk/cmake/epa_build/configured_pango.patch	2013-12-05 22:56:28 UTC (rev 12816)
@@ -1,58 +1,19 @@
 Index: itstool/CMakeLists.txt
 ===================================================================
---- itstool/CMakeLists.txt	(revision 12790)
+--- itstool/CMakeLists.txt	(revision 12812)
 +++ itstool/CMakeLists.txt	(working copy)
-@@ -64,7 +64,6 @@
- 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)
--set(${BP_PACKAGE}_PATCH itstool-1.2.0-python-location-fixes.patch)
+@@ -62,14 +62,12 @@
+ set(URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2)
+ set(DOWNLOAD_HASH_TYPE SHA256)
+ set(DOWNLOAD_HASH 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa)
+-set(PATCH itstool-1.2.0-python-location-fixes.patch)
  
- # Data that is related to the PATH that must be used.
- if(MSYS_PLATFORM)
-@@ -93,7 +92,6 @@
-   DEPENDS ${${BP_PACKAGE}_dependencies_targets}
-   URL ${${BP_PACKAGE}_URL}
-   URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
--  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${${BP_PACKAGE}_PATCH}
-   CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
-   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} 
+ ExternalProject_Add(
+   build_${PACKAGE}
+   DEPENDS ${dependencies_targets}
+   URL ${URL}
+   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
+-  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${PATCH}
+   CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} 
+   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} 
    BUILD_IN_SOURCE OFF
-Index: configured_pango.patch
-===================================================================
---- configured_pango.patch	(revision 12800)
-+++ configured_pango.patch	(working copy)
-@@ -1,20 +1,20 @@
- Index: itstool/CMakeLists.txt
- ===================================================================
----- itstool/CMakeLists.txt	(revision 12790)
-+--- itstool/CMakeLists.txt	(revision 12802)
- +++ itstool/CMakeLists.txt	(working copy)
--@@ -64,7 +64,6 @@
-- 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)
---set(${BP_PACKAGE}_PATCH itstool-1.2.0-python-location-fixes.patch)
-+@@ -71,7 +71,6 @@
-+ set(URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2)
-+ set(DOWNLOAD_HASH_TYPE SHA256)
-+ set(DOWNLOAD_HASH 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa)
-+-set(PATCH itstool-1.2.0-python-location-fixes.patch)
-  
-  # Data that is related to the PATH that must be used.
-  if(MSYS_PLATFORM)
--@@ -93,7 +92,6 @@
--   DEPENDS ${${BP_PACKAGE}_dependencies_targets}
--   URL ${${BP_PACKAGE}_URL}
--   URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
---  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${${BP_PACKAGE}_PATCH}
--   CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} 
--   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} 
-+@@ -98,7 +97,6 @@
-+   DEPENDS ${dependencies_targets}
-+   URL ${URL}
-+   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-+-  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${PATCH}
-+   CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${SET_CFLAGS} ${SET_CXXFLAGS} ${source_PATH}/${EPA_CONFIGURE_COMMAND} 
-+   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BP_PARALLEL_MAKE_COMMAND} 
-    BUILD_IN_SOURCE OFF

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