[QGIS Commit] r10860 - in trunk/qgis/mac: . extras

svn_qgis at osgeo.org svn_qgis at osgeo.org
Fri May 29 10:11:09 EDT 2009


Author: kyngchaos
Date: 2009-05-29 10:11:09 -0400 (Fri, 29 May 2009)
New Revision: 10860

Added:
   trunk/qgis/mac/extras/
   trunk/qgis/mac/extras/1-release-extra.sh
   trunk/qgis/mac/extras/2-release-extra-qt.sh
   trunk/qgis/mac/extras/3-dmg.sh
   trunk/qgis/mac/extras/Read Me (Mac).rtf
   trunk/qgis/mac/extras/install-extra.sh
   trunk/qgis/mac/extras/release-check.sh
   trunk/qgis/mac/extras/release-extra-grass.sh
   trunk/qgis/mac/extras/release-extra-py.sh
   trunk/qgis/mac/extras/release-extra-qt.sh
   trunk/qgis/mac/extras/release-extra.sh
   trunk/qgis/mac/extras/release-strip.sh
   trunk/qgis/mac/readme.txt
Log:
tidy up clutter

Copied: trunk/qgis/mac/extras/1-release-extra.sh (from rev 10859, trunk/qgis/mac/1-release-extra.sh)
===================================================================
--- trunk/qgis/mac/extras/1-release-extra.sh	                        (rev 0)
+++ trunk/qgis/mac/extras/1-release-extra.sh	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,166 @@
+#!/bin/sh
+# Copy supportibng libraries (except Qt) to openModeller bundle
+# and make search paths for them relative to bundle
+
+
+APP_PREFIX=/Applications/qgis0.11.0.app
+BUNDLE_DIR=${APP_PREFIX}/Contents/MacOS
+DEPS_BASE=/usr/local/qgis_universal_deps
+LIB_DIR=${DEPS_BASE}/lib
+#set -x
+cp -r ${LIB_DIR}/libexpat.dylib  ${BUNDLE_DIR}/lib
+cp -r ${LIB_DIR}/libgdal.1.dylib  ${BUNDLE_DIR}/lib
+cp -r ${LIB_DIR}/libgeos.dylib  ${BUNDLE_DIR}/lib
+cp -r ${LIB_DIR}/libproj.dylib  ${BUNDLE_DIR}/lib
+cp -r ${LIB_DIR}/libgsl.dylib  ${BUNDLE_DIR}/lib
+cp -r ${LIB_DIR}/libgslcblas.dylib  ${BUNDLE_DIR}/lib
+#cp -r ${LIB_DIR}/libsqlite3.0.dylib  ${BUNDLE_DIR}
+pushd .
+cd ${BUNDLE_DIR}/lib
+ln -s libgdal.1.dylib libgdal.dylib
+ln -s libexpat.dylib libexpat.1.dylib
+ln -s libgsl.dylib libgsl.0.dylib
+ln -s libgslcblas.dylib libgslcblas.0.dylib
+#ln -s libsqlite3.0.dylib libsqlite3.dylib
+popd
+
+set -x
+install_name_tool -change ${LIB_DIR}/libgdal.1.dylib \
+                   @executable_path/lib/libgdal.1.dylib \
+                   ${BUNDLE_DIR}/qgis
+install_name_tool -change ${LIB_DIR}/libproj.dylib \
+                   @executable_path/lib/libproj.dylib \
+                   ${BUNDLE_DIR}/qgis
+
+set +x
+
+LIBS="lib/libqgis_core.dylib \
+      lib/libqgis_gui.dylib \
+      lib/libexpat.1.dylib \
+      lib/libgsl.0.dylib \
+      lib/libgslcblas.0.dylib \
+      lib/libexpat.dylib \
+      lib/libgdal.dylib \
+      lib/libgeos.dylib \
+      lib/libproj.dylib"
+#
+# Next we work through all the libs except Qt libs 
+# and update the library ids and paths for these libs
+#
+for LIB in $LIBS
+do
+  install_name_tool -id @executable_path/$LIB ${BUNDLE_DIR}/${LIB}
+  #echo "install_name_tool -id @executable_path/$LIB ${BUNDLE_DIR}/${LIB}"
+  # for debugging only
+  for LIBPATH in `otool -L ${BUNDLE_DIR}/${LIB} \
+                  | sed 's/(\([a-zA-Z0-9\., ]*\))//g' \
+                  | grep  $LIB_DIR \
+                  | grep -v framework` #frameworks (in particular qt frameworks) 
+                                       #get dealt with in another script
+  do 
+    #echo $LIBPATH 
+    BASELIB=`basename "$LIBPATH"`
+    #echo $BASELIB
+    install_name_tool -change ${LIBPATH} \
+                      @executable_path/lib/${BASELIB} \
+                      ${BUNDLE_DIR}/${LIB}
+  done
+  #otool -L ${BUNDLE_DIR}/${LIB}
+  echo ${LIB}
+done
+
+#
+# Next sort out the qgis plugins....
+#
+LIBS="libcopyrightlabelplugin.so      
+      libgpxprovider.so               
+      libscalebarplugin.so
+      libdelimitedtextplugin.so       
+      libgridmakerplugin.so           
+      libwfsplugin.so
+      libdelimitedtextprovider.so     
+      libnortharrowplugin.so          
+      libwfsprovider.so
+      libgeorefplugin.so              
+      libogrprovider.so               
+      libwmsprovider.so
+      libgpsimporterplugin.so         
+      libquickprintplugin.so
+      libevis.so"
+for LIB in $LIBS
+do
+  install_name_tool -id @executable_path/lib/qgis/${LIB} ${BUNDLE_DIR}/lib/qgis/${LIB}
+  # for debugging only
+  for LIBPATH in `otool -L ${BUNDLE_DIR}/lib/qgis/${LIB} \
+                  | sed 's/(\([a-zA-Z0-9\., ]*\))//g' \
+                  | grep  $LIB_DIR \
+                  | grep -v framework` #frameworks (in particular qt frameworks) get
+                                       #dealt with in another script
+  do 
+    #echo "------------"
+    #echo $LIBPATH 
+    #echo "------------"
+    BASELIB=`basename "$LIBPATH"`
+    #echo $BASELIB
+    install_name_tool -change ${LIBPATH} @executable_path/lib/${BASELIB} ${BUNDLE_DIR}/lib/qgis/${LIB}
+  done
+  echo $LIB
+  #otool -L ${BUNDLE_DIR}/lib/qgis/${LIB}
+  #echo "----------------------------------"
+done
+
+# Python libs need some special care
+LIBS="share/qgis/python/qgis/core.so
+      share/qgis/python/qgis/gui.so
+      lib/libqgispython.dylib"
+for LIB in $LIBS
+do
+  install_name_tool -id @executable_path/${LIB} ${BUNDLE_DIR}/${LIB}
+  # for debugging only
+  for LIBPATH in `otool -L ${BUNDLE_DIR}/${LIB} \
+                  | sed 's/(\([a-zA-Z0-9\., ]*\))//g' \
+                  | grep  $LIB_DIR \
+                  | grep -v framework` #frameworks (in particular qt frameworks) get
+                                       #dealt with in another script
+  do 
+    #echo "------------"
+    #echo $LIBPATH 
+    #echo "------------"
+    BASELIB=`basename "$LIBPATH"`
+    #echo $BASELIB
+    install_name_tool -change ${LIBPATH} @executable_path/lib/${BASELIB} ${BUNDLE_DIR}/${LIB}
+  done
+  # Change the search path for qgis libs in python libs
+
+  CORELIBPATH=/`otool -L ${BUNDLE_DIR}/${LIB} |grep -o "\b[/A-Za-z0-9]*libqgis_core.[0-9.]*.dylib\b"`
+  CORELIB=`echo "${CORELIBPATH}" | grep -o "libqgis_core.[0-9.]*.dylib"`
+  install_name_tool -change ${CORELIBPATH} @executable_path/lib/${CORELIB} ${BUNDLE_DIR}/${LIB}
+  GUILIBPATH=/`otool -L ${BUNDLE_DIR}/${LIB} |grep -o "\b[/A-Za-z0-9]*libqgis_gui.[0-9.]*.dylib\b"`
+  GUILIB=`echo "${CORELIBPATH}" | grep -o "libqgis_gui.[0-9.]*.dylib"`
+  install_name_tool -change ${GUILIBPATH} @executable_path/lib/${GUILIB} ${BUNDLE_DIR}/${LIB}
+  echo $LIB
+  #otool -L ${BUNDLE_DIR}/lib/qgis/${LIB}
+  #echo "----------------------------------"
+done
+
+
+/Users/timlinux/dev/cpp/qgis/build/src/core/libqgis_core.0.11.dylib
+
+#
+# Strip binaries - disable for debugging
+#
+#pushd .
+#cd ${APP_PREFIX}
+#for FILE in `find . -name *.dylib`; do echo "Stripping $FILE"; strip -x $FILE;  done 
+#for FILE in `find . -name *.so`; do echo "Stripping $FILE"; strip -x $FILE;  done
+#strip -x ${APP_PREFIX}/Contents/MacOS/qgis
+#popd
+
+#
+# Install GDAL and Proj support files
+# 
+cp -r ${DEPS_BASE}/share/proj ${APP_PREFIX}/Contents/MacOS/share/
+cp -r ${DEPS_BASE}/share/*.wkt ${APP_PREFIX}/Contents/MacOS/share/
+cp -r ${DEPS_BASE}/share/*.csv ${APP_PREFIX}/Contents/MacOS/share/
+cp -r ${DEPS_BASE}/share/*.dgn ${APP_PREFIX}/Contents/MacOS/share/
+

Copied: trunk/qgis/mac/extras/2-release-extra-qt.sh (from rev 10859, trunk/qgis/mac/2-release-extra-qt.sh)
===================================================================
--- trunk/qgis/mac/extras/2-release-extra-qt.sh	                        (rev 0)
+++ trunk/qgis/mac/extras/2-release-extra-qt.sh	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,157 @@
+#!/bin/sh
+# Copy Qt frameworks to atlas bundle
+# and make search paths for them relative to bundle
+
+APP_PREFIX=/Applications/qgis0.11.0.app
+MACOS_PREFIX=${APP_PREFIX}/Contents/MacOS
+FRAMEWORKPREFIX=${APP_PREFIX}/Contents/Frameworks
+mkdir -p $MACOS_PREFIX
+mkdir -p $FRAMEWORKPREFIX
+pushd $PWD
+cd $FRAMEWORKPREFIX
+
+# Edit version when any library is upgraded
+UNIVERSAL_LIBS_PREFIX=/usr/local/qgis_universal_deps
+QTPREFIX=${UNIVERSAL_LIBS_PREFIX}/lib
+QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml QtDesigner"
+
+#
+# Copy supporting frameworks to application bundle
+#
+cd $FRAMEWORKPREFIX
+for FRAMEWORK in $QTFRAMEWORKS
+do
+	LIBFRAMEWORK=$FRAMEWORK.framework/Versions/4/$FRAMEWORK
+	if test ! -f $LIBFRAMEWORK; then
+		mkdir -p $FRAMEWORK.framework/Versions/4
+		cp $QTPREFIX/$LIBFRAMEWORK $LIBFRAMEWORK
+		install_name_tool -id @executable_path/../Frameworks/$LIBFRAMEWORK $LIBFRAMEWORK
+	fi
+done
+
+# Update path to supporting frameworks
+for FRAMEWORK in QtGui QtNetwork QtSql QtSvg QtXml
+do
+	install_name_tool -change ${QTPREFIX}/QtCore.framework/Versions/4/QtCore \
+		@executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore \
+		$FRAMEWORK.framework/Versions/4/$FRAMEWORK
+done
+
+for FRAMEWORK in QtSvg
+do
+	install_name_tool -change ${QTPREFIX}/QtGui.framework/Versions/4/QtGui \
+		@executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui \
+		$FRAMEWORK.framework/Versions/4/$FRAMEWORK
+	install_name_tool -change ${QTPREFIX}/QtXml.framework/Versions/4/QtXml \
+		@executable_path/../Frameworks/QtXml.framework/Versions/4/QtXml \
+		$FRAMEWORK.framework/Versions/4/$FRAMEWORK
+done
+
+#
+# Update qgis related libs and binaries
+#
+
+cd $MACOS_PREFIX
+FILES="qgis
+  lib/libqgis_core.dylib
+  lib/libqgis_gui.dylib
+  lib/qgis/libcatalogue.so
+  lib/qgis/libcopyrightlabelplugin.so
+  lib/qgis/libgpxprovider.so
+  lib/qgis/libscalebarplugin.so
+  lib/qgis/libdelimitedtextplugin.so
+  lib/qgis/libgridmakerplugin.so
+  lib/qgis/libwfsplugin.so
+  lib/qgis/libdelimitedtextprovider.so
+  lib/qgis/libnortharrowplugin.so
+  lib/qgis/libwfsprovider.so
+  lib/qgis/libgeorefplugin.so
+  lib/qgis/libogrprovider.so
+  lib/qgis/libwmsprovider.so
+  lib/qgis/libgpsimporterplugin.so
+  lib/qgis/libevis.so
+  lib/qgis/libquickprintplugin.so
+  share/qgis/python/qgis/core.so
+  share/qgis/python/qgis/gui.so
+  lib/libqgispython.dylib"
+for FILE in ${FILES}
+do
+ for FRAMEWORK in QtCore QtGui QtNetwork QtSql QtSvg QtXml
+	do
+		install_name_tool -change ${QTPREFIX}/${FRAMEWORK}.framework/Versions/4/$FRAMEWORK \
+			@executable_path/../Frameworks/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \
+			$MACOS_PREFIX/$FILE
+	done
+done
+
+
+
+#
+# Update qt imageformat plugin paths
+#
+
+
+cd ${MACOS_PREFIX}/../
+mkdir -p plugins/imageformats
+cd plugins/imageformats
+
+LIBJPEG=libjpeg.dylib
+LIBQJPEG=${UNIVERSAL_LIBS_PREFIX}/plugins/imageformats/libqjpeg.dylib
+if test ! -f $LIBJPEG; then
+	cp $LIBQJPEG $LIBJPEG
+	# Update path to supporting libraries
+	install_name_tool -change ${QTPREFIX}/QtCore.framework/Versions/4/QtCore \
+		@executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore \
+		$LIBJPEG
+	install_name_tool -change ${QTPREFIX}/QtGui.framework/Versions/4/QtGui \
+		@executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui \
+		$LIBJPEG
+	install_name_tool -change $LIBQJPEG @executable_path/../plugins/imageformats/$LIBJPEG 
+fi
+LIBGIF=libgif.dylib
+LIBQGIF=${UNIVERSAL_LIBS_PREFIX}/plugins/imageformats/libqgif.dylib
+if test ! -f $LIBGIF; then
+	cp $LIBQGIF $LIBGIF
+	# Update path to supporting libraries
+	install_name_tool -change ${QTPREFIX}/QtCore.framework/Versions/4/QtCore \
+		@executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore \
+		$LIBGIF
+	install_name_tool -change ${QTPREFIX}/QtGui.framework/Versions/4/QtGui \
+		@executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui \
+		$LIBGIF
+	install_name_tool -change $LIBQGIF @executable_path/../plugins/imageformats/$LIBGIF 
+fi
+
+#
+# QT Sql Drivers
+#
+cd ${MACOS_PREFIX}/../
+mkdir -p plugins/sqldrivers
+cd plugins/sqldrivers
+LIBSQLITE=libqsqlite.dylib
+LIBQSQLITE=${UNIVERSAL_LIBS_PREFIX}/plugins/sqldrivers/libqsqlite.dylib
+if test ! -f $LIBSQLITE; then
+	cp $LIBQSQLITE $LIBSQLITE
+	# Update path to supporting libraries
+	install_name_tool -change ${QTPREFIX}/QtCore.framework/Versions/4/QtCore \
+		@executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore \
+		$LIBSQLITE
+	install_name_tool -change ${QTPREFIX}/QtSql.framework/Versions/4/QtSql \
+		@executable_path/../Frameworks/QtSql.framework/Versions/4/QtSql \
+		$LIBSQLITE
+	install_name_tool -change $LIBSQLITE @executable_path/../plugins/sqldrivers/$LIBSQLITE 
+fi
+
+popd
+
+#
+# Strip the qt libs
+#
+
+strip -x ${FRAMEWORKPREFIX}/QtGui.framework/Versions/4/QtGui 
+strip -x ${FRAMEWORKPREFIX}/QtCore.framework/Versions/4/QtCore 
+strip -x ${FRAMEWORKPREFIX}/QtSql.framework/Versions/4/QtSql 
+strip -x ${FRAMEWORKPREFIX}/QtSvg.framework/Versions/4/QtSvg 
+strip -x ${FRAMEWORKPREFIX}/QtXml.framework/Versions/4/QtXml 
+strip -x ${FRAMEWORKPREFIX}/QtNetwork.framework/Versions/4/QtNetwork 
+strip -x ${FRAMEWORKPREFIX}/QtDesigner.framework/Versions/4/QtDesigner

Copied: trunk/qgis/mac/extras/3-dmg.sh (from rev 10859, trunk/qgis/mac/3-dmg.sh)
===================================================================
--- trunk/qgis/mac/extras/3-dmg.sh	                        (rev 0)
+++ trunk/qgis/mac/extras/3-dmg.sh	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+#
+# A bash script to create a dmg image file of the 
+#            final application bundle
+#              (c) Tim Sutton 2007
+
+DMGNAME=QGISAlaskaUncompressed.dmg
+COMPRESSEDDMGNAME=QGISAlaska.dmg
+set -x
+
+echo "Removing old dmg if it exists"
+rm ~/Desktop/${DMGNAME}
+rm ~/Desktop/${COMPRESSEDDMGNAME}
+hdiutil create -size 300m -fs HFS+ -volname "QGISAlaska" ~/Desktop/${DMGNAME}
+ 
+# Mount the disk image
+hdiutil attach ~/Desktop/${DMGNAME}
+
+# Obtain device information
+DEVS=$(hdiutil attach ~/Desktop/${DMGNAME} | cut -f 1)
+DEV=$(echo $DEVS | cut -f 1 -d ' ')
+VOLUME=$(mount |grep ${DEV} | cut -f 3 -d ' ') 
+ 
+# copy in the application bundle
+cp -Rp /Applications/QGISAlaska.app ${VOLUME}/QGISAlaska.app
+
+# copy in background image and folder settings for icon sizes etc
+tar xvfz alaska_extra_dmg_files.tar.gz -C ${VOLUME} 
+cp ../LICENSE ${VOLUME}/LICENSE.txt
+
+# Unmount the disk image
+hdiutil detach $DEV
+ 
+# Convert the disk image to read-only
+hdiutil convert ~/Desktop/${DMGNAME} \
+  -format UDZO -o ~/Desktop/${COMPRESSEDDMGNAME}
+

Copied: trunk/qgis/mac/extras/Read Me (Mac).rtf (from rev 10859, trunk/qgis/mac/Read Me (Mac).rtf)
===================================================================
--- trunk/qgis/mac/extras/Read Me (Mac).rtf	                        (rev 0)
+++ trunk/qgis/mac/extras/Read Me (Mac).rtf	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,136 @@
+{\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 1.0.0 Release Notes for Macintosh
+\f1\b0 \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+\cf0 \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\b \cf0 Contents\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f1\b0 \cf0 \
+1. Requirements\
+2. Included Libraries\
+3. Known limitations\
+4. GPS Plugin\
+5. GRASS Plugin\
+6. Python Language and Plugins\
+\
+\
+\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\b \cf0 1. Requirements\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f1\b0 \cf0 \
+This release of QGIS requires Mac OS X 10.3.9 or later. A PostgreSQL version 7 or 8 server with PostGIS extensions installed is required if using PostgreSQL features.\
+\
+\
+\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\b \cf0 2. Included Libraries\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\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.3 (libgdal.1.dylib)\
+GEOS 3.0.1 (libgeos_c.1.4.2.dylib)\
+PROJ 4.6.1 (libproj.0.5.5.dylib)\
+SQLite 3.6.4 (libsqlite3.0.dylib)\
+Xerces-C++ 2.8.0 (libxerces-c.28.0.dylib)\
+Qt/Mac 4.4.3 (various Qt frameworks)\
+GIF 4.1.6 (libgif.4.1.6.dylib)\
+JPEG 6b (libjpeg.62.0.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.3 (libfftw3.3.1.3.dylib)\
+GSL 1.11 (libgsl.0.dylib, libgslcblas.0.dylib)\
+PostgreSQL 8.3.4 (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.7 (sip.so)\
+PyQt4 4.4.3 (Qt*.so)\
+\
+\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b \cf0 3. Known limitations\
+\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 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.\
+\
+\
+\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\b \cf0 4. GPS 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 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:\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f2 \cf0 ln -s /Applications/GPSBabel+-1.3.6/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
+
+\f2 \cf0 export PATH=$PATH:/Applications/GPSBabel+-1.3.6\
+\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 enable all the functions of the GRASS plugin, a GRASS mapset must be opened first or else QGIS should be launched from inside GRASS. Some GRASS distributions provide a GRASS menu item to launch QGIS. If GRASS does not contain a QGIS menu item, 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-1.0.0/qgis1.0.0.app/Contents/MacOS/qgis\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f1 \cf0 \
+If you have not previously run QGIS with GRASS, you may be prompted for the location of the GRASS directory GISBASE. On a Mac, this directory is usually somewhere inside the GRASS bundle (GRASS.app). Select the folder containing a 
+\f2 bin
+\f1  folder containing many files beginning with "d."\
+(d dot).\
+\
+\
+\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\b \cf0 6. Python Language and Plugins\
+\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 Using Python plugins or the programming language requires Python 2.5. It is already installed with Mac OS X 10.5 but must be obtained from http://www.python.org for Mac OS X 10.4.\
+}
\ No newline at end of file

Copied: trunk/qgis/mac/extras/install-extra.sh (from rev 10859, trunk/qgis/mac/install-extra.sh)
===================================================================
--- trunk/qgis/mac/extras/install-extra.sh	                        (rev 0)
+++ trunk/qgis/mac/extras/install-extra.sh	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,120 @@
+#!/bin/sh
+# Make all libs and plugins in qgis bundle relative to bundle
+# This allows the bundle to be moved to another folder and still work
+
+# Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
+INSTALLPREFIX=$PWD
+
+VER=1.0
+BUNDLE=qgis$VER.0.app/Contents/MacOS
+BUILDPREFIX=$INSTALLPREFIX/$BUNDLE
+
+QLIBNAMES="core gui"
+
+# 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.$VER.dylib \
+		$BUILDPREFIX/lib/libqgis_$NAME.$VER.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.$VER.dylib \
+		$BUILDPREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
+done
+
+# 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_*
+for PLUGIN in \
+	qgis/libcoordinatecaptureplugin.so \
+	qgis/libcopyrightlabelplugin.so \
+	qgis/libdelimitedtextplugin.so \
+	qgis/libdelimitedtextprovider.so \
+	qgis/libdxf2shpconverterplugin.so \
+	qgis/libgeorefplugin.so \
+	qgis/libgpsimporterplugin.so \
+	qgis/libgpxprovider.so \
+	qgis/libgridmakerplugin.so \
+	qgis/libinterpolationplugin.so \
+	qgis/libmemoryprovider.so \
+	qgis/libnortharrowplugin.so \
+	qgis/libogrconverterplugin.so \
+	qgis/libogrprovider.so \
+	qgis/libpostgresprovider.so \
+	qgis/libscalebarplugin.so \
+	qgis/libspitplugin.so \
+	qgis/libwfsplugin.so \
+	qgis/libwfsprovider.so \
+	qgis/libwmsprovider.so
+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
+
+if test -f $BUILDPREFIX/lib/libqgisgrass.$VER.dylib; then
+
+	# 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

Copied: trunk/qgis/mac/extras/release-check.sh (from rev 10859, trunk/qgis/mac/release-check.sh)
===================================================================
--- trunk/qgis/mac/extras/release-check.sh	                        (rev 0)
+++ trunk/qgis/mac/extras/release-check.sh	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,93 @@
+#!/bin/sh
+# Display all paths to supporting libraries
+# Output should be visually inspected for paths which haven't been made relative (such as /usr/local)
+
+PREFIX=qgis1.0.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/qgis/libcoordinatecaptureplugin.so
+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/libdxf2shpconverterplugin.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/libgridmakerplugin.so 
+otool -L $PREFIX/lib/qgis/libinterpolationplugin.so
+otool -L $PREFIX/lib/qgis/libmemoryprovider.so
+otool -L $PREFIX/lib/qgis/libnortharrowplugin.so
+otool -L $PREFIX/lib/qgis/libogrconverterplugin.so
+otool -L $PREFIX/lib/qgis/libogrprovider.so
+otool -L $PREFIX/lib/qgis/libpostgresprovider.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
+otool -L $PREFIX/lib/QtCore.framework/Versions/4/QtCore
+otool -L $PREFIX/lib/QtGui.framework/Versions/4/QtGui
+otool -L $PREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork
+otool -L $PREFIX/lib/QtSql.framework/Versions/4/QtSql
+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.dylib
+otool -L $PREFIX/lib/libgeos.3.0.1.dylib
+otool -L $PREFIX/lib/libgeos_c.1.4.2.dylib
+otool -L $PREFIX/lib/libproj.0.5.5.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.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
+otool -L $PREFIX/lib/libexpat.1.5.2.dylib
+otool -L $PREFIX/lib/libfftw3.3.1.3.dylib
+otool -L $PREFIX/lib/libgsl.0.dylib
+otool -L $PREFIX/lib/libgslcblas.0.dylib
+otool -L $PREFIX/lib/libpq.5.1.dylib
+
+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 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.3.dylib
+
+	otool -L $PREFIX/share/qgis/python/sip.so
+	for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
+	do
+		otool -L $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so
+	done
+fi
+

Copied: trunk/qgis/mac/extras/release-extra-grass.sh (from rev 10859, trunk/qgis/mac/release-extra-grass.sh)
===================================================================
--- trunk/qgis/mac/extras/release-extra-grass.sh	                        (rev 0)
+++ trunk/qgis/mac/extras/release-extra-grass.sh	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,78 @@
+#!/bin/sh
+# Copy GRASS supporting libraries to qgis bundle
+# and make search paths for them relative to bundle
+
+PREFIX=qgis1.0.0.app/Contents/MacOS
+
+# Edit version when any library is upgraded
+LNKGDAL=libgdal.1.dylib
+LNKPROJ=libproj.0.dylib
+LIBFFTW=libfftw3.3.1.3.dylib
+LNKFFTW=libfftw3.3.dylib
+GRASSVER=6.3.0
+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
+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 \
+	@executable_path/lib/grass/libgrass_datetime.dylib \
+	grass/libgrass_gis.$GRASSVER.dylib
+for LIBGRASS in dbmibase dbmiclient dig2 form gmath gproj I vask
+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/$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
+
+cd ../../../../

Copied: trunk/qgis/mac/extras/release-extra-py.sh (from rev 10859, trunk/qgis/mac/release-extra-py.sh)
===================================================================
--- trunk/qgis/mac/extras/release-extra-py.sh	                        (rev 0)
+++ trunk/qgis/mac/extras/release-extra-py.sh	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,134 @@
+#!/bin/sh
+# Copy PyQt supporting libraries to qgis bundle
+# and make search paths for them relative to bundle
+
+BUNDLE=qgis1.0.0.app/Contents/MacOS
+
+# Edit version when any library is upgraded
+LNKGDAL=libgdal.1.dylib
+LNKGEOSC=libgeos_c.1.dylib
+
+QTPREFIX=/usr/local/Trolltech/Qt-4.4.3
+QTFRAMEWORKS="QtAssistant QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon"
+LIBQTCL=libQtCLucene.4.4.3.dylib
+LNKQTCL=libQtCLucene.4.dylib
+
+SITEPKG=/Library/Python/2.5/site-packages
+
+# Copy additional Qt frameworks needed by PyQt to application bundle
+cd $BUNDLE/lib
+
+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 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 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 QtHelp 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
+install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4/QtXml \
+	@executable_path/lib/QtXml.framework/Versions/4/QtXml \
+	QtHelp.framework/Versions/4/QtHelp
+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 QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
+	do
+		cp $SITEPKG/PyQt4/$LIBPYQT4.so PyQt4/$LIBPYQT4.so
+		# 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 $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \
+			@executable_path/lib/QtCore.framework/Versions/4/QtCore \
+			PyQt4/$LIBPYQT4.so
+		install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4/QtGui \
+			@executable_path/lib/QtGui.framework/Versions/4/QtGui \
+			PyQt4/$LIBPYQT4.so
+	done
+	# 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 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/libQtCLucene.4.dylib \
+		@executable_path/lib/libQtCLucene.4.dylib \
+		PyQt4/QtHelp.so
+fi
+
+# 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/$LNKGEOSC \
+		@executable_path/lib/$LNKGEOSC \
+		qgis/$LIBQGIS.so
+	for FRAMEWORK in QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support
+	do
+		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 ../../../../../../

Copied: trunk/qgis/mac/extras/release-extra-qt.sh (from rev 10859, trunk/qgis/mac/release-extra-qt.sh)
===================================================================
--- trunk/qgis/mac/extras/release-extra-qt.sh	                        (rev 0)
+++ trunk/qgis/mac/extras/release-extra-qt.sh	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,124 @@
+#!/bin/sh
+# Copy Qt frameworks to qgis bundle
+# and make search paths for them relative to bundle
+
+BUNDLE=qgis1.0.0.app/Contents/MacOS
+
+# Edit version when any library is upgraded
+LIBJPEG=libjpeg.62.0.0.dylib
+LNKJPEG=libjpeg.62.dylib
+LIBPNG=libpng12.0.dylib
+LNKPNG=libpng12.0.dylib
+
+QTPREFIX=/usr/local/Trolltech/Qt-4.4.3
+QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support"
+
+# Copy Qt frameworks to application bundle
+cd $BUNDLE/lib
+
+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
+
+# Update Qt framework paths to supporting Qt frameworks
+for FRAMEWORK in QtGui QtNetwork QtSql QtSvg QtXml Qt3Support
+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
+for FRAMEWORK in QtSvg Qt3Support
+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
+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 $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 \
+		$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 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 $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
+	install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $LIBQJPEG
+	# 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/libcoordinatecaptureplugin.so \
+	lib/qgis/libcopyrightlabelplugin.so \
+	lib/qgis/libdelimitedtextplugin.so \
+	lib/qgis/libdelimitedtextprovider.so \
+	lib/qgis/libdxf2shpconverterplugin.so \
+	lib/qgis/libgeorefplugin.so \
+	lib/qgis/libgpsimporterplugin.so \
+	lib/qgis/libgpxprovider.so \
+	lib/qgis/libgrassplugin.so \
+	lib/qgis/libgrassprovider.so \
+	lib/qgis/libgridmakerplugin.so \
+	lib/qgis/libinterpolationplugin.so \
+	lib/qgis/libmemoryprovider.so \
+	lib/qgis/libnortharrowplugin.so \
+	lib/qgis/libogrconverterplugin.so \
+	lib/qgis/libogrprovider.so \
+	lib/qgis/libpostgresprovider.so \
+	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 $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \
+			@executable_path/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \
+			$BUNDLE/$FILE
+	done
+done

Copied: trunk/qgis/mac/extras/release-extra.sh (from rev 10859, trunk/qgis/mac/release-extra.sh)
===================================================================
--- trunk/qgis/mac/extras/release-extra.sh	                        (rev 0)
+++ trunk/qgis/mac/extras/release-extra.sh	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,263 @@
+#!/bin/sh
+# Copy supporting libraries (except Qt) to qgis bundle
+# and make search paths for them relative to bundle
+
+VER=1.0
+PREFIX=qgis$VER.0.app/Contents/MacOS
+
+HELPPREFIX=$PREFIX/bin/qgis_help.app/Contents/MacOS
+PREFIXBACKTRACK=../../../..
+
+# Edit version when any library is upgraded
+LIBGDAL=libgdal.1.dylib
+LNKGDAL=libgdal.1.dylib
+LIBGEOS=libgeos.3.0.1.dylib
+LNKGEOS=libgeos.3.dylib
+LIBGEOSC=libgeos_c.1.4.2.dylib
+LNKGEOSC=libgeos_c.1.dylib
+LIBPROJ=libproj.0.5.5.dylib
+LNKPROJ=libproj.0.dylib
+LIBSQLITE3=libsqlite3.0.dylib
+LNKSQLITE3=libsqlite3.0.dylib
+LIBXERCESC=libxerces-c.28.0.dylib
+LNKXERCESC=libxerces-c.28.dylib
+LIBGIF=libgif.4.1.6.dylib
+LNKGIF=libgif.4.dylib
+LIBJPEG=libjpeg.62.0.0.dylib
+LNKJPEG=libjpeg.62.dylib
+LIBPNG=libpng12.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.0.0.dylib
+LNKJASPER=libjasper.1.dylib
+LIBGSL=libgsl.0.dylib
+LNKGSL=libgsl.0.dylib
+LIBGSLCBLAS=libgslcblas.0.dylib
+LNKGSLCBLAS=libgslcblas.0.dylib
+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.0/lib
+
+# Copy supporting libraries to application bundle
+cd $PREFIX/lib
+if test ! -f $LIBGEOS; then
+	cp /usr/local/lib/$LIBGEOS $LIBGEOS
+	ln -s $LIBGEOS $LNKGEOS
+	install_name_tool -id @executable_path/lib/$LNKGEOS $LIBGEOS
+fi
+if test ! -f $LIBGEOSC; then
+	cp /usr/local/lib/$LIBGEOSC $LIBGEOSC
+	ln -s $LIBGEOSC $LNKGEOSC
+	install_name_tool -id @executable_path/lib/$LNKGEOSC $LIBGEOSC
+	# Update path to supporting libraries
+	install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $LIBGEOSC
+fi
+if test ! -f $LIBGDAL; then
+	cp /usr/local/lib/$LIBGDAL $LIBGDAL
+	#ln -s $LIBGDAL $LNKGDAL
+	install_name_tool -id @executable_path/lib/$LNKGDAL $LIBGDAL
+	# Update path to supporting libraries
+	install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $LIBGDAL
+	install_name_tool -change /usr/local/lib/$LNKGEOSC @executable_path/lib/$LNKGEOSC $LIBGDAL
+	install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $LIBGDAL
+	install_name_tool -change /usr/local/lib/$LNKXERCESC @executable_path/lib/$LNKXERCESC $LIBGDAL
+	install_name_tool -change /usr/local/lib/$LNKGIF @executable_path/lib/$LNKGIF $LIBGDAL
+	install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $LIBGDAL
+	install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $LIBGDAL
+	install_name_tool -change /usr/local/lib/$LNKTIFF @executable_path/lib/$LNKTIFF $LIBGDAL
+	install_name_tool -change /usr/local/lib/$LNKGEOTIFF @executable_path/lib/$LNKGEOTIFF $LIBGDAL
+	install_name_tool -change /usr/local/lib/$LNKJASPER @executable_path/lib/$LNKJASPER $LIBGDAL
+	install_name_tool -change /usr/local/lib/$LNKEXPAT @executable_path/lib/$LNKEXPAT $LIBGDAL
+	install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKPQ $LIBGDAL
+	# Copy plugins
+	mkdir gdalplugins
+	for PLUGIN in gdal_GRASS.so ogr_GRASS.so
+	do
+		cp /usr/local/lib/gdalplugins/$PLUGIN gdalplugins/$PLUGIN
+		install_name_tool -id @executable_path/lib/gdalplugins/$PLUGIN gdalplugins/$PLUGIN
+		# Update path to supporting libraries
+		install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL gdalplugins/$PLUGIN
+	done
+	# Copy supporting data files
+	cp -R /usr/local/share/gdal ../share
+fi
+if test ! -f $LIBPROJ; then
+	cp /usr/local/lib/$LIBPROJ $LIBPROJ
+	ln -s $LIBPROJ $LNKPROJ
+	install_name_tool -id @executable_path/lib/$LNKPROJ $LIBPROJ
+	# Copy supporting data files
+	cp -R /usr/local/share/proj ../share
+fi
+if test ! -f $LIBSQLITE3; then
+	cp /usr/local/lib/$LIBSQLITE3 $LIBSQLITE3
+	#ln -s $LIBSQLITE3 $LNKSQLITE3
+	install_name_tool -id @executable_path/lib/$LNKSQLITE3 $LIBSQLITE3
+fi
+if test ! -f $LIBXERCESC; then
+	cp /usr/local/lib/$LIBXERCESC $LIBXERCESC
+	ln -s $LIBXERCESC $LNKXERCESC
+	install_name_tool -id @executable_path/lib/$LNKXERCESC $LIBXERCESC
+fi
+if test ! -f $LIBGIF; then
+	cp /usr/local/lib/$LIBGIF $LIBGIF
+	ln -s $LIBGIF $LNKGIF
+	install_name_tool -id @executable_path/lib/$LNKGIF $LIBGIF
+fi
+if test ! -f $LIBPNG; then
+	cp /usr/local/lib/$LIBPNG $LIBPNG
+	#ln -s $LIBPNG $LNKPNG
+	install_name_tool -id @executable_path/lib/$LNKPNG $LIBPNG
+fi
+if test ! -f $LIBJPEG; then
+	cp /usr/local/lib/$LIBJPEG $LIBJPEG
+	ln -s $LIBJPEG $LNKJPEG
+	install_name_tool -id @executable_path/lib/$LNKJPEG $LIBJPEG
+fi
+if test ! -f $LIBTIFF; then
+	cp /usr/local/lib/$LIBTIFF $LIBTIFF
+	#ln -s $LIBTIFF $LNKTIFF
+	install_name_tool -id @executable_path/lib/$LNKTIFF $LIBTIFF
+	# Update path to supporting libraries
+	install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $LIBTIFF
+fi
+if test ! -f $LIBGEOTIFF; then
+	cp /usr/local/lib/$LIBGEOTIFF $LIBGEOTIFF
+	ln -s $LIBGEOTIFF $LNKGEOTIFF
+	install_name_tool -id @executable_path/lib/$LNKGEOTIFF $LIBGEOTIFF
+	# Update path to supporting libraries
+	install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $LIBGEOTIFF
+	install_name_tool -change /usr/local/lib/$LNKTIFF @executable_path/lib/$LNKTIFF $LIBGEOTIFF
+	install_name_tool -change /usr/local/lib/$LNKPROJ @executable_path/lib/$LNKPROJ $LIBGEOTIFF
+fi
+if test ! -f $LIBJASPER; then
+	cp /usr/local/lib/$LIBJASPER $LIBJASPER
+	ln -s $LIBJASPER $LNKJASPER
+	install_name_tool -id @executable_path/lib/$LNKJASPER $LIBJASPER
+	# Update path to supporting libraries
+	install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $LIBJASPER
+fi
+if test ! -f $LIBGSL; then
+	cp /usr/local/lib/$LIBGSL $LIBGSL
+	#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
+	install_name_tool -id @executable_path/lib/$LNKGSLCBLAS $LIBGSLCBLAS
+fi
+if test ! -f $LIBEXPAT; then
+	cp /usr/local/lib/$LIBEXPAT $LIBEXPAT
+	ln -s $LIBEXPAT $LNKEXPAT
+	install_name_tool -id @executable_path/lib/$LNKEXPAT $LIBEXPAT
+fi
+if test ! -f $LIBPQ; then
+	cp /usr/local/pgsql/lib/$LIBPQ $LIBPQ
+	ln -s $LIBPQ $LNKPQ
+	install_name_tool -id @executable_path/lib/$LNKPQ $LIBPQ
+fi
+cd ../../../../
+
+# Update application paths to supporting libraries
+install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $PREFIX/qgis
+install_name_tool -change /usr/local/lib/$LNKGEOSC @executable_path/lib/$LNKGEOSC $PREFIX/qgis
+install_name_tool -change /usr/local/lib/$LNKPROJ @executable_path/lib/$LNKPROJ $PREFIX/qgis
+install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $PREFIX/qgis
+install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKPQ $PREFIX/qgis
+
+# Update library paths to supporting libraries
+LIBS="_core _gui"
+if test -f $PREFIX/lib/libqgisgrass.$VER.dylib; then LIBS="$LIBS grass"; fi
+if test -f $PREFIX/lib/libqgispython.$VER.dylib; then LIBS="$LIBS python"; fi
+for LIB in $LIBS
+do
+	install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $PREFIX/lib/libqgis$LIB.$VER.dylib
+	install_name_tool -change /usr/local/lib/$LNKGEOSC @executable_path/lib/$LNKGEOSC $PREFIX/lib/libqgis$LIB.$VER.dylib
+	install_name_tool -change /usr/local/lib/$LNKPROJ @executable_path/lib/$LNKPROJ $PREFIX/lib/libqgis$LIB.$VER.dylib
+	install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $PREFIX/lib/libqgis$LIB.$VER.dylib
+done
+
+# Update plugin paths to supporting libraries
+for PLUGIN in \
+	libcoordinatecaptureplugin.so \
+	libcopyrightlabelplugin.so \
+	libdelimitedtextplugin.so \
+	libdelimitedtextprovider.so \
+	libdxf2shpconverterplugin.so \
+	libgeorefplugin.so \
+	libgpsimporterplugin.so \
+	libgpxprovider.so \
+	libgrassplugin.so \
+	libgrassprovider.so \
+	libgridmakerplugin.so \
+	libinterpolationplugin.so \
+	libmemoryprovider.so \
+	libnortharrowplugin.so \
+	libogrconverterplugin.so \
+	libogrprovider.so \
+	libpostgresprovider.so \
+	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
+	install_name_tool -change /usr/local/lib/$LNKGEOSC @executable_path/lib/$LNKGEOSC $PREFIX/lib/qgis/$PLUGIN
+	install_name_tool -change /usr/local/lib/$LNKPROJ @executable_path/lib/$LNKPROJ $PREFIX/lib/qgis/$PLUGIN
+	install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $PREFIX/lib/qgis/$PLUGIN
+done
+
+for PLUGIN in \
+	libgpxprovider.so \
+	libwfsprovider.so
+do
+	install_name_tool -change /usr/local/lib/$LNKEXPAT @executable_path/lib/$LNKEXPAT $PREFIX/lib/qgis/$PLUGIN
+done
+
+install_name_tool -change /usr/local/lib/$LNKGSL @executable_path/lib/$LNKGSL $PREFIX/lib/qgis/libgeorefplugin.so
+install_name_tool -change /usr/local/lib/$LNKGSLCBLAS @executable_path/lib/$LNKGSLCBLAS $PREFIX/lib/qgis/libgeorefplugin.so
+
+for PLUGIN in \
+	libpostgresprovider.so \
+	libspitplugin.so
+do
+	install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKPQ $PREFIX/lib/qgis/$PLUGIN
+done
+
+# Update GRASS plugins paths to GRASS libraries
+for PLUGIN in \
+	libqgisgrass.dylib \
+	qgis/libgrassplugin.so \
+	qgis/libgrassprovider.so
+do
+	for LIB in datetime dbmibase dbmiclient dgl dig2 form gis gproj linkm rtree shape vect
+	do
+		install_name_tool -change $GRASSLIB/libgrass_$LIB.dylib \
+			@executable_path/lib/grass/libgrass_$LIB.dylib \
+			$PREFIX/lib/$PLUGIN
+	done
+done
+for PLUGIN in \
+	gdalplugins/gdal_GRASS.so \
+	gdalplugins/ogr_GRASS.so
+do
+	for LIB in datetime dbmibase dbmiclient dgl dig2 gis gmath gproj I linkm rtree vask vect
+	do
+		install_name_tool -change $GRASSLIB/libgrass_$LIB.dylib \
+			@executable_path/lib/grass/libgrass_$LIB.dylib \
+			$PREFIX/lib/$PLUGIN
+	done
+done
+
+# Update qgis_help application paths to supporting libraries
+install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $HELPPREFIX/qgis_help
+install_name_tool -change /usr/local/lib/$LNKGEOSC @executable_path/lib/$LNKGEOSC $HELPPREFIX/qgis_help
+install_name_tool -change /usr/local/lib/$LNKPROJ @executable_path/lib/$LNKPROJ $HELPPREFIX/qgis_help
+install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $HELPPREFIX/qgis_help
+ln -sf $PREFIXBACKTRACK/lib $HELPPREFIX/lib

Copied: trunk/qgis/mac/extras/release-strip.sh (from rev 10859, trunk/qgis/mac/release-strip.sh)
===================================================================
--- trunk/qgis/mac/extras/release-strip.sh	                        (rev 0)
+++ trunk/qgis/mac/extras/release-strip.sh	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,90 @@
+#!/bin/sh
+# Strip all non-global symbols
+
+PREFIX=qgis1.0.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/qgis/libcoordinatecaptureplugin.so
+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/libdxf2shpconverterplugin.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/libgridmakerplugin.so 
+strip -x $PREFIX/lib/qgis/libinterpolationplugin.so
+strip -x $PREFIX/lib/qgis/libmemoryprovider.so
+strip -x $PREFIX/lib/qgis/libnortharrowplugin.so
+strip -x $PREFIX/lib/qgis/libogrconverterplugin.so
+strip -x $PREFIX/lib/qgis/libogrprovider.so
+strip -x $PREFIX/lib/qgis/libpostgresprovider.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/Qt3Support.framework/Versions/4/Qt3Support
+strip -x $PREFIX/lib/QtCore.framework/Versions/4/QtCore
+strip -x $PREFIX/lib/QtGui.framework/Versions/4/QtGui
+strip -x $PREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork
+strip -x $PREFIX/lib/QtSql.framework/Versions/4/QtSql
+strip -x $PREFIX/lib/QtSvg.framework/Versions/4/QtSvg
+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/libgeos.3.0.1.dylib
+strip -x $PREFIX/lib/libgeos_c.1.4.2.dylib
+strip -x $PREFIX/lib/libproj.0.5.5.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.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
+strip -x $PREFIX/lib/libexpat.1.5.2.dylib
+strip -x $PREFIX/lib/libfftw3.3.1.3.dylib
+strip -x $PREFIX/lib/libgsl.0.dylib
+strip -x $PREFIX/lib/libgslcblas.0.dylib
+strip -x $PREFIX/lib/libpq.5.1.dylib
+
+if test -f $PREFIX/lib/libqgisgrass.dylib; then
+	strip -x $PREFIX/lib/libqgisgrass.dylib
+
+	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 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.3.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 QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
+	do
+		strip -x $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so
+	done
+fi

Added: trunk/qgis/mac/readme.txt
===================================================================
--- trunk/qgis/mac/readme.txt	                        (rev 0)
+++ trunk/qgis/mac/readme.txt	2009-05-29 14:11:09 UTC (rev 10860)
@@ -0,0 +1,6 @@
+Mac Notes
+
+The 'extras' folder scripts are mainly for a cmake build.  All the bundling
+scripts' functionality is included in the Xcode project.  The readme could be
+used in packaging the Xcode build, with necessary adjustments to what's
+bundled and what's required externally.



More information about the QGIS-commit mailing list