Skip to content

Commit ac843ef

Browse files
author
kyngchaos
committed
sync with r14283;
misc cleanup; default single native arch to match compilation instructions git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14287 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 794f975 commit ac843ef

File tree

4 files changed

+34
-44
lines changed

4 files changed

+34
-44
lines changed

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

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,6 +1260,8 @@
12601260
727800FC10FB77DE00574B67 /* qextserialport.h in Sources */ = {isa = PBXBuildFile; fileRef = 727800F410FB76E200574B67 /* qextserialport.h */; };
12611261
7278010610FB785F00574B67 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7278010510FB785F00574B67 /* IOKit.framework */; };
12621262
727801BA10FB7B1D00574B67 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F4B80F3A5434003DC336 /* CoreFoundation.framework */; };
1263+
727DEA1A124F9BDE00497454 /* qgsfeatureaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 727DEA18124F9B9200497454 /* qgsfeatureaction.cpp */; };
1264+
727DEA1B124F9BDE00497454 /* qgsfeatureaction.h in Sources */ = {isa = PBXBuildFile; fileRef = 727DEA19124F9B9200497454 /* qgsfeatureaction.h */; };
12631265
727E6AF10FEA90E200DF6F64 /* x_sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 727E6AF00FEA90E200DF6F64 /* x_sqlite3.c */; };
12641266
727E6B040FEA9BC000DF6F64 /* x_spatialite.c in Sources */ = {isa = PBXBuildFile; fileRef = 727E6B030FEA9BC000DF6F64 /* x_spatialite.c */; };
12651267
727E6B110FEAA0CF00DF6F64 /* x_qgsspatialitesourceselect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 727E6B0C0FEAA06B00DF6F64 /* x_qgsspatialitesourceselect.cpp */; };
@@ -6134,18 +6136,6 @@
61346136
7209EFF20F39E5DA003DC336 /* qgis_vi.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgis_vi.ts; path = ../../i18n/qgis_vi.ts; sourceTree = SOURCE_ROOT; };
61356137
7209EFF30F39E5DA003DC336 /* qgis_zh_CN.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgis_zh_CN.ts; path = ../../i18n/qgis_zh_CN.ts; sourceTree = SOURCE_ROOT; };
61366138
7209EFF40F39E5DA003DC336 /* qgis_zh_TW.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgis_zh_TW.ts; path = ../../i18n/qgis_zh_TW.ts; sourceTree = SOURCE_ROOT; };
6137-
7209EFF50F39E5DA003DC336 /* qt_ar.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_ar.ts; path = ../../i18n/qt_ar.ts; sourceTree = SOURCE_ROOT; };
6138-
7209EFF60F39E5DA003DC336 /* qt_de.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_de.ts; path = ../../i18n/qt_de.ts; sourceTree = SOURCE_ROOT; };
6139-
7209EFF70F39E5DA003DC336 /* qt_es.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qt_es.ts; path = ../../i18n/qt_es.ts; sourceTree = SOURCE_ROOT; };
6140-
7209EFF80F39E5DA003DC336 /* qt_fr.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_fr.ts; path = ../../i18n/qt_fr.ts; sourceTree = SOURCE_ROOT; };
6141-
7209EFF90F39E5DA003DC336 /* qt_ja_jp.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_ja_jp.ts; path = ../../i18n/qt_ja_jp.ts; sourceTree = SOURCE_ROOT; };
6142-
7209EFFA0F39E5DA003DC336 /* qt_pl.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_pl.ts; path = ../../i18n/qt_pl.ts; sourceTree = SOURCE_ROOT; };
6143-
7209EFFB0F39E5DA003DC336 /* qt_pt.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_pt.ts; path = ../../i18n/qt_pt.ts; sourceTree = SOURCE_ROOT; };
6144-
7209EFFC0F39E5DA003DC336 /* qt_ru.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_ru.ts; path = ../../i18n/qt_ru.ts; sourceTree = SOURCE_ROOT; };
6145-
7209EFFD0F39E5DA003DC336 /* qt_sk.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_sk.ts; path = ../../i18n/qt_sk.ts; sourceTree = SOURCE_ROOT; };
6146-
7209EFFE0F39E5DA003DC336 /* qt_sv.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_sv.ts; path = ../../i18n/qt_sv.ts; sourceTree = SOURCE_ROOT; };
6147-
7209EFFF0F39E5DA003DC336 /* qt_zh_CN.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_zh_CN.ts; path = ../../i18n/qt_zh_CN.ts; sourceTree = SOURCE_ROOT; };
6148-
7209F0000F39E5DA003DC336 /* qt_zh_TW.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_zh_TW.ts; path = ../../i18n/qt_zh_TW.ts; sourceTree = SOURCE_ROOT; };
61496139
7209F0020F39E5DA003DC336 /* Bison.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Bison.cmake; path = ../../cmake/Bison.cmake; sourceTree = SOURCE_ROOT; };
61506140
7209F0030F39E5DA003DC336 /* FindExpat.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = FindExpat.cmake; path = ../../cmake/FindExpat.cmake; sourceTree = SOURCE_ROOT; };
61516141
7209F0040F39E5DA003DC336 /* FindGDAL.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = FindGDAL.cmake; path = ../../cmake/FindGDAL.cmake; sourceTree = SOURCE_ROOT; };
@@ -7260,6 +7250,7 @@
72607250
726FD9A00F6BF83100D50560 /* layer_extent.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = layer_extent.png; path = ../../python/plugins/fTools/icons/gis/layer_extent.png; sourceTree = SOURCE_ROOT; };
72617251
726FD9A10F6BF83100D50560 /* delaunay.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = delaunay.png; path = ../../python/plugins/fTools/icons/gis/delaunay.png; sourceTree = SOURCE_ROOT; };
72627252
726FD9A40F6BF86600D50560 /* voronoi.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = voronoi.py; path = ../../python/plugins/fTools/tools/voronoi.py; sourceTree = SOURCE_ROOT; };
7253+
72728C43124519B90077E591 /* mIconTableLayer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mIconTableLayer.png; path = ../../images/themes/default/mIconTableLayer.png; sourceTree = SOURCE_ROOT; };
72637254
727459F10F7700C6007F4218 /* spit_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spit_icon.png; path = ../../src/plugins/spit/spit_icon.png; sourceTree = SOURCE_ROOT; };
72647255
727459F20F7700C6007F4218 /* spit_image.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spit_image.png; path = ../../src/plugins/spit/spit_image.png; sourceTree = SOURCE_ROOT; };
72657256
727459F50F770252007F4218 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../images/themes/gis/plugins/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
@@ -7304,6 +7295,8 @@
73047295
7278010510FB785F00574B67 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = ../../../../../../../../System/Library/Frameworks/IOKit.framework; sourceTree = SOURCE_ROOT; };
73057296
727903F310A1EC29006254DF /* mActionNewComposer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionNewComposer.png; path = ../../images/themes/default/mActionNewComposer.png; sourceTree = SOURCE_ROOT; };
73067297
727CEC210FBAFF6000F5B88C /* mIconLock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mIconLock.png; path = ../../images/themes/default/mIconLock.png; sourceTree = SOURCE_ROOT; };
7298+
727DEA18124F9B9200497454 /* qgsfeatureaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsfeatureaction.cpp; path = ../../src/app/qgsfeatureaction.cpp; sourceTree = SOURCE_ROOT; };
7299+
727DEA19124F9B9200497454 /* qgsfeatureaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsfeatureaction.h; path = ../../src/app/qgsfeatureaction.h; sourceTree = SOURCE_ROOT; };
73077300
727E6AF00FEA90E200DF6F64 /* x_sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_sqlite3.c; sourceTree = "<group>"; };
73087301
727E6B030FEA9BC000DF6F64 /* x_spatialite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_spatialite.c; sourceTree = "<group>"; };
73097302
727E6B0B0FEAA06B00DF6F64 /* x_qgsspatialitesourceselect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x_qgsspatialitesourceselect.h; sourceTree = "<group>"; };
@@ -9852,6 +9845,8 @@
98529845
72A93DDB11B5E494007E8AE7 /* qgslabelinggui.h */,
98539846
72A93DDC11B5E494007E8AE7 /* qgslabelpreview.cpp */,
98549847
72A93DDD11B5E494007E8AE7 /* qgslabelpreview.h */,
9848+
727DEA18124F9B9200497454 /* qgsfeatureaction.cpp */,
9849+
727DEA19124F9B9200497454 /* qgsfeatureaction.h */,
98559850
72A239420F74A62200AFC35B /* attributetable */,
98569851
7209E5BD0F39E57A003DC336 /* composer */,
98579852
72AF7B3010F8F02100BD549A /* gps */,
@@ -12085,6 +12080,7 @@
1208512080
7209EF560F39E5D9003DC336 /* mIconProperties.png */,
1208612081
7209EF570F39E5D9003DC336 /* mIconPyramid.png */,
1208712082
7209EF580F39E5D9003DC336 /* mIconSymbology.png */,
12083+
72728C43124519B90077E591 /* mIconTableLayer.png */,
1208812084
7209EF590F39E5D9003DC336 /* mIconUnknownLayerType.png */,
1208912085
7209EF5A0F39E5D9003DC336 /* mIconWaitingForLayerType.png */,
1209012086
7209EF5B0F39E5D9003DC336 /* mMapserverExport.png */,
@@ -12353,18 +12349,6 @@
1235312349
72EA46F50FCD77CB009D4CFB /* qgis_xh.ts */,
1235412350
7209EFF30F39E5DA003DC336 /* qgis_zh_CN.ts */,
1235512351
7209EFF40F39E5DA003DC336 /* qgis_zh_TW.ts */,
12356-
7209EFF50F39E5DA003DC336 /* qt_ar.ts */,
12357-
7209EFF60F39E5DA003DC336 /* qt_de.ts */,
12358-
7209EFF70F39E5DA003DC336 /* qt_es.ts */,
12359-
7209EFF80F39E5DA003DC336 /* qt_fr.ts */,
12360-
7209EFF90F39E5DA003DC336 /* qt_ja_jp.ts */,
12361-
7209EFFA0F39E5DA003DC336 /* qt_pl.ts */,
12362-
7209EFFB0F39E5DA003DC336 /* qt_pt.ts */,
12363-
7209EFFC0F39E5DA003DC336 /* qt_ru.ts */,
12364-
7209EFFD0F39E5DA003DC336 /* qt_sk.ts */,
12365-
7209EFFE0F39E5DA003DC336 /* qt_sv.ts */,
12366-
7209EFFF0F39E5DA003DC336 /* qt_zh_CN.ts */,
12367-
7209F0000F39E5DA003DC336 /* qt_zh_TW.ts */,
1236812352
);
1236912353
name = i18n;
1237012354
path = ../../i18n;
@@ -18437,6 +18421,8 @@
1843718421
7233D9871218E6A200C34505 /* qgsmaptoolselectrectangle.cpp in Sources */,
1843818422
7233D9881218E6A200C34505 /* qgsmaptoolselectrectangle.h in Sources */,
1843918423
7233D9891218E6A200C34505 /* qgsmaptoolselectutils.cpp in Sources */,
18424+
727DEA1A124F9BDE00497454 /* qgsfeatureaction.cpp in Sources */,
18425+
727DEA1B124F9BDE00497454 /* qgsfeatureaction.h in Sources */,
1844018426
);
1844118427
runOnlyForDeploymentPostprocessing = 0;
1844218428
};
@@ -21817,6 +21803,7 @@
2181721803
"$(QT_INC)",
2181821804
"$(FCGI_INC)",
2181921805
"$(GDAL_INC)",
21806+
"$(GEOS_INC)",
2182021807
);
2182121808
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
2182221809
MACH_O_TYPE = mh_execute;
@@ -21859,6 +21846,7 @@
2185921846
"$(QT_INC)",
2186021847
"$(FCGI_INC)",
2186121848
"$(GDAL_INC)",
21849+
"$(GEOS_INC)",
2186221850
);
2186321851
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
2186421852
MACH_O_TYPE = mh_execute;

‎mac/xcode/ReadMe.rtf

Lines changed: 8 additions & 11 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.5.0 2010-1-16\
13+
\i \cf0 2.6.1 2010-9-26\
1414
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
1515
1616
\i0 \cf0 \
@@ -60,12 +60,9 @@ See the Qgis {\field{\*\fldinst{HYPERLINK "http://wiki.qgis.org/qgiswiki/Buildin
6060
\ul Spatialite library\ulnone - Spatialite is included in the SQLite framework starting with 3.6.11. Or usethe internal copy (tied to the internal SQLite).\
6161
\
6262
\ul Expat library\ulnone - Leopard and above includes expat. The one in X11 should work on Tiger, but I prefer to avoid X11 dependencies.\
63-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
64-
\cf0 \
65-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
66-
\cf0 \ul \ulc0 Fcgi library\ulnone - Leopard and above includes fcgi. Must be compiled from source for earlier systems.\
67-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
68-
\cf0 \
63+
\
64+
\ul Fcgi library\ulnone - Leopard and above includes fcgi. Must be compiled from source for earlier systems.\
65+
\
6966
\ul Bison\ulnone - Leopard and above includes bison. Tiger has an old bison that won't work for QGIS. See the QGIS install instructions for info about how to compile and install this on Tiger.\
7067
\
7168
\ul gpsbabel\ulnone (optional) - for the GPS Import plugin. A universal gpsbabel is available from gpsbabel.org.\
@@ -99,11 +96,11 @@ The xcconfig file is a simple text file with environment variables and values, a
9996
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
10097
\cf0 \ul Defaults\
10198
\ulnone \
102-
The default configuration is for a universal build, with the Leopard (10.5) SDK.\
99+
The default configuration is for a native build, with the Leopard (10.5) SDK.\
103100
\
104101
GDAL, PROJ, GEOS, GSL and SQLite frameworks are used. Spatialite is expected in the SQLite framework. Postgres is expected in default /usr/local builds. Expat and fcgi are from the system on Leopard and above, and are 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.\
105102
\
106-
By default, Qt and the Postgres client library are bundled in the Qgis application.\
103+
By default, Qt, Qwt and the Postgres client library are bundled in the Qgis application.\
107104
\
108105
\ul Minimal Config\ulnone \
109106
\
@@ -139,13 +136,13 @@ ln -s /Users/Shared/unix /Developer/SDKs/MacOSX10.4u.sdk/Users/Shared/unix
139136
\
140137

141138
\f1\fs20 ARCHS
142-
\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
139+
\f0\fs24 is a list of which architectures to build, the default is a native architecture to match the SDK used. Uncomment ARCHS if you want a universal build. This is a
143140
\i space-separated
144141
\i0 list.\
145142
\
146143

147144
\f1\fs20 ARCHS_P
148-
\f0\fs24 is a list of which architectures to build for Python, this must match the archs in ARCHS. This one is a
145+
\f0\fs24 is a list of which architectures to build for Python, this must match the archs in ARCHS. Uncomment ARCHS_P for a universal build. This one is a
149146
\i semicolon-separated
150147
\i0 list.\
151148
\

‎mac/xcode/qgis_settings.xcconfig

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

3-
CURRENT_PROJECT_VERSION = 2.6.0
3+
CURRENT_PROJECT_VERSION = 2.6.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
7+
// default to native; space-separated list
8+
ARCHS = $(NATIVE_ARCH_ACTUAL) // ppc i386 ppc64 x86_64
99

1010
// python archs use ; separator, must match what's in ARCHS
11-
ARCHS_P = $(ARCHS_P_$(SDKSYS))
11+
ARCHS_P = $(ARCHS)
1212

1313
//////////////////////////////////////////////////////////////////////
1414
// QGIS version info & config
@@ -170,6 +170,7 @@ SDKROOT_snow = /Developer/SDKs/MacOSX10.6.sdk
170170
ARCHS_tig = ppc i386
171171
ARCHS_leo = ppc i386
172172
ARCHS_snow = i386 x86_64
173+
UNIVERSAL = $(ARCHS_$(SDKSYS))
173174

174175
SDKROOT = $(SDKROOT_$(SDKSYS))
175176
SYMROOT = build/$(SDKSYS)
@@ -413,6 +414,7 @@ PYTHON_FORM_snow = system
413414
ARCHS_P_tig = ppc;i386
414415
ARCHS_P_leo = ppc;i386
415416
ARCHS_P_snow = i386;x86_64
417+
UNIVERSAL_P = $(ARCHS_P_$(SDKSYS))
416418

417419
PYTHON_PREFIX_fw = /Library/Frameworks/Python.framework
418420
PYTHON_PREFIX_system = /System/Library/Frameworks/Python.framework

‎mac/xcode/qgis_user-template.xcconfig

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

3-
// CURRENT_PROJECT_VERSION = 2.5.0
3+
// CURRENT_PROJECT_VERSION = 2.6.1
44

5+
//////////////////////////////////////////////////////////////////////
56
// duplicate this file as qgis_user.xcconfig.
67
// uncomment settings in qgis_user.xcconfig to override defaults
78
// in qgis_settings.xcconfig.
@@ -10,11 +11,13 @@
1011

1112
// SDKSYS must be set to valid value
1213
//SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
13-
// default to universal, per system; space-separated list
14-
//ARCHS = $(ARCHS_$(SDKSYS)) // ppc i386 ppc64 x86_64
1514

16-
// python archs use ; separator, must match what's in ARCHS
17-
//ARCHS_P = $(ARCH_P_$(SDKSYS)) // in the form arch1;arch2;...
15+
// default to native; space-separated list, ppc i386 ppc64 x86_64
16+
//ARCHS = $(UNIVERSAL) // use this for universal multiarch build
17+
18+
// python archs, default same as ARCHS, must match what's in ARCHS
19+
// use ; separator
20+
//ARCHS_P = $(UNIVERSAL_P) // use this for universal multiarch build
1821

1922
//////////////////////////////////////////////////////////////////////
2023
// Qt and other support

0 commit comments

Comments
 (0)