[QGIS Commit] r11548 - in trunk/qgis: mac/xcode mac/xcode/Qgis.xcodeproj python

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2009-09-04 20:03:48 -0400 (Fri, 04 Sep 2009)
New Revision: 11548

Modified:
   trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj
   trunk/qgis/mac/xcode/qgis_settings.xcconfig
   trunk/qgis/mac/xcode/qgis_user-template.xcconfig
   trunk/qgis/python/configure.py.in
Log:
handle more than 2 archs for OSX universal build

Modified: trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj
===================================================================
--- trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj	2009-09-04 23:58:42 UTC (rev 11547)
+++ trunk/qgis/mac/xcode/Qgis.xcodeproj/project.pbxproj	2009-09-05 00:03:48 UTC (rev 11548)
@@ -13137,7 +13137,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# generate and run configure.py\n\nif [ ! -f \"$TARGET_TEMP_DIR/python/python/configure.py\" ] || [ ../../python/configure.py.in -nt \"$TARGET_TEMP_DIR/python/python/configure.py\" ] ; then\n\nif [ \"$ARCHS\" = \"ppc i386\" ] || [ \"$ARCHS\" = \"i386 ppc\" ] ; then\n\tARCHS_P=\"ppc;i386\"\nelse\n\tARCHS_P=\"$ARCHS\"\nfi\n\nif [ \"$GDAL_FORM\" = \"fw\" ] ; then\n\tGDALPATH=\"$GDAL_PREFIX/unix/lib\"\nelse\n\tGDALPATH=\"$GDAL_PREFIX/lib\"\nfi\n\nif [ \"$GEOS_FORM\" = \"fw\" ] ; then\n\tGEOSPATH=\"$GEOS_PREFIX/unix/lib\"\nelse\n\tGEOSPATH=\"$GEOS_PREFIX/lib\"\nfi\n\nsed -e \"s, at CMAKE_SOURCE_DIR@,$PROJECT_DIR/../..,\" \\\n\t-e \"s, at CMAKE_BINARY_DIR@,$TARGET_TEMP_DIR/python,\" \\\n\t-e \"s, at GDAL_INCLUDE_DIR@,$GDAL_INC,\" \\\n\t-e \"s, at GEOS_INCLUDE_DIR@,$GEOS_INC,\" \\\n\t-e \"s, at GEOS_LIB_NAME@,geos,\" \\\n\t-e \"s, at GEOS_LIB_PATH@,$GEOSPATH,\" \\\n\t-e \"s, at GDAL_LIB_NAME@,gdal,\" \\\n\t-e \"s, at GDAL_LIB_PATH@,$GDALPATH,\" \\\n\t-e \"s, at CMAKE_OSX_ARCHITECTURES@,$ARCHS_P,\" \\\n\t-e \"s, at CMAKE_OSX_SYSROOT@,$SDKROOT,\" \\\n\t-e \"s, at CMAKE_MODULE_LINKER_FLAGS@,,\" \\\n\t../../python/configure.py.in > \"$TARGET_TEMP_DIR/python/python/configure.py\"\n\nfi\n\ncd \"$TARGET_TEMP_DIR/python/python\"\nif [ ! -f core/Makefile ] || [ ! -f gui/Makefile ] || [ configure.py -nt core/Makefile ] || [ configure.py -nt gui/Makefile ] ; then\n\t$PYTHON configure.py .\nfi\n\nif [ -f core/Makefile ] && [ -f gui/Makefile ] ; then\n\texit 0\nelse\n\texit 1\nfi\n";
+			shellScript = "# generate and run configure.py\n\nif [ ! -f \"$TARGET_TEMP_DIR/python/python/configure.py\" ] || [ ../../python/configure.py.in -nt \"$TARGET_TEMP_DIR/python/python/configure.py\" ] ; then\n\nif [ \"$GDAL_FORM\" = \"fw\" ] ; then\n\tGDALPATH=\"$GDAL_PREFIX/unix/lib\"\nelse\n\tGDALPATH=\"$GDAL_PREFIX/lib\"\nfi\n\nif [ \"$GEOS_FORM\" = \"fw\" ] ; then\n\tGEOSPATH=\"$GEOS_PREFIX/unix/lib\"\nelse\n\tGEOSPATH=\"$GEOS_PREFIX/lib\"\nfi\n\nsed -e \"s, at CMAKE_SOURCE_DIR@,$PROJECT_DIR/../..,\" \\\n\t-e \"s, at CMAKE_BINARY_DIR@,$TARGET_TEMP_DIR/python,\" \\\n\t-e \"s, at GDAL_INCLUDE_DIR@,$GDAL_INC,\" \\\n\t-e \"s, at GEOS_INCLUDE_DIR@,$GEOS_INC,\" \\\n\t-e \"s, at GEOS_LIB_NAME@,geos,\" \\\n\t-e \"s, at GEOS_LIB_PATH@,$GEOSPATH,\" \\\n\t-e \"s, at GDAL_LIB_NAME@,gdal,\" \\\n\t-e \"s, at GDAL_LIB_PATH@,$GDALPATH,\" \\\n\t-e \"s, at CMAKE_OSX_ARCHITECTURES@,$ARCHS_P,\" \\\n\t-e \"s, at CMAKE_OSX_SYSROOT@,$SDKROOT,\" \\\n\t-e \"s, at CMAKE_MODULE_LINKER_FLAGS@,,\" \\\n\t../../python/configure.py.in > \"$TARGET_TEMP_DIR/python/python/configure.py\"\n\nfi\n\ncd \"$TARGET_TEMP_DIR/python/python\"\nif [ ! -f core/Makefile ] || [ ! -f gui/Makefile ] || [ configure.py -nt core/Makefile ] || [ configure.py -nt gui/Makefile ] ; then\n\t$PYTHON configure.py .\nfi\n\nif [ -f core/Makefile ] && [ -f gui/Makefile ] ; then\n\texit 0\nelse\n\texit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		7256F23F0F41370A0022BE1F /* setup */ = {

Modified: trunk/qgis/mac/xcode/qgis_settings.xcconfig
===================================================================
--- trunk/qgis/mac/xcode/qgis_settings.xcconfig	2009-09-04 23:58:42 UTC (rev 11547)
+++ trunk/qgis/mac/xcode/qgis_settings.xcconfig	2009-09-05 00:03:48 UTC (rev 11548)
@@ -5,9 +5,12 @@
 // SDKSYS must be set to valid value
 SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
 
-ARCHS = $(NATIVE_ARCH)
+ARCHS = $(NATIVE_ARCH) // ppc i386 ppc64 x86_64
 //ARCHS = ppc i386 // for universal
 
+// python archs may be different
+ARCHS_P = $(ARCH_P_$(SDKSYS)) // in the form arch1;arch2;...
+
 //////////////////////////////////////////////////////////////////////
 // QGIS version info & config
 //////////////////////////////////////////////////////////////////////
@@ -308,6 +311,9 @@
 PYTHON_FORM_tig = fw
 PYTHON_FORM_leo = system
 PYTHON_FORM_snow = system
+ARCHS_P_tig = ppc;i386
+ARCHS_P_leo = ppc;i386
+ARCHS_P_snow = i386;x86_64
 
 PYTHON_PREFIX_fw = /Library/Frameworks/Python.framework
 PYTHON_PREFIX_system = /System/Library/Frameworks/Python.framework

Modified: trunk/qgis/mac/xcode/qgis_user-template.xcconfig
===================================================================
--- trunk/qgis/mac/xcode/qgis_user-template.xcconfig	2009-09-04 23:58:42 UTC (rev 11547)
+++ trunk/qgis/mac/xcode/qgis_user-template.xcconfig	2009-09-05 00:03:48 UTC (rev 11548)
@@ -7,9 +7,12 @@
 // there is no need to set *everything* here.
 
 //SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
-//ARCHS = $(NATIVE_ARCH) // default
+//ARCHS = $(NATIVE_ARCH)  // ppc i386 ppc64 x86_64
 //ARCHS = ppc i386 // for universal
 
+// python archs may be different
+//ARCHS_P = $(ARCH_P_$(SDKSYS)) // in the form arch1;arch2;...
+
 //////////////////////////////////////////////////////////////////////
 // Qt and other support
 //////////////////////////////////////////////////////////////////////

Modified: trunk/qgis/python/configure.py.in
===================================================================
--- trunk/qgis/python/configure.py.in	2009-09-04 23:58:42 UTC (rev 11547)
+++ trunk/qgis/python/configure.py.in	2009-09-05 00:03:48 UTC (rev 11548)
@@ -13,9 +13,11 @@
 qt_libs = ["QtCore","QtGui","QtNetwork","QtSvg","QtXml"]
 if sys.platform == 'darwin':
   qt_libs.append("QtSql")
-  # possibility of universal build of bindings
+  # possibility of universal build of bindings, if more than 1 arch
   osx_archs = '@CMAKE_OSX_ARCHITECTURES@'
-  if osx_archs == 'ppc;i386' or osx_archs == 'i386;ppc':
+  if osx_archs [-1] == ';' :
+    osx_archs = osx_archs [:-1]
+  if osx_archs.count(';') > 0:
     osx_universal = '@CMAKE_OSX_SYSROOT@'
   else:
     osx_universal = ''