Skip to content

Commit cb0d2be

Browse files
author
kyngchaos
committedJan 16, 2010
faster python compiling (r12774)
misc updates git-svn-id: http://svn.osgeo.org/qgis/trunk@12783 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 88fafe4 commit cb0d2be

File tree

5 files changed

+516
-210
lines changed

5 files changed

+516
-210
lines changed
 

‎mac/xcode/Qgis.xcodeproj/project.pbxproj

Lines changed: 470 additions & 200 deletions
Large diffs are not rendered by default.

‎mac/xcode/ReadMe.rtf

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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.4.0 2010-1-9\
13+
\i \cf0 2.5.0 2010-1-16\
1414
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
1515
1616
\i0 \cf0 \
@@ -142,14 +142,18 @@ ln -s /Users/Shared/unix /Developer/SDKs/MacOSX10.4u.sdk/Users/Shared/unix
142142
\
143143
\
144144
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
145-
\cf0 \ul Misc Support\
145+
\cf0 \ul Support\
146146
\ulnone \
147147
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
148148

149149
\f1\fs20 \cf0 QT_PLUGINS_DIR
150150
\f0\fs24 is where the Qt plugins are installed.
151151
\f1\fs20 QTBIN
152-
\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.\
152+
\f0\fs24 is where the Qt command-line programs are found.
153+
\f1\fs20 QT_VER_MAJOR
154+
\f0\fs24 and
155+
\f1\fs20 QT_VER_MINOR
156+
\f0\fs24 are the major.minor version of Qt (currently only major version is used). The default is for a binary installation of Qt 4.5. If built from source, you may need to change these.\
153157
\
154158

155159
\f1\fs20 BISON
@@ -211,7 +215,17 @@ See detailed dependency notes below.\
211215
\f1\fs20 /Library/Frameworks
212216
\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).\
213217
\
214-
SIP/PyQt programs are found with the
218+
PYQT_SIP_DIR and PYQT_SIP_FLAGS are set for a system SIP/PyQt install as described in INSTALL. They should be adjusted for other configurations. These can be found by starting Python (the desired Python for the Qgis build) in a Terminal, then:\
219+
\
220+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
221+
222+
\f1\fs20 \cf0 import PyQt4.pyqtconfig\
223+
PyQt4.pyqtconfig.Configuration().pyqt_sip_dir\
224+
PyQt4.pyqtconfig.Configuration().pyqt_sip_flags\
225+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
226+
227+
\f0\fs24 \cf0 \
228+
SIP/PyQt utility programs are found with the
215229
\f1\fs20 PYTHON_USRBIN
216230
\f0\fs24 setting. This is automatic if you follow the Qgis SIP/PyQt install instructions.\
217231
\

‎mac/xcode/qgis_settings.xcconfig

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

3-
CURRENT_PROJECT_VERSION = 2.4.0
3+
CURRENT_PROJECT_VERSION = 2.5.0
44

55
// SDKSYS must be set to valid value
66
SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
@@ -27,17 +27,24 @@ QGIS_VERSION_INT = 10400
2727
//////////////////////////////////////////////////////////////////////
2828

2929
// ***TODO*** - detect current version, only used in bundle script
30-
QT_MVER = 4 // the install_name version
31-
QT_FWVER = $(QT_MVER) // the Versions/ folder name, normally same as Qt ver
30+
QT_MVER = $(QT_VER_MAJOR) // keep for now so I don't have to change all scripts and deps
31+
QT_VER_MAJOR = 4 // the install_name/major version
32+
QT_VER_MINOR = 5 // minor version
33+
QT_FWVER = $(QT_VER_MAJOR) // the Versions/ folder name, normally same as Qt ver
3234

3335
QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins
3436
QTBIN = /Developer/Tools/Qt
3537
QTMOC = $(QTBIN)/moc
3638
QTUIC = $(QTBIN)/uic
3739
QTRCC = $(QTBIN)/rcc
3840
QTLREL = $(QTBIN)/lrelease
41+
// defaults for system Python SIP/PyQt install as described in INSTALL
42+
SIP = $(PYTHON_USRBIN)/sip
3943
PYUIC4 = $(PYTHON_USRBIN)/pyuic4
4044
PYRCC4 = $(PYTHON_USRBIN)/pyrcc4
45+
// from pyqtconfig.py
46+
PYQT_SIP_DIR = /usr/local/share/sip/PyQt4
47+
PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_4_5_0 -x Py_v3 -g
4148

4249
BISON = /usr/bin/bison
4350
GPSBABEL = /usr/local/bin/gpsbabel

‎mac/xcode/qgis_user-template.xcconfig

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// QGIS Xcode project common build settings
22

3+
// CURRENT_PROJECT_VERSION = 2.5.0
4+
35
// duplicate this file as qgis_user.xcconfig.
46
// uncomment settings in qgis_user.xcconfig to override defaults
57
// in qgis_settings.xcconfig.
@@ -18,11 +20,15 @@
1820
// Qt and other support
1921
//////////////////////////////////////////////////////////////////////
2022

21-
//QT_MVER = 4 // the install_name version
22-
//QT_FWVER = $(QT_MVER) // the Versions/ folder name, normally same as Qt ver
23+
//QT_MVER = $(QT_VER_MAJOR)
24+
//QT_VER_MAJOR = 4 // the install_name/major version
25+
//QT_VER_MINOR = 5 // minor version, currently unused
26+
//QT_FWVER = $(QT_VER_MAJOR) // the Versions/ folder name, normally same as Qt ver
2327

2428
//QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins
2529
//QTBIN = /Developer/Tools/Qt // bin dir
30+
//PYQT_SIP_DIR = /usr/local/share/sip/PyQt4
31+
//PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_4_5_0 -x Py_v3 -g
2632
//BISON = /usr/bin/bison // Tiger requires user-installed bison 2.3
2733
//GPSBABEL = /usr/local/bin/gpsbabel
2834

@@ -46,7 +52,7 @@
4652
// fw, shared and internal enable both, so spatial MUST be available
4753
// (is avail for fw, use spatialite 2.3+ for shared sqlite+spatialite)
4854
//SQLITE_FORM = fw // system, fw, shared or internal
49-
// whether spatialite is built with GEOS and PROJ
55+
// whether spatialite is built with GEOS and PROJ, only for external spatialite
5056
// (must be same GEOS and PROJ used for Qgis)
5157
//SPATIALITE_GEOS = yes
5258
//SPATIALITE_PROJ = yes

‎mac/xcode/src/x_python_dummy.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* x_python_dummy.cpp
3+
* Qgis
4+
*
5+
* Created by William Kyngesburye on 2010-01-16.
6+
*
7+
*/
8+
9+
// This file is just to trigger Xcode to display target settings correctly

0 commit comments

Comments
 (0)
Please sign in to comment.