Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kyngchaos committed Sep 26, 2010
1 parent 794f975 commit ac843ef
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 44 deletions.
36 changes: 12 additions & 24 deletions mac/xcode/Qgis.xcodeproj/project.pbxproj
View file
Expand Up @@ -1260,6 +1260,8 @@
727800FC10FB77DE00574B67 /* qextserialport.h in Sources */ = {isa = PBXBuildFile; fileRef = 727800F410FB76E200574B67 /* qextserialport.h */; };
7278010610FB785F00574B67 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7278010510FB785F00574B67 /* IOKit.framework */; };
727801BA10FB7B1D00574B67 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F4B80F3A5434003DC336 /* CoreFoundation.framework */; };
727DEA1A124F9BDE00497454 /* qgsfeatureaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 727DEA18124F9B9200497454 /* qgsfeatureaction.cpp */; };
727DEA1B124F9BDE00497454 /* qgsfeatureaction.h in Sources */ = {isa = PBXBuildFile; fileRef = 727DEA19124F9B9200497454 /* qgsfeatureaction.h */; };
727E6AF10FEA90E200DF6F64 /* x_sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 727E6AF00FEA90E200DF6F64 /* x_sqlite3.c */; };
727E6B040FEA9BC000DF6F64 /* x_spatialite.c in Sources */ = {isa = PBXBuildFile; fileRef = 727E6B030FEA9BC000DF6F64 /* x_spatialite.c */; };
727E6B110FEAA0CF00DF6F64 /* x_qgsspatialitesourceselect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 727E6B0C0FEAA06B00DF6F64 /* x_qgsspatialitesourceselect.cpp */; };
Expand Down Expand Up @@ -6134,18 +6136,6 @@
7209EFF20F39E5DA003DC336 /* qgis_vi.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgis_vi.ts; path = ../../i18n/qgis_vi.ts; sourceTree = SOURCE_ROOT; };
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; };
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; };
7209EFF50F39E5DA003DC336 /* qt_ar.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_ar.ts; path = ../../i18n/qt_ar.ts; sourceTree = SOURCE_ROOT; };
7209EFF60F39E5DA003DC336 /* qt_de.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_de.ts; path = ../../i18n/qt_de.ts; sourceTree = SOURCE_ROOT; };
7209EFF70F39E5DA003DC336 /* qt_es.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qt_es.ts; path = ../../i18n/qt_es.ts; sourceTree = SOURCE_ROOT; };
7209EFF80F39E5DA003DC336 /* qt_fr.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_fr.ts; path = ../../i18n/qt_fr.ts; sourceTree = SOURCE_ROOT; };
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; };
7209EFFA0F39E5DA003DC336 /* qt_pl.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_pl.ts; path = ../../i18n/qt_pl.ts; sourceTree = SOURCE_ROOT; };
7209EFFB0F39E5DA003DC336 /* qt_pt.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_pt.ts; path = ../../i18n/qt_pt.ts; sourceTree = SOURCE_ROOT; };
7209EFFC0F39E5DA003DC336 /* qt_ru.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_ru.ts; path = ../../i18n/qt_ru.ts; sourceTree = SOURCE_ROOT; };
7209EFFD0F39E5DA003DC336 /* qt_sk.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_sk.ts; path = ../../i18n/qt_sk.ts; sourceTree = SOURCE_ROOT; };
7209EFFE0F39E5DA003DC336 /* qt_sv.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qt_sv.ts; path = ../../i18n/qt_sv.ts; sourceTree = SOURCE_ROOT; };
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; };
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; };
7209F0020F39E5DA003DC336 /* Bison.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Bison.cmake; path = ../../cmake/Bison.cmake; sourceTree = SOURCE_ROOT; };
7209F0030F39E5DA003DC336 /* FindExpat.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = FindExpat.cmake; path = ../../cmake/FindExpat.cmake; sourceTree = SOURCE_ROOT; };
7209F0040F39E5DA003DC336 /* FindGDAL.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = FindGDAL.cmake; path = ../../cmake/FindGDAL.cmake; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -7260,6 +7250,7 @@
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; };
726FD9A10F6BF83100D50560 /* delaunay.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = delaunay.png; path = ../../python/plugins/fTools/icons/gis/delaunay.png; sourceTree = SOURCE_ROOT; };
726FD9A40F6BF86600D50560 /* voronoi.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = voronoi.py; path = ../../python/plugins/fTools/tools/voronoi.py; sourceTree = SOURCE_ROOT; };
72728C43124519B90077E591 /* mIconTableLayer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mIconTableLayer.png; path = ../../images/themes/default/mIconTableLayer.png; sourceTree = SOURCE_ROOT; };
727459F10F7700C6007F4218 /* spit_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spit_icon.png; path = ../../src/plugins/spit/spit_icon.png; sourceTree = SOURCE_ROOT; };
727459F20F7700C6007F4218 /* spit_image.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spit_image.png; path = ../../src/plugins/spit/spit_image.png; sourceTree = SOURCE_ROOT; };
727459F50F770252007F4218 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../images/themes/gis/plugins/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -7304,6 +7295,8 @@
7278010510FB785F00574B67 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = ../../../../../../../../System/Library/Frameworks/IOKit.framework; sourceTree = SOURCE_ROOT; };
727903F310A1EC29006254DF /* mActionNewComposer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionNewComposer.png; path = ../../images/themes/default/mActionNewComposer.png; sourceTree = SOURCE_ROOT; };
727CEC210FBAFF6000F5B88C /* mIconLock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mIconLock.png; path = ../../images/themes/default/mIconLock.png; sourceTree = SOURCE_ROOT; };
727DEA18124F9B9200497454 /* qgsfeatureaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsfeatureaction.cpp; path = ../../src/app/qgsfeatureaction.cpp; sourceTree = SOURCE_ROOT; };
727DEA19124F9B9200497454 /* qgsfeatureaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsfeatureaction.h; path = ../../src/app/qgsfeatureaction.h; sourceTree = SOURCE_ROOT; };
727E6AF00FEA90E200DF6F64 /* x_sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_sqlite3.c; sourceTree = "<group>"; };
727E6B030FEA9BC000DF6F64 /* x_spatialite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x_spatialite.c; sourceTree = "<group>"; };
727E6B0B0FEAA06B00DF6F64 /* x_qgsspatialitesourceselect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x_qgsspatialitesourceselect.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -9852,6 +9845,8 @@
72A93DDB11B5E494007E8AE7 /* qgslabelinggui.h */,
72A93DDC11B5E494007E8AE7 /* qgslabelpreview.cpp */,
72A93DDD11B5E494007E8AE7 /* qgslabelpreview.h */,
727DEA18124F9B9200497454 /* qgsfeatureaction.cpp */,
727DEA19124F9B9200497454 /* qgsfeatureaction.h */,
72A239420F74A62200AFC35B /* attributetable */,
7209E5BD0F39E57A003DC336 /* composer */,
72AF7B3010F8F02100BD549A /* gps */,
Expand Down Expand Up @@ -12085,6 +12080,7 @@
7209EF560F39E5D9003DC336 /* mIconProperties.png */,
7209EF570F39E5D9003DC336 /* mIconPyramid.png */,
7209EF580F39E5D9003DC336 /* mIconSymbology.png */,
72728C43124519B90077E591 /* mIconTableLayer.png */,
7209EF590F39E5D9003DC336 /* mIconUnknownLayerType.png */,
7209EF5A0F39E5D9003DC336 /* mIconWaitingForLayerType.png */,
7209EF5B0F39E5D9003DC336 /* mMapserverExport.png */,
Expand Down Expand Up @@ -12353,18 +12349,6 @@
72EA46F50FCD77CB009D4CFB /* qgis_xh.ts */,
7209EFF30F39E5DA003DC336 /* qgis_zh_CN.ts */,
7209EFF40F39E5DA003DC336 /* qgis_zh_TW.ts */,
7209EFF50F39E5DA003DC336 /* qt_ar.ts */,
7209EFF60F39E5DA003DC336 /* qt_de.ts */,
7209EFF70F39E5DA003DC336 /* qt_es.ts */,
7209EFF80F39E5DA003DC336 /* qt_fr.ts */,
7209EFF90F39E5DA003DC336 /* qt_ja_jp.ts */,
7209EFFA0F39E5DA003DC336 /* qt_pl.ts */,
7209EFFB0F39E5DA003DC336 /* qt_pt.ts */,
7209EFFC0F39E5DA003DC336 /* qt_ru.ts */,
7209EFFD0F39E5DA003DC336 /* qt_sk.ts */,
7209EFFE0F39E5DA003DC336 /* qt_sv.ts */,
7209EFFF0F39E5DA003DC336 /* qt_zh_CN.ts */,
7209F0000F39E5DA003DC336 /* qt_zh_TW.ts */,
);
name = i18n;
path = ../../i18n;
Expand Down Expand Up @@ -18437,6 +18421,8 @@
7233D9871218E6A200C34505 /* qgsmaptoolselectrectangle.cpp in Sources */,
7233D9881218E6A200C34505 /* qgsmaptoolselectrectangle.h in Sources */,
7233D9891218E6A200C34505 /* qgsmaptoolselectutils.cpp in Sources */,
727DEA1A124F9BDE00497454 /* qgsfeatureaction.cpp in Sources */,
727DEA1B124F9BDE00497454 /* qgsfeatureaction.h in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -21817,6 +21803,7 @@
"$(QT_INC)",
"$(FCGI_INC)",
"$(GDAL_INC)",
"$(GEOS_INC)",
);
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
MACH_O_TYPE = mh_execute;
Expand Down Expand Up @@ -21859,6 +21846,7 @@
"$(QT_INC)",
"$(FCGI_INC)",
"$(GDAL_INC)",
"$(GEOS_INC)",
);
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
MACH_O_TYPE = mh_execute;
Expand Down
19 changes: 8 additions & 11 deletions mac/xcode/ReadMe.rtf
View file
Expand Up @@ -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.5.0 2010-1-16\
\i \cf0 2.6.1 2010-9-26\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\i0 \cf0 \
Expand Down Expand Up @@ -60,12 +60,9 @@ See the Qgis {\field{\*\fldinst{HYPERLINK "http://wiki.qgis.org/qgiswiki/Buildin
\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).\
\
\ul Expat library\ulnone - Leopard and above includes expat. The one in X11 should work on Tiger, but I prefer to avoid X11 dependencies.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\cf0 \ul \ulc0 Fcgi library\ulnone - Leopard and above includes fcgi. Must be compiled from source for earlier systems.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\cf0 \
\
\ul Fcgi library\ulnone - Leopard and above includes fcgi. Must be compiled from source for earlier systems.\
\
\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.\
\
\ul gpsbabel\ulnone (optional) - for the GPS Import plugin. A universal gpsbabel is available from gpsbabel.org.\
Expand Down Expand Up @@ -99,11 +96,11 @@ 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 a universal build, with the Leopard (10.5) SDK.\
The default configuration is for a native build, with the Leopard (10.5) SDK.\
\
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.\
\
By default, Qt and the Postgres client library are bundled in the Qgis application.\
By default, Qt, Qwt and the Postgres client library are bundled in the Qgis application.\
\
\ul Minimal Config\ulnone \
\
Expand Down Expand Up @@ -139,13 +136,13 @@ 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 universal to match the SDK used. Uncomment and set ARCHS if you want a single arch. This is a
\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
\i space-separated
\i0 list.\
\

\f1\fs20 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
\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
\i semicolon-separated
\i0 list.\
\
Expand Down
10 changes: 6 additions & 4 deletions mac/xcode/qgis_settings.xcconfig
View file
@@ -1,14 +1,14 @@
// QGIS Xcode project common build settings

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

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

//////////////////////////////////////////////////////////////////////
// QGIS version info & config
Expand Down Expand Up @@ -170,6 +170,7 @@ SDKROOT_snow = /Developer/SDKs/MacOSX10.6.sdk
ARCHS_tig = ppc i386
ARCHS_leo = ppc i386
ARCHS_snow = i386 x86_64
UNIVERSAL = $(ARCHS_$(SDKSYS))

SDKROOT = $(SDKROOT_$(SDKSYS))
SYMROOT = build/$(SDKSYS)
Expand Down Expand Up @@ -413,6 +414,7 @@ PYTHON_FORM_snow = system
ARCHS_P_tig = ppc;i386
ARCHS_P_leo = ppc;i386
ARCHS_P_snow = i386;x86_64
UNIVERSAL_P = $(ARCHS_P_$(SDKSYS))

PYTHON_PREFIX_fw = /Library/Frameworks/Python.framework
PYTHON_PREFIX_system = /System/Library/Frameworks/Python.framework
Expand Down
13 changes: 8 additions & 5 deletions mac/xcode/qgis_user-template.xcconfig
View file
@@ -1,7 +1,8 @@
// QGIS Xcode project common build settings

// CURRENT_PROJECT_VERSION = 2.5.0
// CURRENT_PROJECT_VERSION = 2.6.1

//////////////////////////////////////////////////////////////////////
// duplicate this file as qgis_user.xcconfig.
// uncomment settings in qgis_user.xcconfig to override defaults
// in qgis_settings.xcconfig.
Expand All @@ -10,11 +11,13 @@

// 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

// python archs use ; separator, must match what's in ARCHS
//ARCHS_P = $(ARCH_P_$(SDKSYS)) // in the form arch1;arch2;...
// default to native; space-separated list, ppc i386 ppc64 x86_64
//ARCHS = $(UNIVERSAL) // use this for universal multiarch build

// python archs, default same as ARCHS, must match what's in ARCHS
// use ; separator
//ARCHS_P = $(UNIVERSAL_P) // use this for universal multiarch build

//////////////////////////////////////////////////////////////////////
// Qt and other support
Expand Down

0 comments on commit ac843ef

Please sign in to comment.