[QGIS Commit] r9364 - trunk/qgis/mac

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat Sep 20 23:41:45 EDT 2008


Author: telwertowski
Date: 2008-09-20 23:41:44 -0400 (Sat, 20 Sep 2008)
New Revision: 9364

Modified:
   trunk/qgis/mac/Read Me (Mac).rtf
   trunk/qgis/mac/install-extra.sh
   trunk/qgis/mac/release-check.sh
   trunk/qgis/mac/release-extra-grass.sh
   trunk/qgis/mac/release-extra-py.sh
   trunk/qgis/mac/release-extra-qt.sh
   trunk/qgis/mac/release-extra.sh
   trunk/qgis/mac/release-strip.sh
Log:
Update Mac release scripts for 1.0.0.


Modified: trunk/qgis/mac/Read Me (Mac).rtf
===================================================================
--- trunk/qgis/mac/Read Me (Mac).rtf	2008-09-20 16:56:02 UTC (rev 9363)
+++ trunk/qgis/mac/Read Me (Mac).rtf	2008-09-21 03:41:44 UTC (rev 9364)
@@ -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.11.0 Release Notes for Macintosh
+\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 \
@@ -20,6 +20,7 @@
 3. Known limitations\
 4. GPS Plugin\
 5. GRASS Plugin\
+6. Python Language and Plugins\
 \
 \
 \
@@ -41,12 +42,12 @@
 \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.1 (libgdal.1.dylib)\
-GEOS 3.0.0 (libgeos.3.0.0.dylib)\
-PROJ 4.6.0 (libproj.0.5.4.dylib)\
-SQLite 3.5.9 (libsqlite3.0.dylib)\
+GDAL 1.5.2 (libgdal.1.dylib)\
+GEOS 3.0.0 (libgeos_c.1.4.1.dylib)\
+PROJ 4.6.1 (libproj.0.5.5.dylib)\
+SQLite 3.6.2 (libsqlite3.0.dylib)\
 Xerces-C++ 2.8.0 (libxerces-c.28.0.dylib)\
-Qt/Mac 4.4.0 (various Qt frameworks)\
+Qt/Mac 4.4.2 (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)\
@@ -58,22 +59,20 @@
 GSL 1.11 (libgsl.0.dylib, libgslcblas.0.dylib)\
 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)\
+SIP 4.7.7 (sip.so)\
+PyQt4 4.4.3 (Qt*.so)\
 \
 \
 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+\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 Some dialogs have cosmetic issues with buttons.\
+\cf0 The main window cannot be resized while a WMS layer is displayed. Therefore adjust the window size before opening a WMS layer.\
 \
-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.\
 \
@@ -115,7 +114,7 @@
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f2 \cf0 /Applications/qgis-0.11.0/qgis0.11.0.app/Contents/MacOS/qgis\
+\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 \
@@ -123,4 +122,15 @@
 \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

Modified: trunk/qgis/mac/install-extra.sh
===================================================================
--- trunk/qgis/mac/install-extra.sh	2008-09-20 16:56:02 UTC (rev 9363)
+++ trunk/qgis/mac/install-extra.sh	2008-09-21 03:41:44 UTC (rev 9364)
@@ -5,7 +5,7 @@
 # Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
 INSTALLPREFIX=$PWD
 
-VER=0.11
+VER=1.0
 BUNDLE=qgis$VER.0.app/Contents/MacOS
 BUILDPREFIX=$INSTALLPREFIX/$BUNDLE
 
@@ -33,19 +33,21 @@
 
 # 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/libpggeoprocessingplugin.so \
 	qgis/libpostgresprovider.so \
-	qgis/libquickprintplugin.so \
 	qgis/libscalebarplugin.so \
 	qgis/libspitplugin.so \
 	qgis/libwfsplugin.so \

Modified: trunk/qgis/mac/release-check.sh
===================================================================
--- trunk/qgis/mac/release-check.sh	2008-09-20 16:56:02 UTC (rev 9363)
+++ trunk/qgis/mac/release-check.sh	2008-09-21 03:41:44 UTC (rev 9364)
@@ -2,26 +2,28 @@
 # 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.11.0.app/Contents/MacOS
+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/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
@@ -40,7 +42,7 @@
 otool -L $PREFIX/lib/libgdal.1.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/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
@@ -76,14 +78,14 @@
 	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
+	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.0.dylib
+	otool -L $PREFIX/lib/libQtCLucene.4.4.2.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
+	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

Modified: trunk/qgis/mac/release-extra-grass.sh
===================================================================
--- trunk/qgis/mac/release-extra-grass.sh	2008-09-20 16:56:02 UTC (rev 9363)
+++ trunk/qgis/mac/release-extra-grass.sh	2008-09-21 03:41:44 UTC (rev 9364)
@@ -2,7 +2,7 @@
 # Copy GRASS supporting libraries to qgis bundle
 # and make search paths for them relative to bundle
 
-PREFIX=qgis0.11.0.app/Contents/MacOS
+PREFIX=qgis1.0.0.app/Contents/MacOS
 
 # Edit version when any library is upgraded
 LNKGDAL=libgdal.1.dylib

Modified: trunk/qgis/mac/release-extra-py.sh
===================================================================
--- trunk/qgis/mac/release-extra-py.sh	2008-09-20 16:56:02 UTC (rev 9363)
+++ trunk/qgis/mac/release-extra-py.sh	2008-09-21 03:41:44 UTC (rev 9364)
@@ -2,18 +2,18 @@
 # Copy PyQt supporting libraries to qgis bundle
 # and make search paths for them relative to bundle
 
-BUNDLE=qgis0.11.0.app/Contents/MacOS
+BUNDLE=qgis1.0.0.app/Contents/MacOS
 
 # Edit version when any library is upgraded
 LNKGDAL=libgdal.1.dylib
-LNKGEOS=libgeos.3.dylib
+LNKGEOSC=libgeos_c.1.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
+QTPREFIX=/usr/local/Trolltech/Qt-4.4.2
+QTFRAMEWORKS="QtAssistant QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon"
+LIBQTCL=libQtCLucene.4.4.2.dylib
 LNKQTCL=libQtCLucene.4.dylib
 
-SITEPKG=/Library/Python/2.3/site-packages
+SITEPKG=/Library/Python/2.5/site-packages
 
 # Copy additional Qt frameworks needed by PyQt to application bundle
 cd $BUNDLE/lib
@@ -36,7 +36,7 @@
 fi
 
 # Update paths to supporting Qt frameworks
-for FRAMEWORK in QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
+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 \
@@ -45,13 +45,13 @@
 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
+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 QtWebKit QtXmlPatterns
+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 \
@@ -60,15 +60,9 @@
 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/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
@@ -85,7 +79,7 @@
 
 if test ! -d PyQt4; then
 	cp -R $SITEPKG/PyQt4 .
-	for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
+	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
@@ -109,15 +103,12 @@
 	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
+	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/QtScript.framework/Versions/4/QtScript \
-		@executable_path/lib/QtScript.framework/Versions/4/QtScript \
-		PyQt4/QtDesigner.so
 	install_name_tool -change $QTPREFIX/lib/libQtCLucene.4.dylib \
 		@executable_path/lib/libQtCLucene.4.dylib \
 		PyQt4/QtHelp.so
@@ -129,8 +120,8 @@
 	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 \
+	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

Modified: trunk/qgis/mac/release-extra-qt.sh
===================================================================
--- trunk/qgis/mac/release-extra-qt.sh	2008-09-20 16:56:02 UTC (rev 9363)
+++ trunk/qgis/mac/release-extra-qt.sh	2008-09-21 03:41:44 UTC (rev 9364)
@@ -2,7 +2,7 @@
 # Copy Qt frameworks to qgis bundle
 # and make search paths for them relative to bundle
 
-BUNDLE=qgis0.11.0.app/Contents/MacOS
+BUNDLE=qgis1.0.0.app/Contents/MacOS
 
 # Edit version when any library is upgraded
 LIBJPEG=libjpeg.62.0.0.dylib
@@ -10,7 +10,7 @@
 LIBPNG=libpng12.0.dylib
 LNKPNG=libpng12.0.dylib
 
-QTPREFIX=/usr/local/Trolltech/Qt-4.4.0
+QTPREFIX=/usr/local/Trolltech/Qt-4.4.2
 QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support"
 
 # Copy Qt frameworks to application bundle
@@ -92,21 +92,23 @@
 	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/libpggeoprocessingplugin.so \
 	lib/qgis/libpostgresprovider.so \
-	lib/qgis/libquickprintplugin.so \
 	lib/qgis/libscalebarplugin.so \
 	lib/qgis/libspitplugin.so \
 	lib/qgis/libwfsplugin.so \

Modified: trunk/qgis/mac/release-extra.sh
===================================================================
--- trunk/qgis/mac/release-extra.sh	2008-09-20 16:56:02 UTC (rev 9363)
+++ trunk/qgis/mac/release-extra.sh	2008-09-21 03:41:44 UTC (rev 9364)
@@ -2,7 +2,8 @@
 # Copy supporting libraries (except Qt) to qgis bundle
 # and make search paths for them relative to bundle
 
-PREFIX=qgis0.11.0.app/Contents/MacOS
+VER=1.0
+PREFIX=qgis$VER.0.app/Contents/MacOS
 
 HELPPREFIX=$PREFIX/bin/qgis_help.app/Contents/MacOS
 PREFIXBACKTRACK=../../../..
@@ -14,7 +15,7 @@
 LNKGEOS=libgeos.3.dylib
 LIBGEOSC=libgeos_c.1.4.1.dylib
 LNKGEOSC=libgeos_c.1.dylib
-LIBPROJ=libproj.0.5.4.dylib
+LIBPROJ=libproj.0.5.5.dylib
 LNKPROJ=libproj.0.dylib
 LIBSQLITE3=libsqlite3.0.dylib
 LNKSQLITE3=libsqlite3.0.dylib
@@ -164,37 +165,42 @@
 
 # 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/$LNKGEOS @executable_path/lib/$LNKGEOS $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
-for LIB in _core _gui grass python
+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.dylib
-	install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX/lib/libqgis$LIB.dylib
-	install_name_tool -change /usr/local/lib/$LNKPROJ @executable_path/lib/$LNKPROJ $PREFIX/lib/libqgis$LIB.dylib
-	install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $PREFIX/lib/libqgis$LIB.dylib
+	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 \
-	libpggeoprocessingplugin.so \
 	libpostgresprovider.so \
-	libquickprintplugin.so \
 	libscalebarplugin.so \
 	libspitplugin.so \
 	libwfsplugin.so \
@@ -202,7 +208,7 @@
 	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/$LNKGEOS @executable_path/lib/$LNKGEOS $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
@@ -218,7 +224,6 @@
 install_name_tool -change /usr/local/lib/$LNKGSLCBLAS @executable_path/lib/$LNKGSLCBLAS $PREFIX/lib/qgis/libgeorefplugin.so
 
 for PLUGIN in \
-	libpggeoprocessingplugin.so \
 	libpostgresprovider.so \
 	libspitplugin.so
 do
@@ -252,7 +257,7 @@
 
 # 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/$LNKGEOS @executable_path/lib/$LNKGEOS $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

Modified: trunk/qgis/mac/release-strip.sh
===================================================================
--- trunk/qgis/mac/release-strip.sh	2008-09-20 16:56:02 UTC (rev 9363)
+++ trunk/qgis/mac/release-strip.sh	2008-09-21 03:41:44 UTC (rev 9364)
@@ -1,26 +1,28 @@
 #!/bin/sh
 # Strip all non-global symbols
 
-PREFIX=qgis0.11.0.app/Contents/MacOS
+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/libpggeoprocessingplugin.so
 strip -x $PREFIX/lib/qgis/libpostgresprovider.so
-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
@@ -39,7 +41,7 @@
 strip -x $PREFIX/lib/libgdal.1.dylib
 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/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
@@ -72,16 +74,16 @@
 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
+	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.0.dylib
+	strip -x $PREFIX/lib/libQtCLucene.4.4.2.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
+	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



More information about the QGIS-commit mailing list