python archs must match app archs; update readme

git-svn-id: http://svn.osgeo.org/qgis/trunk@11722 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 27, 2009 · 982a8ea · 982a8ea
1 parent 14e05f4
commit 982a8ea
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 27 deletions.
diff --git a/mac/xcode/ReadMe.rtf b/mac/xcode/ReadMe.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf110
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;}
 {\colortbl;\red255\green255\blue255;}
 \vieww10500\viewh12500\viewkind0
@@ -10,7 +10,7 @@
 \b0\fs24 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\i \cf0 2.1.7	2009-5-8\
+\i \cf0 2.2.1	2009-9-27\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
 \i0 \cf0 \
@@ -90,13 +90,15 @@ The xcconfig file is a simple text file with environment variables and values, a
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \ul Defaults\
 \ulnone \
-The default configuration is for the native architecture, without using a system SDK.  GDAL, PROJ, GEOS and SQLite frameworks are used.  Spatialite is expected in the SQLite framework.  Postgres and GSL are expected in default /usr/local builds.  Expat is from the system on Leopard and above, and is expected in /usr/local on Tiger.  GRASS support is from a GRASS-6.4.app application.  The python.org Python framework is used on Tiger, and the system Python is used on Leopard and above.\
+The default configuration is for a universal build, with the Leopard (10.5) SDK.  GDAL, PROJ, GEOS and SQLite frameworks are used.  Spatialite is expected in the SQLite framework.  Postgres and GSL are expected in default /usr/local builds.  Expat is from the system on Leopard and above, and is expected in /usr/local on Tiger.  GRASS support is from a GRASS-6.4.app application.  The python.org Python framework is used on Tiger, and the system Python is used on Leopard and above.\
 \
 By default, Qt, GSL, the Postgres client library are bundled in the Qgis application.\
 \
 \ul Minimal Config\ulnone \
 \
-You must set at least SDKSYS to match the system you are building for.\
+You 
+\b must set at least SDKSYS
+\b0  to match the system you are building for.  Other defaults will adjust automatically to match the SDK.\
 \
 For Tiger, you need to set BISON (see below).\
 \
@@ -126,16 +128,25 @@ ln -s /Users/Shared/unix /Developer/SDKs/MacOSX10.4u.sdk/Users/Shared/unix
 \
 
 \f1\fs20 ARCHS
-\f0\fs24  is a list of which architectures to build, the default is the native arch of your Mac.  Uncomment the universal line if that's what you want.\
-\
+\f0\fs24  is a list of which architectures to build, the default is universal to match the SDK used.  Uncomment and set ARCHS if you want a single arch.  This is a 
+\i space-separated
+\i0  list.\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \ul Misc Support\
+
+\f1\fs20 \cf0 ARCHS_P
+\f0\fs24  is a list of which architectures to build for Python, this must match the archs in ARCHS.  This one is a 
+\i semicolon-separated
+\i0  list.\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+\cf0 \
+\
+\ul Misc Support\
 \ulnone \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\f1\fs20 \cf0 QTDIR
-\f0\fs24  is where the Qt applications and plugins are installed.  
+\f1\fs20 \cf0 QT_PLUGINS_DIR
+\f0\fs24  is where the Qt plugins are installed.  
 \f1\fs20 QTBIN
 \f0\fs24  is where the Qt command-line programs are found.  The default is for a binary installation of Qt.  If built from source, you may need to change these.\
 \
@@ -151,10 +162,6 @@ ln -s /Users/Shared/unix /Developer/SDKs/MacOSX10.4u.sdk/Users/Shared/unix
 \f1\fs20 GPSBABEL
 \f0\fs24  is the full path to the gpsbabel CLI program.  Used for bundling gpsbabel.\
 \
-
-\f1\fs20 SIP_system
-\f0\fs24  is the full path to the sip program when installed for the system Python on Leopard.  If the INSTALL instructions are followed to install SIP, this shouldn't need to be changed.\
-\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \ul Library forms\ulnone  - this is where you tell the project what type of library you have, as many of them are available in framework forms as well as libraries.\
@@ -197,6 +204,16 @@ See detailed dependency notes below.\
 \
 - GRASS - GRASS.app \ul must\ulnone  be installed as it was built.  If it was moved or renamed after installation, GRASS support in Qgis won't work.  This goes for building Qgis as well as running it to use full GRASS support.\
 \
+- Python/SIP/PyQt - this is a complex installation.  Python can be either in the system or separately installed in 
+\f1\fs20 /Library/Frameworks
+\f0\fs24 .  SIP/PyQt has both binary program and Python components.  Programs and Python modules will be installed inside the Python framework for a 
+\f1\fs20 /Library/Frameworks
+\f0\fs24  install.  But the system Python has a user location for Python modules, and programs should be installed elsewhere, like /usr/local/bin (follow the Qgis install instructions for SIP/PyQt).\
+\
+SIP/PyQt programs are found with the 
+\f1\fs20 PYTHON_USRBIN
+\f0\fs24  setting.  This is automatic if you follow the Qgis SIP/PyQt install instructions.\
+\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
@@ -243,8 +260,10 @@ For a complete clean, trash the build folder from the project folder (NOT from t
 
 \b0 \cf0 \
 When finished building, The final \ul Qgis.app\ulnone  is put in the 
-\f1\fs20 mac/xcode/build/[SDKSYS/]Release
-\f0\fs24  folder.\
+\f1\fs20 mac/xcode/build/[SDKSYS]/Release
+\f0\fs24  (or 
+\f1\fs20 /Debug
+\f0\fs24 ) folder.\
 \
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

diff --git a/mac/xcode/qgis_settings.xcconfig b/mac/xcode/qgis_settings.xcconfig
@@ -1,14 +1,13 @@
 // QGIS Xcode project common build settings
 
-CURRENT_PROJECT_VERSION = 2.2.0
+CURRENT_PROJECT_VERSION = 2.2.1
 
 // SDKSYS must be set to valid value
 SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
+// default to universal, per system; space-separated list
+ARCHS = $(ARCHS_$(SDKSYS)) // ppc i386 ppc64 x86_64
 
-ARCHS = $(NATIVE_ARCH) // ppc i386 ppc64 x86_64
-//ARCHS = ppc i386 // for universal
-
-// python archs use ; separator, should match what's in ARCHS
+// python archs use ; separator, must match what's in ARCHS
 ARCHS_P = $(ARCHS_P_$(SDKSYS))
 
 //////////////////////////////////////////////////////////////////////
@@ -137,6 +136,11 @@ PGSQL_LIBADD = -lintl -framework CoreFoundation -liconv -lxml2 -lssl -lcrypto -l
 SDKROOT_tig = /Developer/SDKs/MacOSX10.4u.sdk
 SDKROOT_leo = /Developer/SDKs/MacOSX10.5.sdk
 SDKROOT_snow = /Developer/SDKs/MacOSX10.6.sdk
+// all archs 32bit until Qt Cocoa works
+ARCHS_tig = ppc i386
+ARCHS_leo = ppc i386
+ARCHS_snow = i386 // ;x86_64
+
 SDKROOT = $(SDKROOT_$(SDKSYS))
 SYMROOT = build/$(SDKSYS)
 INSTALL_PREFIX = /Applications
@@ -312,9 +316,10 @@ PYTHON_VERSION_snow = 2.6
 PYTHON_FORM_tig = fw
 PYTHON_FORM_leo = system
 PYTHON_FORM_snow = system
+// all archs 32bit until Qt Cocoa works; should match ARCHS
 ARCHS_P_tig = ppc;i386
 ARCHS_P_leo = ppc;i386
-ARCHS_P_snow = i386;x86_64
+ARCHS_P_snow = i386 // ;x86_64
 
 PYTHON_PREFIX_fw = /Library/Frameworks/Python.framework
 PYTHON_PREFIX_system = /System/Library/Frameworks/Python.framework

diff --git a/mac/xcode/qgis_user-template.xcconfig b/mac/xcode/qgis_user-template.xcconfig
@@ -6,11 +6,12 @@
 // commented values values shown here are defaults
 // there is no need to set *everything* here.
 
+// SDKSYS must be set to valid value
 //SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
-//ARCHS = $(NATIVE_ARCH)  // ppc i386 ppc64 x86_64
-//ARCHS = ppc i386 // for universal
+// default to universal, per system; space-separated list
+//ARCHS = $(ARCHS_$(SDKSYS)) // ppc i386 ppc64 x86_64
 
-// python archs may be different
+// python archs use ; separator, must match what's in ARCHS
 //ARCHS_P = $(ARCH_P_$(SDKSYS)) // in the form arch1;arch2;...
 
 //////////////////////////////////////////////////////////////////////
@@ -150,9 +151,9 @@
 //SPATIALITE_LIBADD = $(GEOS_LIB) $(PROJ_LIB)
 
 //PYTHON_PREFIX = $(PYTHON_PREFIX_$(PYTHON_FORM))/Versions/$(PYTHON_VERSION)
-//PYTHON_BIN = $(PYTHON_BIN_$(PYTHON_FORM))
-//PYTHON_USRBIN = $(PYTHON_USRBIN_$(PYTHON_FORM))
+//PYTHON_BIN = $(PYTHON_BIN_$(PYTHON_FORM)) // Python executables
+//PYTHON_USRBIN = $(PYTHON_USRBIN_$(PYTHON_FORM)) // User-installed executables
 //PYTHON_INC = $(PYTHON_PREFIX)/Headers
 //PYTHON_LIB = -framework Python // must always be framework, full path will work
-//PYSITE = $(PYSITE_$(PYTHON_FORM))
+//PYSITE = $(PYSITE_$(PYTHON_FORM)) // site-packages
 //PYTHON = $(PYTHON_PREFIX)/bin/python