Update Mac release scripts for 0.8.0 Preview 2.

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

mac/Read Me (Mac).rtf

@@ -1,11 +1,11 @@
-{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf380
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410
 \readonlydoc1{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fmodern\fcharset77 Courier;
 \f3\fswiss\fcharset77 Helvetica-Oblique;}
 {\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.8.0 Preview 1 Release Notes for Macintosh
+\f0\b\fs24 \cf0 QGIS 0.8.0 Preview 2 Release Notes for Macintosh
 \f1\b0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 \cf0 \
@@ -18,7 +18,8 @@
 1. Requirements\
 2. Included Libraries\
 3. Known limitations\
-4. GRASS Plugin\
+4. GPS Plugin\
+5. GRASS Plugin\
 \
 \
 \
@@ -41,16 +42,21 @@ This release of QGIS requires Mac OS X 10.3.9 or 10.4. A PostgreSQL version 7 or
 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.3.2 (libgdal.1.10.0.dylib)\
-GEOS 2.2.2 (libgeos.2.2.2.dylib)\
+GEOS 2.2.3 (libgeos.2.2.3.dylib)\
 PROJ 4.4.9 (libproj.0.5.0.dylib)\
 SQLITE3 3.3.6 (libsqlite3.0.8.6.dylib)\
 Xerces-C++ 2.7.0 (libxerces-c.27.0.dylib)\
-Qt/Mac 4.1.3 (various Qt frameworks)\
+Qt/Mac 4.1.4 (various Qt frameworks)\
+GIF 4.1.4 (libgif.4.1.4.dylib)\
 JPEG 6b (libjpeg.62.0.0.dylib)\
-PNG 1.2.8 (libpng.3.1.2.8.dylib\
-Expat 1.95.8 (libexpat.0.5.0.dylib)\
-GSL 1.6 (libgsl.0.7.0.dylib, libgslcblas.0.0.0.dylib)\
+PNG 1.2.8 (libpng.3.1.2.8.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)\
+Expat 2.0.0 (libexpat.1.5.0.dylib)\
+GSL 1.8 (libgsl.0.9.0.dylib, libgslcblas.0.0.0.dylib)\
 PostgreSQL 8.1.4 (libpq.4.1.dylib) This client can also access a version 7 server.\
+GRASS 6.0.2 (libgrass_*.6.0.2.dylib) The plugin will also work with GRASS 6.1.x.\
 \
 \
 \
@@ -76,27 +82,49 @@ If the International System Preferences Language is changed, it will not affect
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 
-\f0\b \cf0 4. GRASS Plugin\
+\f0\b \cf0 4. GPS Plugin\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 
 \f1\b0 \cf0 \
-The GRASS Plugin included in this release is configured to work with the Mac OS X GRASS6 distribution provided by Lorenzo Moretti at http://wwwamb.bologna.enea.it/forgrass/\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\cf0 To use GPSBabel with the GPS plugin, QGIS must be able to find it. This can be done in one of two ways. Create a symbolic link to GPSBabel in some directory already on your search path:\
 \
-If GRASS6 is correctly installed, the GRASS plugin will appear in the list when you open the QGIS Plugin Manager. This release of QGIS no longer requires any symbolic links to be changed in order to activate the GRASS plugin.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f2 \cf0 ln -s /Applications/GPSBabel+\\ 1.3.0/gpsbabel /usr/local/bin/gpsbabel\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1 \cf0 \
+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
-\cf0 \
-To use all the functions of the GRASS plugin, QGIS should be launched from inside GRASS. This can be done in two ways.\
+
+\f2 \cf0 export PATH=$PATH:/Applications/GPSBabel+\\ 1.3.0\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f1 \cf0 \
+\
+\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\b \cf0 5. GRASS Plugin\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f1\b0 \cf0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\cf0 To use all the functions of the GRASS plugin, QGIS should be launched from inside GRASS. This can be done in two ways.\
 \
 One method is to launch QGIS from the GRASS command-line prompt:\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f2 \cf0 /Applications/qgis-0.8.0pre1/qgis.app/Contents/MacOS/qgis\
+\f2 \cf0 /Applications/qgis-0.8.0pre2/qgis.app/Contents/MacOS/qgis\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
 \f1 \cf0 \
-Another method is to add a menu item for QGIS to the GRASS menu bar. To do this, open the file\
+Another method is to add a menu item for QGIS to the GRASS menu bar.\
+\
+To do this for GRASS 6.0.x, open the file\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
 \f2 \cf0 /Applications/Grass/grass60.app/Contents/Resources/grass-6.0.0/etc/dm/menu.tcl\
@@ -107,16 +135,20 @@ Another method is to add a menu item for QGIS to the GRASS menu bar. To do this,
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
 \f2 \cf0 "&Ext" all options $tmenu \{\
-\{command "Open QGIS" \{\} "open QGIS (Quantum GIS) with Grass support enabled" \{\} -command \{ exec $env(GRASS_HTML_BROWSER) "/Applications/qgis-0.8.0pre1/qgis.app" & \} \}\
+\{command "Open QGIS" \{\} "Open QGIS (Quantum GIS) with Grass support enabled" \{\} -command \{ exec $env(GRASS_HTML_BROWSER) "/Applications/qgis-0.8.0pre2/qgis.app" & \} \}\
 \}\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
 \f1 \cf0 \
+For GRASS 6.1.x, the 
+\f2 menu.tcl
+\f1  file has changed considerably. Although it is still possible to add an Open QGIS command, the above text must be modified and cannot be inserted as is.\
+\
 After making this edit and launching GRASS, you can select "Open QGIS" from the new Ext (external application) menu.\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f3\i \cf0 Thanks to Lorenzo Moretti for providing the GRASS menu information.\
+\f3\i \cf0 Thanks to Lorenzo Moretti for providing the GRASS 6.0.x menu information.\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
 \f1\i0 \cf0 \

mac/release-check.sh

@@ -7,7 +7,7 @@ PREFIX=qgis.app/Contents/MacOS
 otool -L $PREFIX/qgis
 otool -L $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
 otool -L $PREFIX/bin/gridmaker
-otool -L $PREFIX/bin/msexport
+otool -L $PREFIX/bin/msexport.app/Contents/MacOS/msexport
 #otool -L $PREFIX/bin/omgui
 otool -L $PREFIX/bin/qgis-config
 otool -L $PREFIX/bin/spit
@@ -45,21 +45,25 @@ otool -L $PREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork
 otool -L $PREFIX/lib/QtSql.framework/Versions/4.0/QtSql
 otool -L $PREFIX/lib/QtSvg.framework/Versions/4.0/QtSvg
 otool -L $PREFIX/lib/QtXml.framework/Versions/4.0/QtXml
-otool -L $PREFIX/lib/libQtDesigner.4.1.3.dylib
-otool -L $PREFIX/lib/libQtTest.4.1.3.dylib
+otool -L $PREFIX/lib/libQtDesigner.4.1.4.dylib
+otool -L $PREFIX/lib/libQtTest.4.1.4.dylib
 otool -L $PREFIX/imageformats/libqjpeg.dylib
 
 otool -L $PREFIX/lib/libgdal.1.10.0.dylib
 otool -L $PREFIX/lib/gdalplugins/gdal_GRASS.so
 otool -L $PREFIX/lib/gdalplugins/ogr_GRASS.so
-otool -L $PREFIX/lib/libgeos.2.2.2.dylib
+otool -L $PREFIX/lib/libgeos.2.2.3.dylib
 otool -L $PREFIX/lib/libproj.0.5.0.dylib
 otool -L $PREFIX/lib/libsqlite3.0.8.6.dylib
 otool -L $PREFIX/lib/libxerces-c.27.0.dylib
+otool -L $PREFIX/lib/libgif.4.1.4.dylib
 otool -L $PREFIX/lib/libjpeg.62.0.0.dylib
 otool -L $PREFIX/lib/libpng.3.1.2.8.dylib
-otool -L $PREFIX/lib/libexpat.0.5.0.dylib
-otool -L $PREFIX/lib/libgsl.0.7.0.dylib
+otool -L $PREFIX/lib/libtiff.3.dylib
+otool -L $PREFIX/lib/libgeotiff.1.2.3.dylib
+otool -L $PREFIX/lib/libjasper-1.701.1.0.0.dylib
+otool -L $PREFIX/lib/libexpat.1.5.0.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
@@ -70,3 +74,8 @@ otool -L $PREFIX/lib/libgslcblas.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.4.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.0.2.dylib
+done

mac/release-extra-grass.sh

@@ -0,0 +1,70 @@
+#!/bin/sh
+# Copy GRASS supporting libraries to qgis bundle
+# and make search paths for them relative to bundle
+
+PREFIX=qgis.app/Contents/MacOS
+
+# Edit version when any library is upgraded
+LNKGDAL=libgdal.1.dylib
+LNKPROJ=libproj.0.dylib
+GRASSVER=6.0.2
+GRASSLIB=/usr/local/grass-$GRASSVER/lib
+
+cd $PREFIX/lib
+
+# Copy supporting libraries to application bundle
+if test ! -d grass; then
+	mkdir grass
+	for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect
+	do
+		LIB=libgrass_$LIBGRASS.$GRASSVER.dylib
+		LNK=libgrass_$LIBGRASS.dylib
+		cp $GRASSLIB/$LIB grass/$LIB
+		ln -s $LIB grass/$LNK
+		install_name_tool -id @executable_path/lib/grass/$LNK grass/$LIB
+	done
+fi
+
+# Update library paths to supporting libraries
+install_name_tool -change $GRASSLIB/libgrass_datetime.dylib \
+	@executable_path/lib/grass/libgrass_datetime.dylib \
+	grass/libgrass_gis.$GRASSVER.dylib
+for LIBGRASS in dbmibase dbmiclient dig2 form gmath gproj I
+do
+	install_name_tool -change $GRASSLIB/libgrass_datetime.dylib \
+		@executable_path/lib/grass/libgrass_datetime.dylib \
+		grass/libgrass_$LIBGRASS.$GRASSVER.dylib
+	install_name_tool -change $GRASSLIB/libgrass_gis.dylib \
+		@executable_path/lib/grass/libgrass_gis.dylib \
+		grass/libgrass_$LIBGRASS.$GRASSVER.dylib
+done
+for LIBGRASS in dbmiclient form
+do
+	install_name_tool -change $GRASSLIB/libgrass_dbmibase.dylib \
+		@executable_path/lib/grass/libgrass_dbmibase.dylib \
+		grass/libgrass_$LIBGRASS.$GRASSVER.dylib
+done
+install_name_tool -change $GRASSLIB/libgrass_dbmiclient.dylib \
+	@executable_path/lib/grass/libgrass_dbmiclient.dylib \
+	grass/libgrass_form.$GRASSVER.dylib
+install_name_tool -change $GRASSLIB/libgrass_gmath.dylib \
+	@executable_path/lib/grass/libgrass_gmath.dylib \
+	grass/libgrass_I.$GRASSVER.dylib
+install_name_tool -change $GRASSLIB/libgrass_rtree.dylib \
+	@executable_path/lib/grass/libgrass_rtree.dylib \
+	grass/libgrass_dig2.$GRASSVER.dylib
+install_name_tool -change $GRASSLIB/libgrass_vask.dylib \
+	@executable_path/lib/grass/libgrass_vask.dylib \
+	grass/libgrass_I.$GRASSVER.dylib
+for LIBGRASS in datetime dbmibase dbmiclient gis dgl dig2 linkm rtree
+do
+	install_name_tool -change $GRASSLIB/libgrass_$LIBGRASS.dylib \
+		@executable_path/lib/grass/libgrass_$LIBGRASS.dylib \
+		grass/libgrass_vect.$GRASSVER.dylib
+done
+
+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
+
+cd ../../../../

mac/release-extra-qt.sh

@@ -10,7 +10,7 @@ LNKJPEG=libjpeg.62.dylib
 LIBPNG=libpng.3.1.2.8.dylib
 LNKPNG=libpng.3.dylib
 
-QTVER=4.1.3
+QTVER=4.1.4
 QTPREFIX=/usr/local/Trolltech/Qt-$QTVER
 QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support"
 QTLIBRARIES="QtDesigner QtTest"
@@ -102,7 +102,7 @@ for FILE in \
 	qgis \
 	bin/qgis_help.app/Contents/MacOS/qgis_help \
 	bin/gridmaker \
-	bin/msexport \
+	bin/msexport.app/Contents/MacOS/msexport \
 	bin/spit \
 	lib/libmsexport.0.0.0.dylib \
 	lib/libqgis_core.0.0.1.dylib \