[Python-modules-commits] r15664 - in packages/shiboken/trunk/debian (4 files)

Mon Feb 14 15:23:54 UTC 2011

Date: Monday, February 14, 2011 @ 15:23:44
  Author: odyx-guest
Revision: 15664

Update the patch to allow better Python version specification.

Added:
  packages/shiboken/trunk/debian/patches/allowMultipleShibokenVersions.patch
Modified:
  packages/shiboken/trunk/debian/patches/series
  packages/shiboken/trunk/debian/rules
Deleted:
  packages/shiboken/trunk/debian/patches/allowCustomShibokenPostfix.patch

Deleted: packages/shiboken/trunk/debian/patches/allowCustomShibokenPostfix.patch
===================================================================

--- packages/shiboken/trunk/debian/patches/allowCustomShibokenPostfix.patch	2011-02-14 15:23:23 UTC (rev 15663)
+++ packages/shiboken/trunk/debian/patches/allowCustomShibokenPostfix.patch	2011-02-14 15:23:44 UTC (rev 15664)
@@ -1,29 +0,0 @@
-Description: Allow to specify the postfix when looking for shiboken.
-Author: Didier Raboud <didier at raboud.com>
-Origin: vendor
-Forwarded: not needed (distribution specific)
-Last-Update: 2010-10-14
---- a/data/ShibokenConfig.cmake.in
-+++ b/data/ShibokenConfig.cmake.in
-@@ -4,13 +4,18 @@
- #  SHIBOKEN_PYTHON_INTERPRETER - Python interpreter (regular or debug) to be used with the bindings.
- #  SHIBOKEN_PYTHON_LIBRARIES   - Python libraries (regular or debug) Shiboken is linked against.
- 
-+#  Parameters:
-+#  SHIBOKEN_POSTFIX       - Specific postfix
-+#                           (e.g. -py26   for the python 2.6 specific version;
-+#                                 -py26_d for the python 2.6 with -DPy_DEBUG specific version )
-+
- SET(SHIBOKEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/shiboken at shiboken_SUFFIX@")
- if(MSVC)
--   SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX at .lib")
-+   SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@${SHIBOKEN_POSTFIX}.lib")
- elseif(WIN32)
--    SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
-+    SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@${SHIBOKEN_POSTFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@")
- else()
--    SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
-+    SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@${SHIBOKEN_POSTFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@")
- endif()
- SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@")
- SET(SHIBOKEN_PYTHON_INTERPRETER "@PYTHON_EXECUTABLE@")

Added: packages/shiboken/trunk/debian/patches/allowMultipleShibokenVersions.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/allowMultipleShibokenVersions.patch	                        (rev 0)
+++ packages/shiboken/trunk/debian/patches/allowMultipleShibokenVersions.patch	2011-02-14 15:23:44 UTC (rev 15664)
@@ -0,0 +1,44 @@
+Description: Allow to specify the postfix when looking for shiboken.
+Author: Didier Raboud <didier at raboud.com>
+Origin: vendor
+Forwarded: not needed (distribution specific)
+Last-Update: 2010-11-30
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -4,8 +4,10 @@
+     set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_RELEASE_POSTFIX})
+ endif()
+ 
+-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig.cmake.in"
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig-indep.cmake.in"
+                "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake" @ONLY)
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig.cmake.in"
++               "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig at LIBRARY_OUTPUT_SUFFIX@.cmake" @ONLY)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfigVersion.cmake.in"
+                "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfigVersion.cmake" @ONLY)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken.pc.in"
+@@ -13,6 +15,8 @@
+ 
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake"
+         DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${shiboken_VERSION}")
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig at LIBRARY_OUTPUT_SUFFIX@.cmake"
++        DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${shiboken_VERSION}")
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfigVersion.cmake"
+         DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${shiboken_VERSION}")
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken${shiboken_SUFFIX}.pc"
+--- /dev/null
++++ b/data/ShibokenConfig-indep.cmake.in
+@@ -0,0 +1,13 @@
++#  SHIBOKEN_INCLUDE_DIR        - Directories to include to use SHIBOKEN
++#  SHIBOKEN_LIBRARIES          - Files to link against to use SHIBOKEN
++#  SHIBOKEN_BUILD_TYPE         - Tells if Shiboken was compiled in Release or Debug mode.
++#  SHIBOKEN_PYTHON_INTERPRETER - Python interpreter (regular or debug) to be used with the bindings.
++#  SHIBOKEN_PYTHON_LIBRARIES   - Python libraries (regular or debug) Shiboken is linked against.
++
++#  Parameters:
++#  SHIBOKEN_POSTFIX       - Specific postfix
++#                           (e.g. -py26   for the python 2.6 specific version;
++#                                 -py26_d for the python 2.6 with -DPy_DEBUG specific version )
++
++option(SHIBOKEN_POSTFIX "Python specific shiboken postfix (e.g. @DEFAULT_SHIBOKEN_POSTFIX@ for the default python version)" @DEFAULT_SHIBOKEN_POSTFIX@)
++INCLUDE(@LIB_INSTALL_DIR@/cmake/Shiboken- at shiboken_VERSION@/ShibokenConfig${SHIBOKEN_POSTFIX}.cmake)

Modified: packages/shiboken/trunk/debian/patches/series
===================================================================
--- packages/shiboken/trunk/debian/patches/series	2011-02-14 15:23:23 UTC (rev 15663)
+++ packages/shiboken/trunk/debian/patches/series	2011-02-14 15:23:44 UTC (rev 15664)
@@ -1 +1 @@
-allowCustomShibokenPostfix.patch
+allowMultipleShibokenVersions.patch

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2011-02-14 15:23:23 UTC (rev 15663)
+++ packages/shiboken/trunk/debian/rules	2011-02-14 15:23:44 UTC (rev 15664)
@@ -25,6 +25,7 @@
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_USE_PYTHON_VERSION=$* \
+	-DDEFAULT_SHIBOKEN_POSTFIX=$(shell echo -py${DEFAULT_PY} | sed -e 's/\.//g' -) \
 	-DCMAKE_RELEASE_POSTFIX=$(shell echo -py$* | sed -e 's/\.//g' -)
 
 #### BUILD ####


