diff --git a/mac/Read Me (Mac).rtf b/mac/Read Me (Mac).rtf index 261f5790c2e..d9f38d6932b 100644 --- a/mac/Read Me (Mac).rtf +++ b/mac/Read Me (Mac).rtf @@ -1,11 +1,11 @@ -{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf470 +{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf480 \readonlydoc1{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fmodern\fcharset77 Courier; } {\colortbl;\red255\green255\blue255;} \margl1440\margr1440\vieww11100\viewh8700\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc -\f0\b\fs24 \cf0 QGIS 0.10.0 Release Notes for Macintosh +\f0\b\fs24 \cf0 QGIS 0.11.0 Release Notes for Macintosh \f1\b0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \cf0 \ @@ -44,22 +44,22 @@ The following libraries are included with this distribution of QGIS. If you have GDAL 1.5.1 (libgdal.1.dylib)\ GEOS 3.0.0 (libgeos.3.0.0.dylib)\ PROJ 4.6.0 (libproj.0.5.4.dylib)\ -SQLITE3 3.5.7 (libsqlite3.0.8.6.dylib)\ +SQLite 3.5.9 (libsqlite3.0.dylib)\ Xerces-C++ 2.8.0 (libxerces-c.28.0.dylib)\ -Qt/Mac 4.3.4 (various Qt frameworks)\ +Qt/Mac 4.4.0 (various Qt frameworks)\ GIF 4.1.6 (libgif.4.1.6.dylib)\ JPEG 6b (libjpeg.62.0.0.dylib)\ -PNG 1.2.24 (libpng12.0.24.0.dylib)\ +PNG 1.2.29 (libpng12.0.dylib)\ TIFF 3.8.2 (libtiff.3.dylib)\ GeoTIFF 1.2.4 (libgeotiff.1.2.4.dylib)\ JasPer 1.900.1.uuid (libjasper.1.0.0.dylib)\ Expat 2.0.1 (libexpat.1.5.2.dylib)\ FFTW 3.1.2 (libfftw3.3.1.2.dylib)\ GSL 1.11 (libgsl.0.dylib, libgslcblas.0.dylib)\ -PostgreSQL 8.3.1 (libpq.5.1.dylib) This client can also access a version 7 server.\ -GRASS 6.3.0RC6 (libgrass_*.6.3.0RC6.dylib)\ -SIP 4.7.4 (sip.so)\ -PyQt4 4.3.3 (Qt*.so)\ +PostgreSQL 8.3.3 (libpq.5.1.dylib) This client can also access a version 7 server.\ +GRASS 6.3.0 (libgrass_*.6.3.0.dylib)\ +SIP 4.7.6 (sip.so)\ +PyQt4 4.4.2 (Qt*.so)\ \ \ \ @@ -90,7 +90,7 @@ The main window cannot be resized while a WMS layer is displayed. Therefore adju \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural -\f2 \cf0 ln -s /Applications/GPSBabel+-1.3.4/gpsbabel /usr/local/bin/gpsbabel\ +\f2 \cf0 ln -s /Applications/GPSBabel+-1.3.5/gpsbabel /usr/local/bin/gpsbabel\ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \f1 \cf0 \ @@ -98,7 +98,7 @@ or add the folder containing GPSBabel to your search path:\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural -\f2 \cf0 export PATH=$PATH:/Applications/GPSBabel+-1.3.4\ +\f2 \cf0 export PATH=$PATH:/Applications/GPSBabel+-1.3.5\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \f1 \cf0 \ @@ -115,7 +115,7 @@ or add the folder containing GPSBabel to your search path:\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural -\f2 \cf0 /Applications/qgis-0.10.0/qgis0.10.0.app/Contents/MacOS/qgis\ +\f2 \cf0 /Applications/qgis-0.11.0/qgis0.11.0.app/Contents/MacOS/qgis\ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural \f1 \cf0 \ diff --git a/mac/install-extra.sh b/mac/install-extra.sh index 40858b96c2d..496e49216a8 100755 --- a/mac/install-extra.sh +++ b/mac/install-extra.sh @@ -5,41 +5,33 @@ # Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX INSTALLPREFIX=$PWD -VER=0.10 +VER=0.11 BUNDLE=qgis$VER.0.app/Contents/MacOS BUILDPREFIX=$INSTALLPREFIX/$BUNDLE QLIBNAMES="core gui" -# Declare libqgis_* relative to bundle and update qgis app client +# Declare libqgis_* relative to bundle and update qgis and qgis_help app clients for NAME in $QLIBNAMES do - install_name_tool -id @executable_path/lib/libqgis_$NAME.dylib \ - $BUILDPREFIX/lib/libqgis_$NAME.dylib + install_name_tool -id @executable_path/lib/libqgis_$NAME.$VER.dylib \ + $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib - install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.dylib \ - @executable_path/lib/libqgis_$NAME.dylib \ + install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \ + @executable_path/lib/libqgis_$NAME.$VER.dylib \ $BUILDPREFIX/qgis install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \ - @executable_path/lib/libqgis_$NAME.dylib \ + @executable_path/lib/libqgis_$NAME.$VER.dylib \ $BUILDPREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help - - install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \ - @executable_path/lib/libqgis_$NAME.dylib \ - $BUILDPREFIX/share/qgis/python/qgis/core.so - - install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \ - @executable_path/lib/libqgis_$NAME.dylib \ - $BUILDPREFIX/share/qgis/python/qgis/gui.so done -# Update libqgis_gui client of libqgis_* -install_name_tool -change $BUILDPREFIX/lib/libqgis_core.dylib \ - @executable_path/lib/libqgis_core.dylib \ - $BUILDPREFIX/lib/libqgis_gui.dylib +# Update libqgis_gui client of libqgis_core +install_name_tool -change $BUILDPREFIX/lib/libqgis_core.$VER.dylib \ + @executable_path/lib/libqgis_core.$VER.dylib \ + $BUILDPREFIX/lib/libqgis_gui.$VER.dylib -# Update plugin and lib clients of libqgis_* and libqgsprojectionselector +# Update plugin and lib clients of libqgis_* for PLUGIN in \ qgis/libcopyrightlabelplugin.so \ qgis/libdelimitedtextplugin.so \ @@ -47,10 +39,8 @@ for PLUGIN in \ qgis/libgeorefplugin.so \ qgis/libgpsimporterplugin.so \ qgis/libgpxprovider.so \ - qgis/libgrassplugin.so \ - qgis/libgrassprovider.so \ qgis/libgridmakerplugin.so \ - qgis/libwfsprovider.so \ + qgis/libmemoryprovider.so \ qgis/libnortharrowplugin.so \ qgis/libogrprovider.so \ qgis/libpggeoprocessingplugin.so \ @@ -59,25 +49,70 @@ for PLUGIN in \ qgis/libscalebarplugin.so \ qgis/libspitplugin.so \ qgis/libwfsplugin.so \ - qgis/libwmsprovider.so \ - libqgisgrass.dylib + qgis/libwfsprovider.so \ + qgis/libwmsprovider.so do for NAME in $QLIBNAMES do - install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.dylib \ - @executable_path/lib/libqgis_$NAME.dylib \ + install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \ + @executable_path/lib/libqgis_$NAME.$VER.dylib \ $BUILDPREFIX/lib/$PLUGIN done done -# Declare libqgisgrass relative to bundle -install_name_tool -id @executable_path/lib/libqgisgrass.dylib \ - $BUILDPREFIX/lib/libqgisgrass.dylib +if test -f $BUILDPREFIX/lib/libqgisgrass.$VER.dylib; then -# Update plugin clients of libqgisgrass -for PLUGIN in qgis/libgrassplugin.so qgis/libgrassprovider.so -do - install_name_tool -change $BUILDPREFIX/lib/libqgisgrass.dylib \ - @executable_path/lib/libqgisgrass.dylib \ - $BUILDPREFIX/lib/$PLUGIN -done + # Declare libqgisgrass relative to bundle + install_name_tool -id @executable_path/lib/libqgisgrass.$VER.dylib \ + $BUILDPREFIX/lib/libqgisgrass.$VER.dylib + + # Update plugin and lib clients of libqgis_* + for PLUGIN in \ + qgis/libgrassplugin.so \ + qgis/libgrassprovider.so \ + libqgisgrass.$VER.dylib + do + for NAME in $QLIBNAMES + do + install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \ + @executable_path/lib/libqgis_$NAME.$VER.dylib \ + $BUILDPREFIX/lib/$PLUGIN + done + done + + # Update plugin clients of libqgisgrass + for PLUGIN in qgis/libgrassplugin.so qgis/libgrassprovider.so + do + install_name_tool -change $BUILDPREFIX/lib/libqgisgrass.$VER.dylib \ + @executable_path/lib/libqgisgrass.$VER.dylib \ + $BUILDPREFIX/lib/$PLUGIN + done + +fi + +if test -f $BUILDPREFIX/lib/libqgispython.$VER.dylib; then + + # Declare libqgispython relative to bundle + install_name_tool -id @executable_path/lib/libqgispython.$VER.dylib \ + $BUILDPREFIX/lib/libqgispython.$VER.dylib + + # Update python lib paths to libqgis_* + for NAME in $QLIBNAMES + do + install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \ + @executable_path/lib/libqgis_$NAME.$VER.dylib \ + $BUILDPREFIX/lib/libqgispython.$VER.dylib + done + + # Update python plugin paths libqgis_* + for PLUGIN in core.so gui.so + do + for NAME in $QLIBNAMES + do + install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \ + @executable_path/lib/libqgis_$NAME.$VER.dylib \ + $BUILDPREFIX/share/qgis/python/qgis/$PLUGIN + done + done + +fi diff --git a/mac/release-check.sh b/mac/release-check.sh index 29e1d330cd7..cab3bcb8f30 100755 --- a/mac/release-check.sh +++ b/mac/release-check.sh @@ -2,24 +2,21 @@ # Display all paths to supporting libraries # Output should be visually inspected for paths which haven't been made relative (such as /usr/local) -PREFIX=qgis0.10.0.app/Contents/MacOS +PREFIX=qgis0.11.0.app/Contents/MacOS otool -L $PREFIX/qgis otool -L $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help otool -L $PREFIX/lib/libqgis_core.dylib otool -L $PREFIX/lib/libqgis_gui.dylib -otool -L $PREFIX/lib/libqgisgrass.dylib otool -L $PREFIX/lib/qgis/libcopyrightlabelplugin.so otool -L $PREFIX/lib/qgis/libdelimitedtextplugin.so otool -L $PREFIX/lib/qgis/libdelimitedtextprovider.so otool -L $PREFIX/lib/qgis/libgeorefplugin.so otool -L $PREFIX/lib/qgis/libgpsimporterplugin.so otool -L $PREFIX/lib/qgis/libgpxprovider.so -otool -L $PREFIX/lib/qgis/libgrassplugin.so -otool -L $PREFIX/lib/qgis/libgrassprovider.so otool -L $PREFIX/lib/qgis/libgridmakerplugin.so -otool -L $PREFIX/lib/qgis/libwfsprovider.so +otool -L $PREFIX/lib/qgis/libmemoryprovider.so otool -L $PREFIX/lib/qgis/libnortharrowplugin.so otool -L $PREFIX/lib/qgis/libogrprovider.so otool -L $PREFIX/lib/qgis/libpggeoprocessingplugin.so @@ -28,6 +25,7 @@ otool -L $PREFIX/lib/qgis/libquickprintplugin.so otool -L $PREFIX/lib/qgis/libscalebarplugin.so otool -L $PREFIX/lib/qgis/libspitplugin.so otool -L $PREFIX/lib/qgis/libwfsplugin.so +otool -L $PREFIX/lib/qgis/libwfsprovider.so otool -L $PREFIX/lib/qgis/libwmsprovider.so otool -L $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support @@ -40,16 +38,14 @@ otool -L $PREFIX/lib/QtXml.framework/Versions/4/QtXml otool -L $PREFIX/../plugins/imageformats/libqjpeg.dylib otool -L $PREFIX/lib/libgdal.1.dylib -otool -L $PREFIX/lib/gdalplugins/gdal_GRASS.so -otool -L $PREFIX/lib/gdalplugins/ogr_GRASS.so otool -L $PREFIX/lib/libgeos.3.0.0.dylib otool -L $PREFIX/lib/libgeos_c.1.4.1.dylib otool -L $PREFIX/lib/libproj.0.5.4.dylib -otool -L $PREFIX/lib/libsqlite3.0.8.6.dylib +otool -L $PREFIX/lib/libsqlite3.0.dylib otool -L $PREFIX/lib/libxerces-c.28.0.dylib otool -L $PREFIX/lib/libgif.4.1.6.dylib otool -L $PREFIX/lib/libjpeg.62.0.0.dylib -otool -L $PREFIX/lib/libpng12.0.24.0.dylib +otool -L $PREFIX/lib/libpng12.0.dylib otool -L $PREFIX/lib/libtiff.3.dylib otool -L $PREFIX/lib/libgeotiff.1.2.4.dylib otool -L $PREFIX/lib/libjasper.1.0.0.dylib @@ -59,15 +55,37 @@ otool -L $PREFIX/lib/libgsl.0.dylib otool -L $PREFIX/lib/libgslcblas.0.dylib otool -L $PREFIX/lib/libpq.5.1.dylib -for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect -do - otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0RC6.dylib -done +if test -f $PREFIX/lib/libqgisgrass.dylib; then + otool -L $PREFIX/lib/libqgisgrass.dylib + + otool -L $PREFIX/lib/qgis/libgrassplugin.so + otool -L $PREFIX/lib/qgis/libgrassprovider.so + + otool -L $PREFIX/lib/gdalplugins/gdal_GRASS.so + otool -L $PREFIX/lib/gdalplugins/ogr_GRASS.so + + for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect + do + otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0.dylib + done +fi + +if test -f $PREFIX/lib/libqgispython.dylib; then + otool -L $PREFIX/lib/libqgispython.dylib + + otool -L $PREFIX/share/qgis/python/qgis/core.so + otool -L $PREFIX/share/qgis/python/qgis/gui.so + + for FRAMEWORK in QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon + do + otool -L $PREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK + done + otool -L $PREFIX/lib/libQtCLucene.4.4.0.dylib + + otool -L $PREFIX/share/qgis/python/sip.so + for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon + do + otool -L $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so + done +fi -otool -L $PREFIX/share/qgis/python/qgis/core.so -otool -L $PREFIX/share/qgis/python/qgis/gui.so -otool -L $PREFIX/share/qgis/python/sip.so -for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtOpenGL QtScript QtTest -do - otool -L $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so -done diff --git a/mac/release-extra-grass.sh b/mac/release-extra-grass.sh index b8309bb5a72..ea44d104a6a 100755 --- a/mac/release-extra-grass.sh +++ b/mac/release-extra-grass.sh @@ -2,14 +2,14 @@ # Copy GRASS supporting libraries to qgis bundle # and make search paths for them relative to bundle -PREFIX=qgis0.10.0.app/Contents/MacOS +PREFIX=qgis0.11.0.app/Contents/MacOS # Edit version when any library is upgraded LNKGDAL=libgdal.1.dylib LNKPROJ=libproj.0.dylib LIBFFTW=libfftw3.3.1.2.dylib LNKFFTW=libfftw3.3.dylib -GRASSVER=6.3.0RC6 +GRASSVER=6.3.0 GRASSLIB=/usr/local/grass-$GRASSVER/lib cd $PREFIX/lib diff --git a/mac/release-extra-py.sh b/mac/release-extra-py.sh index be4fd348d2e..1de65974582 100755 --- a/mac/release-extra-py.sh +++ b/mac/release-extra-py.sh @@ -1,59 +1,143 @@ #!/bin/sh -# Copy Py supporting libraries to qgis bundle +# Copy PyQt supporting libraries to qgis bundle # and make search paths for them relative to bundle -BUNDLE=qgis0.10.0.app/Contents/MacOS +BUNDLE=qgis0.11.0.app/Contents/MacOS + +# Edit version when any library is upgraded +LNKGDAL=libgdal.1.dylib +LNKGEOS=libgeos.3.dylib + +QTPREFIX=/usr/local/Trolltech/Qt-4.4.0 +QTFRAMEWORKS="QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon" +LIBQTCL=libQtCLucene.4.4.0.dylib +LNKQTCL=libQtCLucene.4.dylib + SITEPKG=/Library/Python/2.3/site-packages -LNKGDAL=libgdal.1.dylib +# Copy additional Qt frameworks needed by PyQt to application bundle +cd $BUNDLE/lib -# Copy supporting libraries to application bundle +for FRAMEWORK in $QTFRAMEWORKS +do + LIBFRAMEWORK=$FRAMEWORK.framework/Versions/4/$FRAMEWORK + if test ! -f $LIBFRAMEWORK; then + mkdir $FRAMEWORK.framework + mkdir $FRAMEWORK.framework/Versions + mkdir $FRAMEWORK.framework/Versions/4 + cp $QTPREFIX/lib/$LIBFRAMEWORK $LIBFRAMEWORK + install_name_tool -id @executable_path/lib/$LIBFRAMEWORK $LIBFRAMEWORK + fi +done +if test ! -f $LIBQTCL; then + cp $QTPREFIX/lib/$LIBQTCL $LIBQTCL + ln -s $LIBQTCL $LNKQTCL + install_name_tool -id @executable_path/lib/$LNKQTCL $LNKQTCL +fi + +# Update paths to supporting Qt frameworks +for FRAMEWORK in QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon +do + install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \ + @executable_path/lib/QtCore.framework/Versions/4/QtCore \ + $FRAMEWORK.framework/Versions/4/$FRAMEWORK +done +install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \ + @executable_path/lib/QtCore.framework/Versions/4/QtCore \ + $LIBQTCL +for FRAMEWORK in QtAssistant QtDesigner QtHelp QtOpenGL QtWebKit phonon +do + install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4/QtGui \ + @executable_path/lib/QtGui.framework/Versions/4/QtGui \ + $FRAMEWORK.framework/Versions/4/$FRAMEWORK +done +for FRAMEWORK in QtAssistant QtWebKit QtXmlPatterns +do + install_name_tool -change $QTPREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork \ + @executable_path/lib/QtNetwork.framework/Versions/4/QtNetwork \ + $FRAMEWORK.framework/Versions/4/$FRAMEWORK +done +install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4/QtSql \ + @executable_path/lib/QtSql.framework/Versions/4/QtSql \ + QtHelp.framework/Versions/4/QtHelp +for FRAMEWORK in QtDesigner QtHelp +do + install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4/QtXml \ + @executable_path/lib/QtXml.framework/Versions/4/QtXml \ + $FRAMEWORK.framework/Versions/4/$FRAMEWORK +done +install_name_tool -change $QTPREFIX/lib/QtScript.framework/Versions/4/QtScript \ + @executable_path/lib/QtScript.framework/Versions/4/QtScript \ + QtDesigner.framework/Versions/4/QtDesigner +install_name_tool -change $QTPREFIX/lib/$LNKQTCL \ + @executable_path/lib/$LNKQTCL \ + QtHelp.framework/Versions/4/QtHelp + +cd ../../../../ + +# Copy sip and PyQt libraries to application bundle cd $BUNDLE/share/qgis/python + if test ! -f sip.so; then cp $SITEPKG/sip.so sip.so cp $SITEPKG/sipconfig.py sipconfig.py fi + if test ! -d PyQt4; then cp -R $SITEPKG/PyQt4 . - for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtOpenGL QtScript QtTest + for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon do cp $SITEPKG/PyQt4/$LIBPYQT4.so PyQt4/$LIBPYQT4.so - # Update path to supporting libraries - install_name_tool -change $LIBPYQT4.framework/Versions/4/$LIBPYQT4 \ + # Update paths to supporting Qt frameworks + install_name_tool -change $QTPREFIX/lib/$LIBPYQT4.framework/Versions/4/$LIBPYQT4 \ @executable_path/lib/$LIBPYQT4.framework/Versions/4/$LIBPYQT4 \ PyQt4/$LIBPYQT4.so - install_name_tool -change QtCore.framework/Versions/4/QtCore \ + install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \ @executable_path/lib/QtCore.framework/Versions/4/QtCore \ PyQt4/$LIBPYQT4.so - install_name_tool -change QtGui.framework/Versions/4/QtGui \ + install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4/QtGui \ @executable_path/lib/QtGui.framework/Versions/4/QtGui \ PyQt4/$LIBPYQT4.so done - install_name_tool -change QtXml.framework/Versions/4/QtXml \ - @executable_path/lib/QtXml.framework/Versions/4/QtXml \ - PyQt4/QtSvg.so - install_name_tool -change QtNetwork.framework/Versions/4/QtNetwork \ - @executable_path/lib/QtNetwork.framework/Versions/4/QtNetwork \ - PyQt4/QtAssistant.so - install_name_tool -change QtScript.framework/Versions/4/QtScript \ + # Update paths to supporting Qt frameworks + for LIBPYQT4 in QtAssistant QtWebKit QtXmlPatterns + do + install_name_tool -change $QTPREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork \ + @executable_path/lib/QtNetwork.framework/Versions/4/QtNetwork \ + PyQt4/$LIBPYQT4.so + done + install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4/QtSql \ + @executable_path/lib/QtSql.framework/Versions/4/QtSql \ + PyQt4/QtHelp.so + for LIBPYQT4 in QtSvg QtDesigner QtHelp + do + install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4/QtXml \ + @executable_path/lib/QtXml.framework/Versions/4/QtXml \ + PyQt4/$LIBPYQT4.so + done + install_name_tool -change $QTPREFIX/lib/QtScript.framework/Versions/4/QtScript \ @executable_path/lib/QtScript.framework/Versions/4/QtScript \ PyQt4/QtDesigner.so - install_name_tool -change QtXml.framework/Versions/4/QtXml \ - @executable_path/lib/QtXml.framework/Versions/4/QtXml \ - PyQt4/QtDesigner.so + install_name_tool -change $QTPREFIX/lib/libQtCLucene.4.dylib \ + @executable_path/lib/libQtCLucene.4.dylib \ + PyQt4/QtHelp.so fi -# Update path to supporting libraries +# Update qgis python plugin paths to supporting libraries for LIBQGIS in core gui do install_name_tool -change /usr/local/lib/$LNKGDAL \ @executable_path/lib/$LNKGDAL \ qgis/$LIBQGIS.so + install_name_tool -change /usr/local/lib/$LNKGEOS \ + @executable_path/lib/$LNKGEOS \ + qgis/$LIBQGIS.so for FRAMEWORK in QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support do - install_name_tool -change $FRAMEWORK.framework/Versions/4/$FRAMEWORK \ + install_name_tool -change $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \ @executable_path/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \ qgis/$LIBQGIS.so done done + cd ../../../../../../ diff --git a/mac/release-extra-qt.sh b/mac/release-extra-qt.sh index 1630fc92eac..784b00ba15f 100755 --- a/mac/release-extra-qt.sh +++ b/mac/release-extra-qt.sh @@ -2,19 +2,19 @@ # Copy Qt frameworks to qgis bundle # and make search paths for them relative to bundle -PREFIX=qgis0.10.0.app/Contents/MacOS +BUNDLE=qgis0.11.0.app/Contents/MacOS # Edit version when any library is upgraded LIBJPEG=libjpeg.62.0.0.dylib LNKJPEG=libjpeg.62.dylib -LIBPNG=libpng.3.24.0.dylib -LNKPNG=libpng.3.dylib +LIBPNG=libpng12.0.dylib +LNKPNG=libpng12.0.dylib -QTPREFIX=/usr/local/Qt4.3 +QTPREFIX=/usr/local/Trolltech/Qt-4.4.0 QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support" -# Copy supporting frameworks to application bundle -cd $PREFIX/lib +# Copy Qt frameworks to application bundle +cd $BUNDLE/lib for FRAMEWORK in $QTFRAMEWORKS do @@ -28,48 +28,52 @@ do fi done -# Update path to supporting frameworks +# Update Qt framework paths to supporting Qt frameworks for FRAMEWORK in QtGui QtNetwork QtSql QtSvg QtXml Qt3Support do - install_name_tool -change QtCore.framework/Versions/4/QtCore \ + install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \ @executable_path/lib/QtCore.framework/Versions/4/QtCore \ $FRAMEWORK.framework/Versions/4/$FRAMEWORK done for FRAMEWORK in QtSvg Qt3Support do - install_name_tool -change QtGui.framework/Versions/4/QtGui \ + install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4/QtGui \ @executable_path/lib/QtGui.framework/Versions/4/QtGui \ $FRAMEWORK.framework/Versions/4/$FRAMEWORK - install_name_tool -change QtXml.framework/Versions/4/QtXml \ - @executable_path/lib/QtXml.framework/Versions/4/QtXml \ - $FRAMEWORK.framework/Versions/4/$FRAMEWORK done -for FRAMEWORK in Qt3Support +install_name_tool -change $QTPREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork \ + @executable_path/lib/QtNetwork.framework/Versions/4/QtNetwork \ + Qt3Support.framework/Versions/4/Qt3Support +install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4/QtSql \ + @executable_path/lib/QtSql.framework/Versions/4/QtSql \ + Qt3Support.framework/Versions/4/Qt3Support +for FRAMEWORK in QtSvg Qt3Support do - install_name_tool -change QtNetwork.framework/Versions/4/QtNetwork \ - @executable_path/lib/QtNetwork.framework/Versions/4/QtNetwork \ - $FRAMEWORK.framework/Versions/4/$FRAMEWORK - install_name_tool -change QtSql.framework/Versions/4/QtSql \ - @executable_path/lib/QtSql.framework/Versions/4/QtSql \ + install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4/QtXml \ + @executable_path/lib/QtXml.framework/Versions/4/QtXml \ $FRAMEWORK.framework/Versions/4/$FRAMEWORK done for FRAMEWORK in QtGui QtSvg Qt3Support do - install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG \ + install_name_tool -change /usr/local/lib/$LNKPNG \ + @executable_path/lib/$LNKPNG \ $FRAMEWORK.framework/Versions/4/$FRAMEWORK done + cd ../../ + +# Copy Qt plugins to application bundle LIBQJPEG=plugins/imageformats/libqjpeg.dylib if test ! -f $LIBQJPEG; then mkdir plugins mkdir plugins/imageformats cp $QTPREFIX/$LIBQJPEG $LIBQJPEG install_name_tool -id @executable_path/../$LIBQJPEG $LIBQJPEG - # Update path to supporting libraries - install_name_tool -change QtCore.framework/Versions/4/QtCore \ + # Update Qt plugin paths to supporting Qt frameworks + install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \ @executable_path/lib/QtCore.framework/Versions/4/QtCore \ $LIBQJPEG - install_name_tool -change QtGui.framework/Versions/4/QtGui \ + install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4/QtGui \ @executable_path/lib/QtGui.framework/Versions/4/QtGui \ $LIBQJPEG install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $LIBQJPEG @@ -77,14 +81,17 @@ if test ! -f $LIBQJPEG; then # Empty qt.conf indicates plugins are in default location within this bundle cp /dev/null Resources/qt.conf fi + cd ../../ +# Update qgis plugin paths to supporting Qt frameworks for FILE in \ qgis \ bin/qgis_help.app/Contents/MacOS/qgis_help \ lib/libqgis_core.dylib \ lib/libqgis_gui.dylib \ lib/libqgisgrass.dylib \ + lib/libqgispython.dylib \ lib/qgis/libcopyrightlabelplugin.so \ lib/qgis/libdelimitedtextplugin.so \ lib/qgis/libdelimitedtextprovider.so \ @@ -94,7 +101,7 @@ for FILE in \ lib/qgis/libgrassplugin.so \ lib/qgis/libgrassprovider.so \ lib/qgis/libgridmakerplugin.so \ - lib/qgis/libwfsprovider.so \ + lib/qgis/libmemoryprovider.so \ lib/qgis/libnortharrowplugin.so \ lib/qgis/libogrprovider.so \ lib/qgis/libpggeoprocessingplugin.so \ @@ -103,12 +110,13 @@ for FILE in \ lib/qgis/libscalebarplugin.so \ lib/qgis/libspitplugin.so \ lib/qgis/libwfsplugin.so \ + lib/qgis/libwfsprovider.so \ lib/qgis/libwmsprovider.so do for FRAMEWORK in QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support do - install_name_tool -change $FRAMEWORK.framework/Versions/4/$FRAMEWORK \ + install_name_tool -change $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \ @executable_path/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \ - $PREFIX/$FILE + $BUNDLE/$FILE done done diff --git a/mac/release-extra.sh b/mac/release-extra.sh index 7ed2f3d9bb6..ef0ee74ff4b 100755 --- a/mac/release-extra.sh +++ b/mac/release-extra.sh @@ -2,7 +2,7 @@ # Copy supporting libraries (except Qt) to qgis bundle # and make search paths for them relative to bundle -PREFIX=qgis0.10.0.app/Contents/MacOS +PREFIX=qgis0.11.0.app/Contents/MacOS HELPPREFIX=$PREFIX/bin/qgis_help.app/Contents/MacOS PREFIXBACKTRACK=../../../.. @@ -16,7 +16,7 @@ LIBGEOSC=libgeos_c.1.4.1.dylib LNKGEOSC=libgeos_c.1.dylib LIBPROJ=libproj.0.5.4.dylib LNKPROJ=libproj.0.dylib -LIBSQLITE3=libsqlite3.0.8.6.dylib +LIBSQLITE3=libsqlite3.0.dylib LNKSQLITE3=libsqlite3.0.dylib LIBXERCESC=libxerces-c.28.0.dylib LNKXERCESC=libxerces-c.28.dylib @@ -24,7 +24,7 @@ LIBGIF=libgif.4.1.6.dylib LNKGIF=libgif.4.dylib LIBJPEG=libjpeg.62.0.0.dylib LNKJPEG=libjpeg.62.dylib -LIBPNG=libpng12.0.24.0.dylib +LIBPNG=libpng12.0.dylib LNKPNG=libpng12.0.dylib LIBTIFF=libtiff.3.dylib LNKTIFF=libtiff.3.dylib @@ -40,7 +40,7 @@ LIBEXPAT=libexpat.1.5.2.dylib LNKEXPAT=libexpat.1.dylib LIBPQ=libpq.5.1.dylib LNKPQ=libpq.5.dylib -GRASSLIB=/usr/local/grass-6.3.0RC6/lib +GRASSLIB=/usr/local/grass-6.3.0/lib # Copy supporting libraries to application bundle cd $PREFIX/lib @@ -94,7 +94,7 @@ if test ! -f $LIBPROJ; then fi if test ! -f $LIBSQLITE3; then cp /usr/local/lib/$LIBSQLITE3 $LIBSQLITE3 - ln -s $LIBSQLITE3 $LNKSQLITE3 + #ln -s $LIBSQLITE3 $LNKSQLITE3 install_name_tool -id @executable_path/lib/$LNKSQLITE3 $LIBSQLITE3 fi if test ! -f $LIBXERCESC; then @@ -109,7 +109,7 @@ if test ! -f $LIBGIF; then fi if test ! -f $LIBPNG; then cp /usr/local/lib/$LIBPNG $LIBPNG - ln -s $LIBPNG $LNKPNG + #ln -s $LIBPNG $LNKPNG install_name_tool -id @executable_path/lib/$LNKPNG $LIBPNG fi if test ! -f $LIBJPEG; then @@ -170,7 +170,7 @@ install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQ install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKPQ $PREFIX/qgis # Update library paths to supporting libraries -for LIB in _core _gui grass +for LIB in _core _gui grass python do install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $PREFIX/lib/libqgis$LIB.dylib install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX/lib/libqgis$LIB.dylib @@ -189,7 +189,7 @@ for PLUGIN in \ libgrassplugin.so \ libgrassprovider.so \ libgridmakerplugin.so \ - libwfsprovider.so \ + libmemoryprovider.so \ libnortharrowplugin.so \ libogrprovider.so \ libpggeoprocessingplugin.so \ @@ -198,6 +198,7 @@ for PLUGIN in \ libscalebarplugin.so \ libspitplugin.so \ libwfsplugin.so \ + libwfsprovider.so \ libwmsprovider.so do install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $PREFIX/lib/qgis/$PLUGIN diff --git a/mac/release-strip.sh b/mac/release-strip.sh index 17e0b168f52..12d82921bfe 100755 --- a/mac/release-strip.sh +++ b/mac/release-strip.sh @@ -1,24 +1,21 @@ #!/bin/sh # Strip all non-global symbols -PREFIX=qgis0.10.0.app/Contents/MacOS +PREFIX=qgis0.11.0.app/Contents/MacOS strip -x $PREFIX/qgis strip -x $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help strip -x $PREFIX/lib/libqgis_core.dylib strip -x $PREFIX/lib/libqgis_gui.dylib -strip -x $PREFIX/lib/libqgisgrass.dylib strip -x $PREFIX/lib/qgis/libcopyrightlabelplugin.so strip -x $PREFIX/lib/qgis/libdelimitedtextplugin.so strip -x $PREFIX/lib/qgis/libdelimitedtextprovider.so strip -x $PREFIX/lib/qgis/libgeorefplugin.so strip -x $PREFIX/lib/qgis/libgpsimporterplugin.so strip -x $PREFIX/lib/qgis/libgpxprovider.so -strip -x $PREFIX/lib/qgis/libgrassplugin.so -strip -x $PREFIX/lib/qgis/libgrassprovider.so strip -x $PREFIX/lib/qgis/libgridmakerplugin.so -strip -x $PREFIX/lib/qgis/libwfsprovider.so +strip -x $PREFIX/lib/qgis/libmemoryprovider.so strip -x $PREFIX/lib/qgis/libnortharrowplugin.so strip -x $PREFIX/lib/qgis/libogrprovider.so strip -x $PREFIX/lib/qgis/libpggeoprocessingplugin.so @@ -27,8 +24,8 @@ strip -x $PREFIX/lib/qgis/libquickprintplugin.so strip -x $PREFIX/lib/qgis/libscalebarplugin.so strip -x $PREFIX/lib/qgis/libspitplugin.so strip -x $PREFIX/lib/qgis/libwfsplugin.so +strip -x $PREFIX/lib/qgis/libwfsprovider.so strip -x $PREFIX/lib/qgis/libwmsprovider.so -#strip -x $PREFIX/lib/qgis/libopenmodellerplugin.so strip -x $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support strip -x $PREFIX/lib/QtCore.framework/Versions/4/QtCore @@ -40,16 +37,14 @@ strip -x $PREFIX/lib/QtXml.framework/Versions/4/QtXml strip -x $PREFIX/../plugins/imageformats/libqjpeg.dylib strip -x $PREFIX/lib/libgdal.1.dylib -strip -x $PREFIX/lib/gdalplugins/gdal_GRASS.so -strip -x $PREFIX/lib/gdalplugins/ogr_GRASS.so strip -x $PREFIX/lib/libgeos.3.0.0.dylib strip -x $PREFIX/lib/libgeos_c.1.4.1.dylib strip -x $PREFIX/lib/libproj.0.5.4.dylib -strip -x $PREFIX/lib/libsqlite3.0.8.6.dylib +strip -x $PREFIX/lib/libsqlite3.0.dylib strip -x $PREFIX/lib/libxerces-c.28.0.dylib strip -x $PREFIX/lib/libgif.4.1.6.dylib strip -x $PREFIX/lib/libjpeg.62.0.0.dylib -strip -x $PREFIX/lib/libpng12.0.24.0.dylib +strip -x $PREFIX/lib/libpng12.0.dylib strip -x $PREFIX/lib/libtiff.3.dylib strip -x $PREFIX/lib/libgeotiff.1.2.4.dylib strip -x $PREFIX/lib/libjasper.1.0.0.dylib @@ -59,15 +54,35 @@ strip -x $PREFIX/lib/libgsl.0.dylib strip -x $PREFIX/lib/libgslcblas.0.dylib strip -x $PREFIX/lib/libpq.5.1.dylib -for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect -do - strip -x $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0RC6.dylib -done +if test -f $PREFIX/lib/libqgisgrass.dylib; then + strip -x $PREFIX/lib/libqgisgrass.dylib -strip -x $PREFIX/share/qgis/python/qgis/core.so -strip -x $PREFIX/share/qgis/python/qgis/gui.so -strip -x $PREFIX/share/qgis/python/sip.so -for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtOpenGL QtScript QtTest -do - strip -x $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so -done + strip -x $PREFIX/lib/qgis/libgrassplugin.so + strip -x $PREFIX/lib/qgis/libgrassprovider.so + + strip -x $PREFIX/lib/gdalplugins/gdal_GRASS.so + strip -x $PREFIX/lib/gdalplugins/ogr_GRASS.so + + for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect + do + strip -x $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0.dylib + done +fi + +if test -f $PREFIX/lib/libqgispython.dylib; then + strip -x $PREFIX/lib/libqgispython.dylib + + for FRAMEWORK in QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon + do + strip -x $PREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK + done + strip -x $PREFIX/lib/libQtCLucene.4.4.0.dylib + + strip -x $PREFIX/share/qgis/python/qgis/core.so + strip -x $PREFIX/share/qgis/python/qgis/gui.so + strip -x $PREFIX/share/qgis/python/sip.so + for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon + do + strip -x $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so + done +fi