Skip to content

Commit 7ee86b8

Browse files
author
kyngchaos
committedFeb 24, 2009
separate QTDIR and QTBIN settings
git-svn-id: http://svn.osgeo.org/qgis/trunk@10226 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 818b728 commit 7ee86b8

File tree

3 files changed

+25
-41
lines changed

3 files changed

+25
-41
lines changed
 

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13895,7 +13895,7 @@
1389513895
);
1389613896
runOnlyForDeploymentPostprocessing = 0;
1389713897
shellPath = /bin/sh;
13898-
shellScript = "# Note: assmes default Qt binary framework install\n\nqtlistqg=\"Qt3Support QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit\"\n#QtAssistant QtOpenGL QtScript QtTest\"\npyqtlist=\"Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit\"\n#qgliblist=\"libqgis_core libqgis_gui libqgisgrass libqgispython\"\n\nAPPDIRC=\"$QGIS_BUILD_PATH\" # app contents\nAPPDIR=\"$APPDIRC/MacOS\"\nFWDIR=\"$APPDIR/$QGIS_FW_SUBDIR\"\nLIBDIR=\"$APPDIR/$QGIS_LIB_SUBDIR\"\nQGISPYDIR=\"$APPDIR/$QGIS_DATA_SUBDIR/python\"\n\n# copy Qt frameworks\nmkdir -p \"$FWDIR\"\nfor q in $qtlistqg\ndo\n\tif [ ! -d \"$FWDIR/$q.framework\" ] ; then\n\t\tcp -Rf \"/Library/Frameworks/$q.framework\" \"$FWDIR\"\n\t\trm -f \"$FWDIR/$q.framework/$q.prl\"\n\t\t# Qt headers might be useful?\n\t\trm -f \"$FWDIR/$q.framework/Headers\"\n\t\trm -Rf \"$FWDIR/$q.framework/Versions/$QT_FWVER/Headers\"\n\tfi\ndone\n\n# copy Qt plugins\nmkdir -p \"$APPDIRC/PlugIns/imageformats\"\nif [ ! -f \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\" ] ; then\n\tcp -f \"/Developer/Applications/Qt/plugins/imageformats/libqjpeg.dylib\" \"$APPDIRC/PlugIns/imageformats/\"\nfi\n\n# PyQt path based on PYTHON_FORM\nif [ \"$PYTHON_FORM\" = \"fw\" ] ; then\n\tPYSITE=\"/Library/Frameworks/Python.framework/Versions/$PYTHON_VERSION/lib/python$PYTHON_VERSION/site-packages\"\nelif [ \"$PYTHON_FORM\" = \"system\" ] ; then\n\tPYSITE=\"/Library/Python/$PYTHON_VERSION/site-packages\"\nelse\n\tPYSITE=\"\"\nfi\n\nif [ \"$PYSITE\" ] ; then\n\tmkdir -p \"$QGISPYDIR/PyQt$QT_FWVER\"\n\tif [ ! -f \"$QGISPYDIR/sip.so\" ] ; then\n\t\tcp -f \"$PYSITE/sip.so\" \"$PYSITE/sipconfig.py\" \"$QGISPYDIR/\"\n\tfi\n\tfor q in $pyqtlist\n\tdo\n\t\tif [ ! -f \"$QGISPYDIR/PyQt$QT_FWVER/$q.so\" ] ; then\n\t\t\tcp -f \"$PYSITE/PyQt$QT_FWVER/$q.so\" \"$QGISPYDIR/PyQt$QT_FWVER/\"\n\t\tfi\n\tdone\n\tcp -f \"$PYSITE/PyQt$QT_FWVER/\"*.py \"$QGISPYDIR/PyQt$QT_FWVER/\"\nfi\n\n# just in case no plugins were compiled\nmkdir -p \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\n# list plugins & libs\ncd \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\npluglist=`ls`\ncd \"$APPDIR/$QGIS_LIB_SUBDIR\"\nqgliblist=`ls *.dylib`\n\n# main Qt framework loop\n\ncd \"$APPDIR\"\n\nfor q in $qtlistqg\ndo\n\tqq=\"$q.framework/Versions/$QT_FWVER/$q\"\n\t# app\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/Qgis\"\n\t# bin\n\t# qgis_help qt linking done with symlinks\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_BIN_SUBDIR/qgis_help.app/Contents/MacOS/qgis_help\"\n\t# libs\n\tfor ql in $qgliblist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_LIB_SUBDIR/$ql\"\n\tdone\n\t# plugins\n\tfor qp in $pluglist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_PLUGIN_SUBDIR/$qp\"\n\tdone\n\t# qt fw\n\tfor qf in $qtlistqg\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_FW_SUBDIR/$qf.framework/Versions/$QT_FWVER/$qf\"\n\tdone\n\t# qt plugs\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\"\n\t# PyQt\n\tfor pq in $pyqtlist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/PyQt$QT_FWVER/$pq.so\"\n\tdone\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/qgis/core.so\"\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/qgis/gui.so\"\ndone\n";
13898+
shellScript = "# Note: assmes default Qt binary framework install\n\nqtlistqg=\"Qt3Support QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit\"\n#QtAssistant QtOpenGL QtScript QtTest\"\npyqtlist=\"Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtWebKit\"\n#qgliblist=\"libqgis_core libqgis_gui libqgisgrass libqgispython\"\n\nAPPDIRC=\"$QGIS_BUILD_PATH\" # app contents\nAPPDIR=\"$APPDIRC/MacOS\"\nFWDIR=\"$APPDIR/$QGIS_FW_SUBDIR\"\nLIBDIR=\"$APPDIR/$QGIS_LIB_SUBDIR\"\nQGISPYDIR=\"$APPDIR/$QGIS_DATA_SUBDIR/python\"\n\n# copy Qt frameworks\nmkdir -p \"$FWDIR\"\nfor q in $qtlistqg\ndo\n\tif [ ! -d \"$FWDIR/$q.framework\" ] ; then\n\t\tcp -Rf \"/Library/Frameworks/$q.framework\" \"$FWDIR\"\n\t\trm -f \"$FWDIR/$q.framework/$q.prl\"\n\t\t# Qt headers might be useful?\n\t\trm -f \"$FWDIR/$q.framework/Headers\"\n\t\trm -Rf \"$FWDIR/$q.framework/Versions/$QT_FWVER/Headers\"\n\tfi\ndone\n\n# copy Qt plugins\nmkdir -p \"$APPDIRC/PlugIns/imageformats\"\nif [ ! -f \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\" ] ; then\n\tcp -f \"$QTDIR/plugins/imageformats/libqjpeg.dylib\" \"$APPDIRC/PlugIns/imageformats/\"\nfi\n\n# PyQt path based on PYTHON_FORM\nif [ \"$PYTHON_FORM\" = \"fw\" ] ; then\n\tPYSITE=\"/Library/Frameworks/Python.framework/Versions/$PYTHON_VERSION/lib/python$PYTHON_VERSION/site-packages\"\nelif [ \"$PYTHON_FORM\" = \"system\" ] ; then\n\tPYSITE=\"/Library/Python/$PYTHON_VERSION/site-packages\"\nelse\n\tPYSITE=\"\"\nfi\n\nif [ \"$PYSITE\" ] ; then\n\tmkdir -p \"$QGISPYDIR/PyQt$QT_FWVER\"\n\tif [ ! -f \"$QGISPYDIR/sip.so\" ] ; then\n\t\tcp -f \"$PYSITE/sip.so\" \"$PYSITE/sipconfig.py\" \"$QGISPYDIR/\"\n\tfi\n\tfor q in $pyqtlist\n\tdo\n\t\tif [ ! -f \"$QGISPYDIR/PyQt$QT_FWVER/$q.so\" ] ; then\n\t\t\tcp -f \"$PYSITE/PyQt$QT_FWVER/$q.so\" \"$QGISPYDIR/PyQt$QT_FWVER/\"\n\t\tfi\n\tdone\n\tcp -f \"$PYSITE/PyQt$QT_FWVER/\"*.py \"$QGISPYDIR/PyQt$QT_FWVER/\"\nfi\n\n# just in case no plugins were compiled\nmkdir -p \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\n# list plugins & libs\ncd \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\npluglist=`ls`\ncd \"$APPDIR/$QGIS_LIB_SUBDIR\"\nqgliblist=`ls *.dylib`\n\n# main Qt framework loop\n\ncd \"$APPDIR\"\n\nfor q in $qtlistqg\ndo\n\tqq=\"$q.framework/Versions/$QT_FWVER/$q\"\n\t# app\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/Qgis\"\n\t# bin\n\t# qgis_help qt linking done with symlinks\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_BIN_SUBDIR/qgis_help.app/Contents/MacOS/qgis_help\"\n\t# libs\n\tfor ql in $qgliblist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_LIB_SUBDIR/$ql\"\n\tdone\n\t# plugins\n\tfor qp in $pluglist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_PLUGIN_SUBDIR/$qp\"\n\tdone\n\t# qt fw\n\tfor qf in $qtlistqg\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIR/$QGIS_FW_SUBDIR/$qf.framework/Versions/$QT_FWVER/$qf\"\n\tdone\n\t# qt plugs\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\"\n\t# PyQt\n\tfor pq in $pyqtlist\n\tdo\n\t\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/PyQt$QT_FWVER/$pq.so\"\n\tdone\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/qgis/core.so\"\n\tinstall_name_tool -change $qq @executable_path/$QGIS_FW_SUBDIR/$qq \"$QGISPYDIR/qgis/gui.so\"\ndone\n";
1389913899
showEnvVarsInLog = 0;
1390013900
};
1390113901
/* End PBXShellScriptBuildPhase section */

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ QGIS_RELEASE_NAME = Unstable-trunk
1818
QGIS_VERSION_MAJOR = 1
1919
QGIS_VERSION_MINOR = 1
2020
QGIS_VERSION_PATCH = 0
21-
QGIS_VERSION_BUILD = 20090221
21+
QGIS_VERSION_BUILD = 20090223
2222
QGIS_VERSION_FULL = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR).$(QGIS_VERSION_PATCH)-$(QGIS_VERSION_BUILD)
2323
QGIS_VERSION_INT = 10100
2424

@@ -36,11 +36,12 @@ LIBQGIS_VERSION_COMPAT = $(LIBQGIS_VERSION_MAJOR).0
3636
QT_FWVER = 4 // the Versions/ folder name
3737
QT_MVER = 4 // the install_name version
3838

39-
QTDIR = /Developer/Tools/Qt
40-
QTMOC = $(QTDIR)/moc
41-
QTUIC = $(QTDIR)/uic
42-
QTRCC = $(QTDIR)/rcc
43-
QTLREL = $(QTDIR)/lrelease
39+
QTDIR = /Developer/Applications/Qt
40+
QTBIN = /Developer/Tools/Qt
41+
QTMOC = $(QTBIN)/moc
42+
QTUIC = $(QTBIN)/uic
43+
QTRCC = $(QTBIN)/rcc
44+
QTLREL = $(QTBIN)/lrelease
4445
BISON = /usr/bin/bison
4546
GPSBABEL = /usr/local/bin/gpsbabel
4647
SIP_system = /usr/local/bin/sip

‎mac/xcode/qgis_user-template.xcconfig

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// uncomment settings in qgis_user.xcconfig to override defaults
55
// in qgis_settings.xcconfig.
66
// commented values values shown here are defaults
7+
// there is no need to set *everything* here.
78

89
//SDKSYS = // tig (Tiger), leo (Leopard), [empty] (native)
910
//ARCHS = $(NATIVE_ARCH) // default
@@ -13,7 +14,11 @@
1314
// Qt and other support
1415
//////////////////////////////////////////////////////////////////////
1516

16-
//QTDIR = /Developer/Tools/Qt // bin dir
17+
//QT_FWVER = 4 // the Versions/ folder name
18+
//QT_MVER = 4 // the install_name version
19+
20+
//QTDIR = /Developer/Applications/Qt // Qt apps and plugins
21+
//QTBIN = /Developer/Tools/Qt // bin dir
1722
//BISON = /usr/bin/bison // Tiger requires user-installed bison 2.3
1823
//GPSBABEL = /usr/local/bin/gpsbabel
1924
//SIP_system = /usr/local/bin/sip
@@ -33,7 +38,6 @@
3338
//PROJ_FORM = fw // fw or shared
3439
//GEOS_FORM = fw // fw or shared
3540

36-
// system sqlite3 only on Tiger+
3741
//SQLITE_FORM = fw // fw, system, static or shared
3842

3943
//GSL_FORM = shared // static or shared
@@ -61,38 +65,18 @@
6165
//BUNDLE_PGSQL = YES
6266
//BUNDLE_GPSBABEL = YES
6367

64-
// no need to bundle frameworks
65-
//BUNDLE_GDAL = NO
66-
//BUNDLE_GEOS = NO
67-
//BUNDLE_PROJ = NO
68-
//BUNDLE_SQLITE = NO
68+
// frameworks not bundled
69+
//BUNDLE_GDAL = YES
70+
//BUNDLE_GEOS = YES
71+
//BUNDLE_PROJ = YES
72+
//BUNDLE_SQLITE = YES
6973

7074
//////////////////////////////////////////////////////////////////////
71-
// above is the most that might need to be changed to handle
72-
// most common cases
7375
//////////////////////////////////////////////////////////////////////
74-
76+
//// above is the most that might need to be changed to handle ////
77+
//// most common cases ////
7578
//////////////////////////////////////////////////////////////////////
76-
// support library versions
77-
// if shared libraries are bundled, need to change install_names
78-
// and need to know library version as it currently is specified
79-
// in the library
80-
// check a library version with otool -L /path/to/library
8179
//////////////////////////////////////////////////////////////////////
82-
// ***** need to figure out install_names in script
83-
84-
//GSL_LIBVER = 0
85-
//PGSQL_LIBVER = 5
86-
//QT_FWVER = 4 // the Versions/ folder name
87-
//QT_MVER = 4 // the install_name version
88-
89-
// these only need to be checked for unix forms
90-
// since bundling is not set up yet for these, ignore them
91-
//GDAL_LIBVER = 12
92-
//PROJ_LIBVER = 4
93-
//GEOS_LIBVER = 2
94-
//GEOSC_LIBVER = 1 // GEOS has 2 libs, diff versions
95-
//SQLITE_LIBVER = 0
9680

9781
//////////////////////////////////////////////////////////////////////
9882
// locations of user forms of dependencies
@@ -107,16 +91,15 @@
10791

10892
//GSL_PREFIX = /usr/local
10993

110-
// this must match exactly how GRASS was *built*, not where it is currently
111-
// installed, if it was moved. ie GRASS.app must be directly in /Applications
112-
// prefix is the equivalent of the GRASS GISBASE
94+
// This must match exactly how GRASS was built and installed.
95+
// If it was moved or renamed, qgis GRASS plugin will not work.
96+
// Prefix is the equivalent of the GRASS GISBASE
11397
//GRASS_PREFIX_app = /Applications/GRASS-$(GRASS_VERSION).app/Contents/MacOS
11498
//GRASS_PREFIX_unix = /usr/local/grass-$(GRASS_VERSION)
11599

116100
//EXPAT_PREFIX = /usr/local // not used for system expat
117101

118-
// unix SQLite defaults to system, but that's Tiger+ -only
119-
// use custom unix build for Panther-compatibility
102+
// unix SQLite defaults to system
120103
//SQLITE_PREFIX_shared = /usr
121104

122105
//PGSQL_PREFIX = /usr/local/pgsql

0 commit comments

Comments
 (0)
Please sign in to comment.