Skip to content

Commit a812824

Browse files
author
kyngchaos
committedSep 27, 2009
python archs must match app archs; update readme
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11722 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 4867e9f commit a812824

File tree

3 files changed

+52
-27
lines changed

3 files changed

+52
-27
lines changed
 

‎mac/xcode/ReadMe.rtf

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1038
1+
{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf110
22
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;}
33
{\colortbl;\red255\green255\blue255;}
44
\vieww10500\viewh12500\viewkind0
@@ -10,7 +10,7 @@
1010
\b0\fs24 \cf0 \
1111
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
1212

13-
\i \cf0 2.1.7 2009-5-8\
13+
\i \cf0 2.2.1 2009-9-27\
1414
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
1515
1616
\i0 \cf0 \
@@ -90,13 +90,15 @@ The xcconfig file is a simple text file with environment variables and values, a
9090
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
9191
\cf0 \ul Defaults\
9292
\ulnone \
93-
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.\
93+
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.\
9494
\
9595
By default, Qt, GSL, the Postgres client library are bundled in the Qgis application.\
9696
\
9797
\ul Minimal Config\ulnone \
9898
\
99-
You must set at least SDKSYS to match the system you are building for.\
99+
You
100+
\b must set at least SDKSYS
101+
\b0 to match the system you are building for. Other defaults will adjust automatically to match the SDK.\
100102
\
101103
For Tiger, you need to set BISON (see below).\
102104
\
@@ -126,16 +128,25 @@ ln -s /Users/Shared/unix /Developer/SDKs/MacOSX10.4u.sdk/Users/Shared/unix
126128
\
127129

128130
\f1\fs20 ARCHS
129-
\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.\
130-
\
131+
\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
132+
\i space-separated
133+
\i0 list.\
131134
\
132135
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
133-
\cf0 \ul Misc Support\
136+
137+
\f1\fs20 \cf0 ARCHS_P
138+
\f0\fs24 is a list of which architectures to build for Python, this must match the archs in ARCHS. This one is a
139+
\i semicolon-separated
140+
\i0 list.\
141+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
142+
\cf0 \
143+
\
144+
\ul Misc Support\
134145
\ulnone \
135146
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
136147

137-
\f1\fs20 \cf0 QTDIR
138-
\f0\fs24 is where the Qt applications and plugins are installed.
148+
\f1\fs20 \cf0 QT_PLUGINS_DIR
149+
\f0\fs24 is where the Qt plugins are installed.
139150
\f1\fs20 QTBIN
140151
\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.\
141152
\
@@ -151,10 +162,6 @@ ln -s /Users/Shared/unix /Developer/SDKs/MacOSX10.4u.sdk/Users/Shared/unix
151162
\f1\fs20 GPSBABEL
152163
\f0\fs24 is the full path to the gpsbabel CLI program. Used for bundling gpsbabel.\
153164
\
154-
155-
\f1\fs20 SIP_system
156-
\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.\
157-
\
158165
\
159166
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
160167
\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.\
197204
\
198205
- 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.\
199206
\
207+
- Python/SIP/PyQt - this is a complex installation. Python can be either in the system or separately installed in
208+
\f1\fs20 /Library/Frameworks
209+
\f0\fs24 . SIP/PyQt has both binary program and Python components. Programs and Python modules will be installed inside the Python framework for a
210+
\f1\fs20 /Library/Frameworks
211+
\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).\
212+
\
213+
SIP/PyQt programs are found with the
214+
\f1\fs20 PYTHON_USRBIN
215+
\f0\fs24 setting. This is automatic if you follow the Qgis SIP/PyQt install instructions.\
216+
\
200217
\
201218
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
202219

@@ -243,8 +260,10 @@ For a complete clean, trash the build folder from the project folder (NOT from t
243260
244261
\b0 \cf0 \
245262
When finished building, The final \ul Qgis.app\ulnone is put in the
246-
\f1\fs20 mac/xcode/build/[SDKSYS/]Release
247-
\f0\fs24 folder.\
263+
\f1\fs20 mac/xcode/build/[SDKSYS]/Release
264+
\f0\fs24 (or
265+
\f1\fs20 /Debug
266+
\f0\fs24 ) folder.\
248267
\
249268
\
250269
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
// QGIS Xcode project common build settings
22

3-
CURRENT_PROJECT_VERSION = 2.2.0
3+
CURRENT_PROJECT_VERSION = 2.2.1
44

55
// SDKSYS must be set to valid value
66
SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
7+
// default to universal, per system; space-separated list
8+
ARCHS = $(ARCHS_$(SDKSYS)) // ppc i386 ppc64 x86_64
79

8-
ARCHS = $(NATIVE_ARCH) // ppc i386 ppc64 x86_64
9-
//ARCHS = ppc i386 // for universal
10-
11-
// python archs use ; separator, should match what's in ARCHS
10+
// python archs use ; separator, must match what's in ARCHS
1211
ARCHS_P = $(ARCHS_P_$(SDKSYS))
1312

1413
//////////////////////////////////////////////////////////////////////
@@ -137,6 +136,11 @@ PGSQL_LIBADD = -lintl -framework CoreFoundation -liconv -lxml2 -lssl -lcrypto -l
137136
SDKROOT_tig = /Developer/SDKs/MacOSX10.4u.sdk
138137
SDKROOT_leo = /Developer/SDKs/MacOSX10.5.sdk
139138
SDKROOT_snow = /Developer/SDKs/MacOSX10.6.sdk
139+
// all archs 32bit until Qt Cocoa works
140+
ARCHS_tig = ppc i386
141+
ARCHS_leo = ppc i386
142+
ARCHS_snow = i386 // ;x86_64
143+
140144
SDKROOT = $(SDKROOT_$(SDKSYS))
141145
SYMROOT = build/$(SDKSYS)
142146
INSTALL_PREFIX = /Applications
@@ -312,9 +316,10 @@ PYTHON_VERSION_snow = 2.6
312316
PYTHON_FORM_tig = fw
313317
PYTHON_FORM_leo = system
314318
PYTHON_FORM_snow = system
319+
// all archs 32bit until Qt Cocoa works; should match ARCHS
315320
ARCHS_P_tig = ppc;i386
316321
ARCHS_P_leo = ppc;i386
317-
ARCHS_P_snow = i386;x86_64
322+
ARCHS_P_snow = i386 // ;x86_64
318323

319324
PYTHON_PREFIX_fw = /Library/Frameworks/Python.framework
320325
PYTHON_PREFIX_system = /System/Library/Frameworks/Python.framework

‎mac/xcode/qgis_user-template.xcconfig

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
// commented values values shown here are defaults
77
// there is no need to set *everything* here.
88

9+
// SDKSYS must be set to valid value
910
//SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
10-
//ARCHS = $(NATIVE_ARCH) // ppc i386 ppc64 x86_64
11-
//ARCHS = ppc i386 // for universal
11+
// default to universal, per system; space-separated list
12+
//ARCHS = $(ARCHS_$(SDKSYS)) // ppc i386 ppc64 x86_64
1213

13-
// python archs may be different
14+
// python archs use ; separator, must match what's in ARCHS
1415
//ARCHS_P = $(ARCH_P_$(SDKSYS)) // in the form arch1;arch2;...
1516

1617
//////////////////////////////////////////////////////////////////////
@@ -150,9 +151,9 @@
150151
//SPATIALITE_LIBADD = $(GEOS_LIB) $(PROJ_LIB)
151152

152153
//PYTHON_PREFIX = $(PYTHON_PREFIX_$(PYTHON_FORM))/Versions/$(PYTHON_VERSION)
153-
//PYTHON_BIN = $(PYTHON_BIN_$(PYTHON_FORM))
154-
//PYTHON_USRBIN = $(PYTHON_USRBIN_$(PYTHON_FORM))
154+
//PYTHON_BIN = $(PYTHON_BIN_$(PYTHON_FORM)) // Python executables
155+
//PYTHON_USRBIN = $(PYTHON_USRBIN_$(PYTHON_FORM)) // User-installed executables
155156
//PYTHON_INC = $(PYTHON_PREFIX)/Headers
156157
//PYTHON_LIB = -framework Python // must always be framework, full path will work
157-
//PYSITE = $(PYSITE_$(PYTHON_FORM))
158+
//PYSITE = $(PYSITE_$(PYTHON_FORM)) // site-packages
158159
//PYTHON = $(PYTHON_PREFIX)/bin/python

0 commit comments

Comments
 (0)
Please sign in to comment.