Update Mac release scripts for 0.10.0.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8375 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 19, 2008 · 4618087 · 4618087
1 parent 0b7c624
commit 4618087
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 54 deletions.
diff --git a/mac/Read Me (Mac).rtf b/mac/Read Me (Mac).rtf
@@ -1,11 +1,11 @@
-{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf440
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf470
 \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.9.2 Release Notes for Macintosh
+\f0\b\fs24 \cf0 QGIS 0.10.0 Release Notes for Macintosh
 \f1\b0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 \cf0 \
@@ -41,25 +41,25 @@ 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.5.0 (libgdal.1.dylib)\
+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.2 (libsqlite3.0.8.6.dylib)\
+SQLITE3 3.5.7 (libsqlite3.0.8.6.dylib)\
 Xerces-C++ 2.8.0 (libxerces-c.28.0.dylib)\
-Qt/Mac 4.3.3 (various Qt frameworks)\
+Qt/Mac 4.3.4 (various Qt frameworks)\
 GIF 4.1.6 (libgif.4.1.6.dylib)\
 JPEG 6b (libjpeg.62.0.0.dylib)\
-PNG 1.2.24 (libpng.3.24.0.dylib)\
+PNG 1.2.24 (libpng12.0.24.0.dylib)\
 TIFF 3.8.2 (libtiff.3.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)\
+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.8 (libgsl.0.9.0.dylib, libgslcblas.0.0.0.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)\
+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)\
 \
 \
 \
@@ -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.9.2/qgis0.9.2.app/Contents/MacOS/qgis\
+\f2 \cf0 /Applications/qgis-0.10.0/qgis0.10.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
@@ -5,7 +5,8 @@
 # Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
 INSTALLPREFIX=$PWD
 
-BUNDLE=qgis0.9.2.app/Contents/MacOS
+VER=0.10
+BUNDLE=qgis$VER.0.app/Contents/MacOS
 BUILDPREFIX=$INSTALLPREFIX/$BUNDLE
 
 QLIBNAMES="core gui"
@@ -20,9 +21,17 @@ do
 		@executable_path/lib/libqgis_$NAME.dylib \
 		$BUILDPREFIX/qgis
 
-	install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.dylib \
+	install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \
 		@executable_path/lib/libqgis_$NAME.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_*

diff --git a/mac/release-check.sh b/mac/release-check.sh
@@ -2,7 +2,7 @@
 # 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.2.app/Contents/MacOS
+PREFIX=qgis0.10.0.app/Contents/MacOS
 
 otool -L $PREFIX/qgis
 otool -L $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
@@ -49,19 +49,19 @@ 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.6.dylib
 otool -L $PREFIX/lib/libjpeg.62.0.0.dylib
-otool -L $PREFIX/lib/libpng.3.24.0.dylib
+otool -L $PREFIX/lib/libpng12.0.24.0.dylib
 otool -L $PREFIX/lib/libtiff.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/libjasper.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/libpq.5.0.dylib
+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.0RC4.dylib
+	otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0RC6.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,14 +2,14 @@
 # Copy GRASS supporting libraries to qgis bundle
 # and make search paths for them relative to bundle
 
-PREFIX=qgis0.9.2.app/Contents/MacOS
+PREFIX=qgis0.10.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.0RC4
+GRASSVER=6.3.0RC6
 GRASSLIB=/usr/local/grass-$GRASSVER/lib
 
 cd $PREFIX/lib

diff --git a/mac/release-extra-py.sh b/mac/release-extra-py.sh
@@ -2,10 +2,7 @@
 # Copy Py supporting libraries to qgis bundle
 # and make search paths for them relative to bundle
 
-# Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
-INSTALLPREFIX=$PWD
-
-BUNDLE=qgis0.9.2.app/Contents/MacOS
+BUNDLE=qgis0.10.0.app/Contents/MacOS
 SITEPKG=/Library/Python/2.3/site-packages
 
 LNKGDAL=libgdal.1.dylib
@@ -49,12 +46,6 @@ fi
 # Update path to supporting libraries
 for LIBQGIS in core gui
 do
-	install_name_tool -change $INSTALLPREFIX/src/$LIBQGIS/libqgis_$LIBQGIS.dylib \
-		@executable_path/lib/libqgis_$LIBQGIS.dylib \
-		qgis/$LIBQGIS.so
-	install_name_tool -change $INSTALLPREFIX/src/core/libqgis_core.dylib \
-		@executable_path/lib/libqgis_core.dylib \
-		qgis/$LIBQGIS.so
 	install_name_tool -change /usr/local/lib/$LNKGDAL \
 		@executable_path/lib/$LNKGDAL \
 		qgis/$LIBQGIS.so

diff --git a/mac/release-extra-qt.sh b/mac/release-extra-qt.sh
@@ -2,7 +2,7 @@
 # Copy Qt frameworks to qgis bundle
 # and make search paths for them relative to bundle
 
-PREFIX=qgis0.9.2.app/Contents/MacOS
+PREFIX=qgis0.10.0.app/Contents/MacOS
 
 # Edit version when any library is upgraded
 LIBJPEG=libjpeg.62.0.0.dylib

diff --git 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.9.2.app/Contents/MacOS
+PREFIX=qgis0.10.0.app/Contents/MacOS
 
 HELPPREFIX=$PREFIX/bin/qgis_help.app/Contents/MacOS
 PREFIXBACKTRACK=../../../..
@@ -24,23 +24,23 @@ LIBGIF=libgif.4.1.6.dylib
 LNKGIF=libgif.4.dylib
 LIBJPEG=libjpeg.62.0.0.dylib
 LNKJPEG=libjpeg.62.dylib
-LIBPNG=libpng.3.24.0.dylib
-LNKPNG=libpng.3.dylib
+LIBPNG=libpng12.0.24.0.dylib
+LNKPNG=libpng12.0.dylib
 LIBTIFF=libtiff.3.dylib
 LNKTIFF=libtiff.3.dylib
 LIBGEOTIFF=libgeotiff.1.2.4.dylib
 LNKGEOTIFF=libgeotiff.1.dylib
-LIBJASPER=libjasper-1.701.1.0.0.dylib
-LNKJASPER=libjasper-1.701.1.dylib
-LIBGSL=libgsl.0.9.0.dylib
+LIBJASPER=libjasper.1.0.0.dylib
+LNKJASPER=libjasper.1.dylib
+LIBGSL=libgsl.0.dylib
 LNKGSL=libgsl.0.dylib
-LIBGSLCBLAS=libgslcblas.0.0.0.dylib
+LIBGSLCBLAS=libgslcblas.0.dylib
 LNKGSLCBLAS=libgslcblas.0.dylib
 LIBEXPAT=libexpat.1.5.2.dylib
 LNKEXPAT=libexpat.1.dylib
-LIBPQ=libpq.5.0.dylib
+LIBPQ=libpq.5.1.dylib
 LNKPQ=libpq.5.dylib
-GRASSLIB=/usr/local/grass-6.3.0RC4/lib
+GRASSLIB=/usr/local/grass-6.3.0RC6/lib
 
 # Copy supporting libraries to application bundle
 cd $PREFIX/lib
@@ -142,12 +142,12 @@ if test ! -f $LIBJASPER; then
 fi
 if test ! -f $LIBGSL; then
 	cp /usr/local/lib/$LIBGSL $LIBGSL
-	ln -s $LIBGSL $LNKGSL
+	#ln -s $LIBGSL $LNKGSL
 	install_name_tool -id @executable_path/lib/$LNKGSL $LIBGSL
 fi
 if test ! -f $LIBGSLCBLAS; then
 	cp /usr/local/lib/$LIBGSLCBLAS $LIBGSLCBLAS
-	ln -s $LIBGSLCBLAS $LNKGSLCBLAS
+	#ln -s $LIBGSLCBLAS $LNKGSLCBLAS
 	install_name_tool -id @executable_path/lib/$LNKGSLCBLAS $LIBGSLCBLAS
 fi
 if test ! -f $LIBEXPAT; then
@@ -199,7 +199,6 @@ for PLUGIN in \
 	libspitplugin.so \
 	libwfsplugin.so \
 	libwmsprovider.so
- 	#libopenmodellerplugin.so
 do
 	install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $PREFIX/lib/qgis/$PLUGIN
 	install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX/lib/qgis/$PLUGIN

diff --git a/mac/release-strip.sh b/mac/release-strip.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Strip all non-global symbols
 
-PREFIX=qgis0.9.2.app/Contents/MacOS
+PREFIX=qgis0.10.0.app/Contents/MacOS
 
 strip -x $PREFIX/qgis
 strip -x $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
@@ -49,19 +49,19 @@ strip -x $PREFIX/lib/libsqlite3.0.8.6.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/libpng.3.24.0.dylib
+strip -x $PREFIX/lib/libpng12.0.24.0.dylib
 strip -x $PREFIX/lib/libtiff.3.dylib
 strip -x $PREFIX/lib/libgeotiff.1.2.4.dylib
-strip -x $PREFIX/lib/libjasper-1.701.1.0.0.dylib
+strip -x $PREFIX/lib/libjasper.1.0.0.dylib
 strip -x $PREFIX/lib/libexpat.1.5.2.dylib
 strip -x $PREFIX/lib/libfftw3.3.1.2.dylib
-strip -x $PREFIX/lib/libgsl.0.9.0.dylib
-strip -x $PREFIX/lib/libgslcblas.0.0.0.dylib
-strip -x $PREFIX/lib/libpq.5.0.dylib
+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.0RC4.dylib
+	strip -x $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0RC6.dylib
 done
 
 strip -x $PREFIX/share/qgis/python/qgis/core.so