[Python-modules-commits] r15991 - in packages/pyside-tools/trunk/debian/patches (2 files)

[odyx at users.alioth.debian.org]

    Date: Friday, March 4, 2011 @ 19:14:46
  Author: odyx
Revision: 15991

Add u_4125d2d_Fix_pysideuictest.patch to fix tests.

Added:
  packages/pyside-tools/trunk/debian/patches/u_4125d2d_Fix_pysideuictest.patch
Modified:
  packages/pyside-tools/trunk/debian/patches/series

Modified: packages/pyside-tools/trunk/debian/patches/series
===================================================================
--- packages/pyside-tools/trunk/debian/patches/series	2011-03-04 18:57:33 UTC (rev 15990)
+++ packages/pyside-tools/trunk/debian/patches/series	2011-03-04 19:14:46 UTC (rev 15991)
@@ -1 +1,2 @@
+u_4125d2d_Fix_pysideuictest.patch
 fix_tests.patch

Added: packages/pyside-tools/trunk/debian/patches/u_4125d2d_Fix_pysideuictest.patch
===================================================================
--- packages/pyside-tools/trunk/debian/patches/u_4125d2d_Fix_pysideuictest.patch	                        (rev 0)
+++ packages/pyside-tools/trunk/debian/patches/u_4125d2d_Fix_pysideuictest.patch	2011-03-04 19:14:46 UTC (rev 15991)
@@ -0,0 +1,67 @@
+From 4125d2d29fb91f6bb7d352183fff2375753375da Mon Sep 17 00:00:00 2001
+From: Lauro Neto <lauro.neto at openbossa.org>
+Date: Fri, 4 Mar 2011 08:43:26 -0300
+Subject: [PATCH] Copy pysideuic to cmake binary dir to allow test
+
+pysideuic was being generated in <source>/build while the
+tests still pointed to the <source>/pysideuic.
+
+This commits copies the pysideuic folder to <source>/build.
+While not an ideal solution (would require running cmake
+again to update the copy in <source>) it will make the test
+work again.
+
+Also makes pysideuic test preserve the path.
+---
+ CMakeLists.txt       |   16 +++++++++-------
+ tests/CMakeLists.txt |    2 +-
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index beb4c26..8d70269 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,13 @@ set(pyside_tools_MINOR_VERSION "2")
+ set(pyside_tools_MICRO_VERSION "7")
+ set(pyside_tools_VERSION "${pyside_tools_MAJOR_VERSION}.${pyside_tools_MINOR_VERSION}.${pyside_tools_MICRO_VERSION}")
+ 
+-configure_file("pysideuic/__init__.py.in" "__init__.py" @ONLY)
++
++# PySide UIC
++configure_file("pysideuic/__init__.py.in" "pysideuic/__init__.py" @ONLY)
++file(COPY "pysideuic"
++     DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
++     PATTERN "*.in" EXCLUDE
++     ) # Needed for testing inplace
+ 
+ option(BUILD_TESTS "Build tests." TRUE)
+ 
+@@ -34,13 +40,9 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside-uic
+         GROUP_EXECUTE GROUP_READ
+         WORLD_EXECUTE WORLD_READ)
+ 
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
+-        DESTINATION "${SITE_PACKAGE}/pysideuic")
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pysideuic
++install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pysideuic
+         DESTINATION ${SITE_PACKAGE}
+-        PATTERN "*.in" EXCLUDE
+-        PATTERN "*pysideuic/__init__.py" EXCLUDE
+-        PATTERN "*pysideuic\\__init__.py" EXCLUDE)
++        PATTERN "*.in" EXCLUDE)
+ 
+ # Man pages for pyside-uic
+ if (NOT win32)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 16342a2..1b9912b 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -3,4 +3,4 @@ add_subdirectory(rcc)
+ 
+ add_test("test_qwizard" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/pyside-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties("test_qwizard" PROPERTIES
+-                     ENVIRONMENT "PYTHONPATH=${CMAKE_SOURCE_DIR}")
++                     ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}:$ENV{PYTHONPATH}")
+-- 
+1.6.1
+