Update Mac release scripts for 0.9.2.

git-svn-id: http://svn.osgeo.org/qgis/trunk@8074 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 29, 2008 · b467236 · b467236
1 parent 087bad4
commit b467236
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 131 deletions.
diff --git a/mac/Read Me (Mac).rtf b/mac/Read Me (Mac).rtf
@@ -5,7 +5,7 @@
 \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.9.1 Release Notes for Macintosh
+\f0\b\fs24 \cf0 QGIS 0.9.2 Release Notes for Macintosh
 \f1\b0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 \cf0 \
@@ -41,22 +41,23 @@ This release of QGIS requires Mac OS X 10.3.9 or later. A PostgreSQL version 7 o
 \f1\b0 \cf0 \
 The following libraries are included with this distribution of QGIS. If you have other versions of these libraries installed, QGIS will ignore your versions and use these.\
 \
-GDAL 1.4.4 (libgdal.1.11.4.dylib)\
-GEOS 2.2.3 (libgeos.2.2.3.dylib)\
-PROJ 4.5.0 (libproj.0.5.2.dylib)\
+GDAL 1.5.0 (libgdal.1.dylib)\
+GEOS 3.0.0 (libgeos.3.0.0.dylib)\
+PROJ 4.6.0 (libproj.0.5.4.dylib)\
 SQLITE3 3.5.2 (libsqlite3.0.8.6.dylib)\
 Xerces-C++ 2.8.0 (libxerces-c.28.0.dylib)\
-Qt/Mac 4.3.2 (various Qt frameworks)\
-GIF 4.1.4 (libgif.4.1.4.dylib)\
+Qt/Mac 4.3.3 (various Qt frameworks)\
+GIF 4.1.6 (libgif.4.1.6.dylib)\
 JPEG 6b (libjpeg.62.0.0.dylib)\
-PNG 1.2.8 (libpng.3.1.2.8.dylib)\
+PNG 1.2.24 (libpng.3.24.0.dylib)\
 TIFF 3.8.2 (libtiff.3.dylib)\
-GeoTIFF 1.2.3 (libgeotiff.1.2.3.dylib)\
-JasPer 1.701.0.GEO (libjasper-1.701.1.0.0.dylib)\
+GeoTIFF 1.2.4 (libgeotiff.1.2.4.dylib)\
+JasPer 1.701.0.GEO-1.3.1 (libjasper-1.701.1.0.0.dylib)\
 Expat 2.0.1 (libexpat.1.5.2.dylib)\
+FFTW 3.1.2 (libfftw3.3.1.2.dylib)\
 GSL 1.8 (libgsl.0.9.0.dylib, libgslcblas.0.0.0.dylib)\
-PostgreSQL 8.2.5 (libpq.5.0.dylib) This client can also access a version 7 server.\
-GRASS 6.3.0RC3 (libgrass_*.6.3.0RC3.dylib)\
+PostgreSQL 8.2.6 (libpq.5.0.dylib) This client can also access a version 7 server.\
+GRASS 6.3.0RC4 (libgrass_*.6.3.0RC4.dylib)\
 SIP 4.7.1 (sip.so)\
 PyQt4 4.3.1 (Qt*.so)\
 \
@@ -71,7 +72,7 @@ PyQt4 4.3.1 (Qt*.so)\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 \cf0 Some dialogs have cosmetic issues with buttons.\
 \
-Maps will not be redrawn correctly if the main window is resized after opening a WMS layer. Therefore adjust the window size first.\
+The main window cannot be resized while a WMS layer is displayed. Therefore adjust the window size before opening a WMS layer.\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 \cf0 To use QGIS with a language other than English, you must change both the Language and Format settings in the International System Preferences. The QGIS application menu uses the Language preference while all other QGIS menus use the Format preference to select the language.\
@@ -114,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.9.1/qgis0.9.1.app/Contents/MacOS/qgis\
+\f2 \cf0 /Applications/qgis-0.9.2/qgis0.9.2.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
@@ -5,7 +5,7 @@
 # Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
 INSTALLPREFIX=$PWD
 
-BUNDLE=qgis0.9.1.app/Contents/MacOS
+BUNDLE=qgis0.9.2.app/Contents/MacOS
 BUILDPREFIX=$INSTALLPREFIX/$BUNDLE
 
 QLIBNAMES="core gui"
@@ -20,10 +20,6 @@ do
 		@executable_path/lib/libqgis_$NAME.dylib \
 		$BUILDPREFIX/qgis
 
-	install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.dylib \
-		@executable_path/lib/libqgis_$NAME.dylib \
-		$BUILDPREFIX/bin/msexport.app/Contents/MacOS/msexport
-
 	install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.dylib \
 		@executable_path/lib/libqgis_$NAME.dylib \
 		$BUILDPREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
@@ -50,6 +46,7 @@ for PLUGIN in \
 	qgis/libogrprovider.so \
 	qgis/libpggeoprocessingplugin.so \
 	qgis/libpostgresprovider.so \
+	qgis/libquickprintplugin.so \
 	qgis/libscalebarplugin.so \
 	qgis/libspitplugin.so \
 	qgis/libwfsplugin.so \

diff --git a/mac/release-check.sh b/mac/release-check.sh
@@ -2,12 +2,10 @@
 # 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.9.1.app/Contents/MacOS
+PREFIX=qgis0.9.2.app/Contents/MacOS
 
 otool -L $PREFIX/qgis
 otool -L $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
-otool -L $PREFIX/bin/msexport.app/Contents/MacOS/msexport
-#otool -L $PREFIX/bin/omgui
 
 otool -L $PREFIX/lib/libqgis_core.dylib
 otool -L $PREFIX/lib/libqgis_gui.dylib
@@ -26,11 +24,11 @@ otool -L $PREFIX/lib/qgis/libnortharrowplugin.so
 otool -L $PREFIX/lib/qgis/libogrprovider.so
 otool -L $PREFIX/lib/qgis/libpggeoprocessingplugin.so
 otool -L $PREFIX/lib/qgis/libpostgresprovider.so
+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/libwmsprovider.so
-#otool -L $PREFIX/lib/qgis/libopenmodellerplugin.so 
 
 otool -L $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
 otool -L $PREFIX/lib/QtCore.framework/Versions/4/QtCore
@@ -41,36 +39,29 @@ otool -L $PREFIX/lib/QtSvg.framework/Versions/4/QtSvg
 otool -L $PREFIX/lib/QtXml.framework/Versions/4/QtXml
 otool -L $PREFIX/../plugins/imageformats/libqjpeg.dylib
 
-otool -L $PREFIX/lib/libgdal.1.11.4.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.2.2.3.dylib
-otool -L $PREFIX/lib/libgeos_c.1.1.1.dylib
-otool -L $PREFIX/lib/libproj.0.5.2.dylib
+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/libxerces-c.28.0.dylib
-otool -L $PREFIX/lib/libgif.4.1.4.dylib
+otool -L $PREFIX/lib/libgif.4.1.6.dylib
 otool -L $PREFIX/lib/libjpeg.62.0.0.dylib
-otool -L $PREFIX/lib/libpng.3.1.2.8.dylib
+otool -L $PREFIX/lib/libpng.3.24.0.dylib
 otool -L $PREFIX/lib/libtiff.3.dylib
-otool -L $PREFIX/lib/libgeotiff.1.2.3.dylib
+otool -L $PREFIX/lib/libgeotiff.1.2.4.dylib
 otool -L $PREFIX/lib/libjasper-1.701.1.0.0.dylib
 otool -L $PREFIX/lib/libexpat.1.5.2.dylib
+otool -L $PREFIX/lib/libfftw3.3.1.2.dylib
 otool -L $PREFIX/lib/libgsl.0.9.0.dylib
 otool -L $PREFIX/lib/libgslcblas.0.0.0.dylib
-#otool -L $PREFIX/lib/libopenmodeller.0.0.0.dylib
-#otool -L $PREFIX/lib/openmodeller/libombioclim.0.0.0.dylib
-#otool -L $PREFIX/lib/openmodeller/libombioclim_distance.0.0.0.dylib
-#otool -L $PREFIX/lib/openmodeller/libomcsmbs.0.0.0.dylib
-#otool -L $PREFIX/lib/openmodeller/libomdg_bs.0.0.0.dylib
-#otool -L $PREFIX/lib/openmodeller/libomdistance_to_average.0.0.0.dylib
-#otool -L $PREFIX/lib/openmodeller/libomminimum_distance.0.0.0.dylib
-#otool -L $PREFIX/lib/openmodeller/libomoldgarp.0.0.0.dylib
 otool -L $PREFIX/lib/libpq.5.0.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.0RC3.dylib
+	otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0RC4.dylib
 done
 
 otool -L $PREFIX/share/qgis/python/qgis/core.so

diff --git a/mac/release-extra-grass.sh b/mac/release-extra-grass.sh
@@ -2,12 +2,14 @@
 # Copy GRASS supporting libraries to qgis bundle
 # and make search paths for them relative to bundle
 
-PREFIX=qgis0.9.1.app/Contents/MacOS
+PREFIX=qgis0.9.2.app/Contents/MacOS
 
 # Edit version when any library is upgraded
 LNKGDAL=libgdal.1.dylib
 LNKPROJ=libproj.0.dylib
-GRASSVER=6.3.0RC3
+LIBFFTW=libfftw3.3.1.2.dylib
+LNKFFTW=libfftw3.3.dylib
+GRASSVER=6.3.0RC4
 GRASSLIB=/usr/local/grass-$GRASSVER/lib
 
 cd $PREFIX/lib
@@ -24,6 +26,11 @@ if test ! -d grass; then
 		install_name_tool -id @executable_path/lib/grass/$LNK grass/$LIB
 	done
 fi
+if test ! -f $LIBFFTW; then
+	cp /usr/local/lib/$LIBFFTW $LIBFFTW
+	ln -s $LIBFFTW $LNKFFTW
+	install_name_tool -id @executable_path/lib/$LNKFFTW $LIBFFTW
+fi
 
 # Update library paths to supporting libraries
 install_name_tool -change $GRASSLIB/libgrass_datetime.dylib \
@@ -63,6 +70,7 @@ do
 		grass/libgrass_vect.$GRASSVER.dylib
 done
 
+install_name_tool -change /usr/local/lib/$LNKFFTW @executable_path/lib/$LNKFFTW grass/libgrass_gmath.$GRASSVER.dylib
 install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL grass/libgrass_gproj.$GRASSVER.dylib
 install_name_tool -change /usr/local/lib/$LNKPROJ @executable_path/lib/$LNKPROJ grass/libgrass_gproj.$GRASSVER.dylib
 install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL grass/libgrass_vect.$GRASSVER.dylib

diff --git a/mac/release-extra-py.sh b/mac/release-extra-py.sh
@@ -5,7 +5,7 @@
 # Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
 INSTALLPREFIX=$PWD
 
-BUNDLE=qgis0.9.1.app/Contents/MacOS
+BUNDLE=qgis0.9.2.app/Contents/MacOS
 SITEPKG=/Library/Python/2.3/site-packages
 
 LNKGDAL=libgdal.1.dylib

diff --git a/mac/release-extra-qt.sh b/mac/release-extra-qt.sh
@@ -2,12 +2,12 @@
 # Copy Qt frameworks to qgis bundle
 # and make search paths for them relative to bundle
 
-PREFIX=qgis0.9.1.app/Contents/MacOS
+PREFIX=qgis0.9.2.app/Contents/MacOS
 
 # Edit version when any library is upgraded
 LIBJPEG=libjpeg.62.0.0.dylib
 LNKJPEG=libjpeg.62.dylib
-LIBPNG=libpng.3.1.2.8.dylib
+LIBPNG=libpng.3.24.0.dylib
 LNKPNG=libpng.3.dylib
 
 QTPREFIX=/usr/local/Qt4.3
@@ -82,7 +82,6 @@ cd ../../
 for FILE in \
 	qgis \
 	bin/qgis_help.app/Contents/MacOS/qgis_help \
-	bin/msexport.app/Contents/MacOS/msexport \
 	lib/libqgis_core.dylib \
 	lib/libqgis_gui.dylib \
 	lib/libqgisgrass.dylib \
@@ -100,12 +99,11 @@ for FILE in \
 	lib/qgis/libogrprovider.so \
 	lib/qgis/libpggeoprocessingplugin.so \
 	lib/qgis/libpostgresprovider.so \
+	lib/qgis/libquickprintplugin.so \
 	lib/qgis/libscalebarplugin.so \
 	lib/qgis/libspitplugin.so \
 	lib/qgis/libwfsplugin.so \
-	lib/qgis/libwmsprovider.so \
-	#bin/omgui \
-	#lib/qgis/libopenmodeller.so
+	lib/qgis/libwmsprovider.so
 do
 	for FRAMEWORK in QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support
 	do