Update Mac release scripts for 1.0.0.

git-svn-id: http://svn.osgeo.org/qgis/trunk@9364 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 21, 2008 · 3aef530 · 3aef530
1 parent 957f495
commit 3aef530
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 73 deletions.
diff --git a/mac/Read Me (Mac).rtf b/mac/Read Me (Mac).rtf
@@ -5,7 +5,7 @@
 \margl1440\margr1440\vieww11100\viewh8700\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc
 
-\f0\b\fs24 \cf0 QGIS 0.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 @@ This release of QGIS requires Mac OS X 10.3.9 or later. A PostgreSQL version 7 o
 \f1\b0 \cf0 \
 The following libraries are included with this distribution of QGIS. If you have other versions of these libraries installed, QGIS will ignore your versions and use these.\
 \
-GDAL 1.5.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,21 +59,19 @@ FFTW 3.1.2 (libfftw3.3.1.2.dylib)\
 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.\
-\
-The main window cannot be resized while a WMS layer is displayed. Therefore adjust the window size before opening a WMS layer.\
+\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.\
@@ -115,12 +114,23 @@ or add the folder containing GPSBabel to your search path:\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f2 \cf0 /Applications/qgis-0.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 \
 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.\
 }
diff --git a/mac/install-extra.sh b/mac/install-extra.sh
@@ -5,7 +5,7 @@
 # Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
 INSTALLPREFIX=$PWD
 
-VER=0.11
+VER=1.0
 BUNDLE=qgis$VER.0.app/Contents/MacOS
 BUILDPREFIX=$INSTALLPREFIX/$BUNDLE
 
@@ -33,19 +33,21 @@ install_name_tool -change $BUILDPREFIX/lib/libqgis_core.$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/libpggeoprocessingplugin.so \
 	qgis/libpostgresprovider.so \
-	qgis/libquickprintplugin.so \
 	qgis/libscalebarplugin.so \
 	qgis/libspitplugin.so \
 	qgis/libwfsplugin.so \

diff --git a/mac/release-check.sh b/mac/release-check.sh
@@ -2,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/../plugins/imageformats/libqjpeg.dylib
 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 @@ if test -f $PREFIX/lib/libqgispython.dylib; then
 	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

diff --git a/mac/release-extra-grass.sh b/mac/release-extra-grass.sh
@@ -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

diff --git a/mac/release-extra-py.sh b/mac/release-extra-py.sh
@@ -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 @@ if test ! -f $LIBQTCL; then
 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 @@ 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 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 @@ 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
-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 @@ fi
 
 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 @@ if test ! -d PyQt4; then
 	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 @@ do
 	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

diff --git a/mac/release-extra-qt.sh b/mac/release-extra-qt.sh
@@ -2,15 +2,15 @@
 # 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
 LNKJPEG=libjpeg.62.dylib
 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 @@ for FILE in \
 	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 \