separate QTDIR and QTBIN settings

git-svn-id: http://svn.osgeo.org/qgis/trunk@10226 c8812cc2-4d05-0410-92ff-de0c093fc19c

mac/xcode/Qgis.xcodeproj/project.pbxproj

@@ -13895,7 +13895,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			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";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

mac/xcode/qgis_settings.xcconfig

@@ -18,7 +18,7 @@ QGIS_RELEASE_NAME = Unstable-trunk
 QGIS_VERSION_MAJOR = 1
 QGIS_VERSION_MINOR = 1
 QGIS_VERSION_PATCH = 0
-QGIS_VERSION_BUILD = 20090221
+QGIS_VERSION_BUILD = 20090223
 QGIS_VERSION_FULL = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR).$(QGIS_VERSION_PATCH)-$(QGIS_VERSION_BUILD)
 QGIS_VERSION_INT = 10100
 
@@ -36,11 +36,12 @@ LIBQGIS_VERSION_COMPAT = $(LIBQGIS_VERSION_MAJOR).0
 QT_FWVER = 4 // the Versions/ folder name
 QT_MVER = 4 // the install_name version
 
-QTDIR = /Developer/Tools/Qt
+QTDIR = /Developer/Applications/Qt
-QTMOC = $(QTDIR)/moc
+QTBIN = /Developer/Tools/Qt
-QTUIC = $(QTDIR)/uic
+QTMOC = $(QTBIN)/moc
-QTRCC = $(QTDIR)/rcc
+QTUIC = $(QTBIN)/uic
-QTLREL = $(QTDIR)/lrelease
+QTRCC = $(QTBIN)/rcc
+QTLREL = $(QTBIN)/lrelease
 BISON = /usr/bin/bison
 GPSBABEL = /usr/local/bin/gpsbabel
 SIP_system = /usr/local/bin/sip

mac/xcode/qgis_user-template.xcconfig

@@ -4,6 +4,7 @@
 // uncomment settings in qgis_user.xcconfig to override defaults
 //   in qgis_settings.xcconfig.
 // commented values values shown here are defaults
+// there is no need to set *everything* here.
 
 //SDKSYS =  // tig (Tiger), leo (Leopard), [empty] (native)
 //ARCHS = $(NATIVE_ARCH) // default
@@ -13,7 +14,11 @@
 // Qt and other support
 //////////////////////////////////////////////////////////////////////
 
-//QTDIR = /Developer/Tools/Qt // bin dir
+//QT_FWVER = 4 // the Versions/ folder name
+//QT_MVER = 4 // the install_name version
+
+//QTDIR = /Developer/Applications/Qt // Qt apps and plugins
+//QTBIN = /Developer/Tools/Qt // bin dir
 //BISON = /usr/bin/bison // Tiger requires user-installed bison 2.3
 //GPSBABEL = /usr/local/bin/gpsbabel
 //SIP_system = /usr/local/bin/sip
@@ -33,7 +38,6 @@
 //PROJ_FORM = fw // fw or shared
 //GEOS_FORM = fw // fw or shared
 
-// system sqlite3 only on Tiger+
 //SQLITE_FORM = fw // fw, system, static or shared
 
 //GSL_FORM = shared // static or shared
@@ -61,38 +65,18 @@
 //BUNDLE_PGSQL = YES
 //BUNDLE_GPSBABEL = YES
 
-// no need to bundle frameworks
+// frameworks not bundled
-//BUNDLE_GDAL = NO
+//BUNDLE_GDAL = YES
-//BUNDLE_GEOS = NO
+//BUNDLE_GEOS = YES
-//BUNDLE_PROJ = NO
+//BUNDLE_PROJ = YES
-//BUNDLE_SQLITE = NO
+//BUNDLE_SQLITE = YES
 
 //////////////////////////////////////////////////////////////////////
-// above is the most that might need to be changed to handle
-// most common cases
 //////////////////////////////////////////////////////////////////////
-
+//// above is the most that might need to be changed to handle    ////
+//// most common cases                                            ////
 //////////////////////////////////////////////////////////////////////
-// support library versions
-//   if shared libraries are bundled, need to change install_names
-//   and need to know library version as it currently is specified
-//   in the library
-//   check a library version with otool -L /path/to/library
 //////////////////////////////////////////////////////////////////////
-// ***** need to figure out install_names in script
-
-//GSL_LIBVER = 0
-//PGSQL_LIBVER = 5
-//QT_FWVER = 4 // the Versions/ folder name
-//QT_MVER = 4 // the install_name version
-
-// these only need to be checked for unix forms
-// since bundling is not set up yet for these, ignore them
-//GDAL_LIBVER = 12
-//PROJ_LIBVER = 4
-//GEOS_LIBVER = 2
-//GEOSC_LIBVER = 1 // GEOS has 2 libs, diff versions
-//SQLITE_LIBVER = 0
 
 //////////////////////////////////////////////////////////////////////
 // locations of user forms of dependencies
@@ -107,16 +91,15 @@
 
 //GSL_PREFIX = /usr/local
 
-// this must match exactly how GRASS was *built*, not where it is currently
+// This must match exactly how GRASS was built and installed.
-// installed, if it was moved.  ie GRASS.app must be directly in /Applications
+// If it was moved or renamed, qgis GRASS plugin will not work.
-// prefix is the equivalent of the GRASS GISBASE
+// Prefix is the equivalent of the GRASS GISBASE
 //GRASS_PREFIX_app = /Applications/GRASS-$(GRASS_VERSION).app/Contents/MacOS
 //GRASS_PREFIX_unix = /usr/local/grass-$(GRASS_VERSION)
 
 //EXPAT_PREFIX = /usr/local // not used for system expat
 
-// unix SQLite defaults to system, but that's Tiger+ -only
+// unix SQLite defaults to system
-//   use custom unix build for Panther-compatibility
 //SQLITE_PREFIX_shared = /usr
 
 //PGSQL_PREFIX = /usr/local/pgsql