Skip to content

Commit 9018bc4

Browse files
author
kyngchaos
committed
missed some installed headers; clarify some dependency requirements
git-svn-id: http://svn.osgeo.org/qgis/trunk@10760 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e2c57ec commit 9018bc4

File tree

2 files changed

+40
-15
lines changed

2 files changed

+40
-15
lines changed

mac/xcode/Qgis.xcodeproj/project.pbxproj

+21-3
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
/* End PBXAggregateTarget section */
134134

135135
/* Begin PBXBuildFile section */
136-
720382E00F8B86070083B883 /* qgstolerance.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F8D9420F8924F100D10CE5 /* qgstolerance.h */; };
136+
720382E00F8B86070083B883 /* qgstolerance.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F8D9420F8924F100D10CE5 /* qgstolerance.h */; settings = {ATTRIBUTES = (Public, ); }; };
137137
7203830A0F8B8C8F0083B883 /* qgscentralpointpositionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383000F8B8C2D0083B883 /* qgscentralpointpositionmanager.cpp */; };
138138
7203830B0F8B8C8F0083B883 /* qgsoverlayobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383080F8B8C2D0083B883 /* qgsoverlayobject.cpp */; };
139139
7203830C0F8B8C8F0083B883 /* qgspalobjectpositionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720383050F8B8C2D0083B883 /* qgspalobjectpositionmanager.cpp */; };
@@ -1046,10 +1046,10 @@
10461046
7262ED9E0F7A777700498385 /* qgsspatialiteprovider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7262ED8E0F7A767400498385 /* qgsspatialiteprovider.cpp */; };
10471047
7262ED9F0F7A777700498385 /* qgsspatialiteprovider.h in Sources */ = {isa = PBXBuildFile; fileRef = 7262ED8F0F7A767400498385 /* qgsspatialiteprovider.h */; };
10481048
7262EDCD0F7A9FFC00498385 /* qgsspatialitetablemodel.h in Sources */ = {isa = PBXBuildFile; fileRef = 7262ED7F0F7A74B700498385 /* qgsspatialitetablemodel.h */; };
1049-
7268D7B70F9695AA00CA1705 /* qgscentralpointpositionmanager.h in Headers */ = {isa = PBXBuildFile; fileRef = 720383010F8B8C2D0083B883 /* qgscentralpointpositionmanager.h */; };
1049+
7268D7B70F9695AA00CA1705 /* qgscentralpointpositionmanager.h in Headers */ = {isa = PBXBuildFile; fileRef = 720383010F8B8C2D0083B883 /* qgscentralpointpositionmanager.h */; settings = {ATTRIBUTES = (Public, ); }; };
10501050
7268D7B80F9695AA00CA1705 /* qgsoverlayobjectpositionmanager.h in Headers */ = {isa = PBXBuildFile; fileRef = 720383060F8B8C2D0083B883 /* qgsoverlayobjectpositionmanager.h */; };
10511051
7268D7B90F9695AA00CA1705 /* qgspalobjectpositionmanager.h in Headers */ = {isa = PBXBuildFile; fileRef = 720383040F8B8C2D0083B883 /* qgspalobjectpositionmanager.h */; };
1052-
7268D7BA0F9695AA00CA1705 /* qgsvectoroverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 720383020F8B8C2D0083B883 /* qgsvectoroverlay.h */; };
1052+
7268D7BA0F9695AA00CA1705 /* qgsvectoroverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 720383020F8B8C2D0083B883 /* qgsvectoroverlay.h */; settings = {ATTRIBUTES = (Public, ); }; };
10531053
726979A80F7136D700AFA402 /* qgsnewogrconnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 726979A20F71369A00AFA402 /* qgsnewogrconnection.cpp */; };
10541054
726979A90F7136D800AFA402 /* qgsogrhelperfunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 726979A40F71369A00AFA402 /* qgsogrhelperfunctions.cpp */; };
10551055
726979AA0F7136D800AFA402 /* qgsopenvectorlayerdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 726979A60F71369A00AFA402 /* qgsopenvectorlayerdialog.cpp */; };
@@ -8649,6 +8649,7 @@
86498649
72FB54C60FAF3A5D00AB2F8D /* qgsattributetabledelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsattributetabledelegate.h; path = ../../src/app/attributetable/qgsattributetabledelegate.h; sourceTree = SOURCE_ROOT; };
86508650
72FB54C70FAF3A5D00AB2F8D /* qgsattributetableidcolumnpair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsattributetableidcolumnpair.cpp; path = ../../src/app/attributetable/qgsattributetableidcolumnpair.cpp; sourceTree = SOURCE_ROOT; };
86518651
72FB54C80FAF3A5D00AB2F8D /* qgsattributetablefiltermodel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsattributetablefiltermodel.cpp; path = ../../src/app/attributetable/qgsattributetablefiltermodel.cpp; sourceTree = SOURCE_ROOT; };
8652+
72FDF1640FB4720400580178 /* DONORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DONORS; path = ../../DONORS; sourceTree = SOURCE_ROOT; };
86528653
8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
86538654
/* End PBXFileReference section */
86548655

@@ -9016,6 +9017,7 @@
90169017
7256F2E40F4147890022BE1F /* CODING */,
90179018
7256F2E30F4147890022BE1F /* CONTRIBUTORS */,
90189019
7256F2E20F4147890022BE1F /* COPYING */,
9020+
72FDF1640FB4720400580178 /* DONORS */,
90199021
7256F2E00F4147890022BE1F /* INSTALL */,
90209022
7256F2DF0F4147890022BE1F /* PROVENANCE */,
90219023
7256F2DE0F4147890022BE1F /* README */,
@@ -13898,6 +13900,7 @@
1389813900
buildConfigurationList = C0E91AC508A95435008D54AB /* Build configuration list for PBXNativeTarget "Qgis" */;
1389913901
buildPhases = (
1390013902
7209F5A60F3A54E1003DC336 /* Headers */,
13903+
722E163C0FB4E95F00DA3CCA /* Script - install ui headers */,
1390113904
8D0C4E8C0486CD37000505A6 /* Resources */,
1390213905
8D0C4E8F0486CD37000505A6 /* Sources */,
1390313906
8D0C4E910486CD37000505A6 /* Frameworks */,
@@ -14074,6 +14077,21 @@
1407414077
shellScript = "# generate ui headers in separate script because:\n# 1. Xcode will attempt to process generated *.h with moc rule\n# 2. parallel processing might not finish ui's before a cpp source needs it\n\n# derived sources dir created by Compile Sources phase, we need it NOW\nmkdir -p \"$DERIVED_FILES_DIR\"\n\ncd ../../src/plugins/$TARGET_PLUGINDIR\n\nUIUI=`ls *.ui`\n\nfor u in $UIUI\ndo\n\tuh=`echo $u | sed 's,\\.ui$,.h,'`\n\t# compare times because output files spec below doesn't seem to work with wildcards\n\tif [ ! -f \"$DERIVED_FILES_DIR/ui_$uh\" ] || [ $u -nt \"$DERIVED_FILES_DIR/ui_$uh\" ] ; then\n\t\trm -f \"$DERIVED_FILES_DIR/ui_$uh\"\n\t\techo \"$QTUIC -o \\\"$DERIVED_FILES_DIR/ui_$uh\\\" $u\"\n\t\t$QTUIC -o \"$DERIVED_FILES_DIR/ui_$uh\" $u\n\tfi\ndone\n\nexit 0\n";
1407514078
showEnvVarsInLog = 0;
1407614079
};
14080+
722E163C0FB4E95F00DA3CCA /* Script - install ui headers */ = {
14081+
isa = PBXShellScriptBuildPhase;
14082+
buildActionMask = 2147483647;
14083+
files = (
14084+
);
14085+
inputPaths = (
14086+
);
14087+
name = "Script - install ui headers";
14088+
outputPaths = (
14089+
);
14090+
runOnlyForDeploymentPostprocessing = 0;
14091+
shellPath = /bin/sh;
14092+
shellScript = "GUI_UI=\"$TARGET_TEMP_DIR/../qgis_gui.build/DerivedSources\"\n\nfor u in qgsdetaileditemwidgetbase qgsgenericprojectionselectorbase qgsmessageviewer qgsprojectionselectorbase\ndo\n\tcp -f \"$GUI_UI/ui_$u.h\" \"$QGIS_BUILD_PATH/Headers/qgis/\"\ndone\n";
14093+
showEnvVarsInLog = 0;
14094+
};
1407714095
7256F1530F4105770022BE1F /* configure.py */ = {
1407814096
isa = PBXShellScriptBuildPhase;
1407914097
buildActionMask = 2147483647;

mac/xcode/ReadMe.rtf

+19-12
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.1.7 2009-4-22\
13+
\i \cf0 2.1.7 2009-5-8\
1414
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
1515
1616
\i0 \cf0 \
@@ -32,7 +32,7 @@ Dependent libraries are optionally copied into the application bundle and embedd
3232
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
3333
3434
\b0 \cf0 \
35-
See the Qgis installation document for details on obtaining the requirements.\
35+
See the Qgis {\field{\*\fldinst{HYPERLINK "http://wiki.qgis.org/qgiswiki/BuildingFromSource"}}{\fldrslt installation document}} for details on obtaining the requirements. All optional items below are required for the default \ul Full QGIS\ulnone build target.\
3636
\
3737
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
3838
\cf0 \ul \ulc0 Xcode 2.5\ulnone - This also makes Mac OS 10.4 a requirement.\
@@ -55,17 +55,17 @@ See the Qgis installation document for details on obtaining the requirements.\
5555
\
5656
\ul Postgres client library\ulnone (optional) - normally available in a full Postgres installation.\
5757
\
58-
\ul SQLite3 library\ulnone - OSX includes SQLite 3, or use a more recent SQLite framework, or compile from source.\
58+
\ul SQLite3 library\ulnone - OSX includes SQLite 3, or use a more recent SQLite framework (recommended), or compile from source.\
5959
\
60-
\ul Spatialite library\ulnone - Spatialite is included in the SQLite framework. Or compile from source (includes its own SQLite).\
60+
\ul Spatialite library\ulnone - Spatialite is included in the SQLite framework starting with 3.6.11. Or compile from source (includes its own SQLite).\
6161
\
6262
\ul Expat library\ulnone - Leopard includes expat. The one in X11 should work on Tiger, but I prefer to avoid X11 dependencies.\
6363
\
6464
\ul gpsbabel\ulnone (optional) - for the GPS Import plugin. A universal gpsbabel is available from gpsbabel.org.\
6565
\
66-
\ul Python 2.5\ulnone - the system Python on Leopard will work.\
66+
\ul Python 2.5\ulnone - the system Python on Leopard will work. Or install Python 2.5 from {\field{\*\fldinst{HYPERLINK "http://www.python.org/"}}{\fldrslt python.org}} (required for Tiger).\
6767
\
68-
\ul SIP\ulnone and \ul PyQt\ulnone \
68+
\ul SIP\ulnone and \ul PyQt\ulnone - make sure that they fully support the installed Qt version. Development versions may cause trouble for QGIS.\
6969
\
7070
\
7171
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
@@ -90,16 +90,24 @@ 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. Expat, Postgres and GSL are expected in default /usr/local builds. GRASS support is from a GRASS-6.4.app application. The python.org Python framework is used, even on Leopard.\
94-
\
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. Expat, Postgres and GSL are expected in default /usr/local builds. GRASS support is from a GRASS-6.4.app application. The python.org Python framework is used, even on Leopard.\
94+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
95+
\cf0 \
9596
By default, Qt, GSL, the Postgres client library are bundled in the Qgis application.\
97+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
98+
\cf0 \
99+
\ul Minimal Config\ulnone \
100+
\
101+
The only changes you may need to make for Leopard are: to use the system Python (PYTHON_FORM), and to use the system expat (EXPAT_FORM). See the xcconfig file for details.\
102+
\
103+
For Tiger, you need to set BISON (see below).\
96104
\
97105
\ul Build\ulnone - At the top are some basic build settings.\
98106
\
99107
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
100108

101109
\f1\fs20 \cf0 SDKSYS
102-
\f0\fs24 tells the project to use the 10.4 (tig) or 10.5 (leo) SDK. This will also build Qgis in a subfolder of the build folder - this is handy if you want to build once for Tiger (python.org Python) and once for Leopard (system Python) without overwriting either.\
110+
\f0\fs24 tells the project to use the 10.4 (tig) or 10.5 (leo) SDK, or none ([empty]). Using an SDK will also build Qgis in a subfolder of the build folder - this is handy if you want to build once for Tiger (python.org Python) and once for Leopard (system Python) without overwriting either.\
103111
\
104112
Note that there may be linking problems with the SDK for non-system libraries and frameworks. This is because the linker prefixes everything with the SDKROOT and indirectly linked libraries in non-standard locations (ie /usr/local) may not be found. If you encounter linking errors, you should add symlinks to the SDKROOT to those locations.\
105113
\
@@ -147,7 +155,7 @@ ln -s /Users/Shared/unix /Developer/SDKs/MacOSX10.4u.sdk/Users/Shared/unix
147155
\
148156

149157
\f1\fs20 SIP_system
150-
\f0\fs24 is the full path to the sip program when installed for the system Python on Leopard.\
158+
\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.\
151159
\
152160
\
153161
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
@@ -247,8 +255,7 @@ When finished building, The final \ul Qgis.app\ulnone is put in the
247255
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
248256
249257
\b0 \cf0 \
250-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
251-
\cf0 There are 2 "configurations" - \ul Release\ulnone and \ul Debug\ulnone . Use the Release configuration unless you have a need to debug Qgis.\
258+
There are 2 "configurations" - \ul Release\ulnone and \ul Debug\ulnone . Use the Release configuration unless you have a need to debug Qgis.\
252259
\
253260
The Debug configuration will use the debug version of Qt, if installed, but that is not required. To use the debug Qt frameworks, you must change a setting before starting the debugger: in the
254261
\b Executables

0 commit comments

Comments
 (0)