Skip to content

Commit bc9d527

Browse files
author
telwertowski
committed
Update Mac release scripts for 0.9.2.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8074 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent adc6b00 commit bc9d527

9 files changed

+70
-131
lines changed

‎mac/Read Me (Mac).rtf

+14-13
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
\margl1440\margr1440\vieww11100\viewh8700\viewkind0
66
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc
77

8-
\f0\b\fs24 \cf0 QGIS 0.9.1 Release Notes for Macintosh
8+
\f0\b\fs24 \cf0 QGIS 0.9.2 Release Notes for Macintosh
99
\f1\b0 \
1010
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
1111
\cf0 \
@@ -41,22 +41,23 @@ This release of QGIS requires Mac OS X 10.3.9 or later. A PostgreSQL version 7 o
4141
\f1\b0 \cf0 \
4242
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.\
4343
\
44-
GDAL 1.4.4 (libgdal.1.11.4.dylib)\
45-
GEOS 2.2.3 (libgeos.2.2.3.dylib)\
46-
PROJ 4.5.0 (libproj.0.5.2.dylib)\
44+
GDAL 1.5.0 (libgdal.1.dylib)\
45+
GEOS 3.0.0 (libgeos.3.0.0.dylib)\
46+
PROJ 4.6.0 (libproj.0.5.4.dylib)\
4747
SQLITE3 3.5.2 (libsqlite3.0.8.6.dylib)\
4848
Xerces-C++ 2.8.0 (libxerces-c.28.0.dylib)\
49-
Qt/Mac 4.3.2 (various Qt frameworks)\
50-
GIF 4.1.4 (libgif.4.1.4.dylib)\
49+
Qt/Mac 4.3.3 (various Qt frameworks)\
50+
GIF 4.1.6 (libgif.4.1.6.dylib)\
5151
JPEG 6b (libjpeg.62.0.0.dylib)\
52-
PNG 1.2.8 (libpng.3.1.2.8.dylib)\
52+
PNG 1.2.24 (libpng.3.24.0.dylib)\
5353
TIFF 3.8.2 (libtiff.3.dylib)\
54-
GeoTIFF 1.2.3 (libgeotiff.1.2.3.dylib)\
55-
JasPer 1.701.0.GEO (libjasper-1.701.1.0.0.dylib)\
54+
GeoTIFF 1.2.4 (libgeotiff.1.2.4.dylib)\
55+
JasPer 1.701.0.GEO-1.3.1 (libjasper-1.701.1.0.0.dylib)\
5656
Expat 2.0.1 (libexpat.1.5.2.dylib)\
57+
FFTW 3.1.2 (libfftw3.3.1.2.dylib)\
5758
GSL 1.8 (libgsl.0.9.0.dylib, libgslcblas.0.0.0.dylib)\
58-
PostgreSQL 8.2.5 (libpq.5.0.dylib) This client can also access a version 7 server.\
59-
GRASS 6.3.0RC3 (libgrass_*.6.3.0RC3.dylib)\
59+
PostgreSQL 8.2.6 (libpq.5.0.dylib) This client can also access a version 7 server.\
60+
GRASS 6.3.0RC4 (libgrass_*.6.3.0RC4.dylib)\
6061
SIP 4.7.1 (sip.so)\
6162
PyQt4 4.3.1 (Qt*.so)\
6263
\
@@ -71,7 +72,7 @@ PyQt4 4.3.1 (Qt*.so)\
7172
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
7273
\cf0 Some dialogs have cosmetic issues with buttons.\
7374
\
74-
Maps will not be redrawn correctly if the main window is resized after opening a WMS layer. Therefore adjust the window size first.\
75+
The main window cannot be resized while a WMS layer is displayed. Therefore adjust the window size before opening a WMS layer.\
7576
\
7677
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
7778
\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.\
@@ -114,7 +115,7 @@ or add the folder containing GPSBabel to your search path:\
114115
\
115116
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
116117

117-
\f2 \cf0 /Applications/qgis-0.9.1/qgis0.9.1.app/Contents/MacOS/qgis\
118+
\f2 \cf0 /Applications/qgis-0.9.2/qgis0.9.2.app/Contents/MacOS/qgis\
118119
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
119120

120121
\f1 \cf0 \

‎mac/install-extra.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
66
INSTALLPREFIX=$PWD
77

8-
BUNDLE=qgis0.9.1.app/Contents/MacOS
8+
BUNDLE=qgis0.9.2.app/Contents/MacOS
99
BUILDPREFIX=$INSTALLPREFIX/$BUNDLE
1010

1111
QLIBNAMES="core gui"
@@ -20,10 +20,6 @@ do
2020
@executable_path/lib/libqgis_$NAME.dylib \
2121
$BUILDPREFIX/qgis
2222

23-
install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.dylib \
24-
@executable_path/lib/libqgis_$NAME.dylib \
25-
$BUILDPREFIX/bin/msexport.app/Contents/MacOS/msexport
26-
2723
install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.dylib \
2824
@executable_path/lib/libqgis_$NAME.dylib \
2925
$BUILDPREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
@@ -50,6 +46,7 @@ for PLUGIN in \
5046
qgis/libogrprovider.so \
5147
qgis/libpggeoprocessingplugin.so \
5248
qgis/libpostgresprovider.so \
49+
qgis/libquickprintplugin.so \
5350
qgis/libscalebarplugin.so \
5451
qgis/libspitplugin.so \
5552
qgis/libwfsplugin.so \

‎mac/release-check.sh

+11-20
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
# Display all paths to supporting libraries
33
# Output should be visually inspected for paths which haven't been made relative (such as /usr/local)
44

5-
PREFIX=qgis0.9.1.app/Contents/MacOS
5+
PREFIX=qgis0.9.2.app/Contents/MacOS
66

77
otool -L $PREFIX/qgis
88
otool -L $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
9-
otool -L $PREFIX/bin/msexport.app/Contents/MacOS/msexport
10-
#otool -L $PREFIX/bin/omgui
119

1210
otool -L $PREFIX/lib/libqgis_core.dylib
1311
otool -L $PREFIX/lib/libqgis_gui.dylib
@@ -26,11 +24,11 @@ otool -L $PREFIX/lib/qgis/libnortharrowplugin.so
2624
otool -L $PREFIX/lib/qgis/libogrprovider.so
2725
otool -L $PREFIX/lib/qgis/libpggeoprocessingplugin.so
2826
otool -L $PREFIX/lib/qgis/libpostgresprovider.so
27+
otool -L $PREFIX/lib/qgis/libquickprintplugin.so
2928
otool -L $PREFIX/lib/qgis/libscalebarplugin.so
3029
otool -L $PREFIX/lib/qgis/libspitplugin.so
3130
otool -L $PREFIX/lib/qgis/libwfsplugin.so
3231
otool -L $PREFIX/lib/qgis/libwmsprovider.so
33-
#otool -L $PREFIX/lib/qgis/libopenmodellerplugin.so
3432

3533
otool -L $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
3634
otool -L $PREFIX/lib/QtCore.framework/Versions/4/QtCore
@@ -41,36 +39,29 @@ otool -L $PREFIX/lib/QtSvg.framework/Versions/4/QtSvg
4139
otool -L $PREFIX/lib/QtXml.framework/Versions/4/QtXml
4240
otool -L $PREFIX/../plugins/imageformats/libqjpeg.dylib
4341

44-
otool -L $PREFIX/lib/libgdal.1.11.4.dylib
42+
otool -L $PREFIX/lib/libgdal.1.dylib
4543
otool -L $PREFIX/lib/gdalplugins/gdal_GRASS.so
4644
otool -L $PREFIX/lib/gdalplugins/ogr_GRASS.so
47-
otool -L $PREFIX/lib/libgeos.2.2.3.dylib
48-
otool -L $PREFIX/lib/libgeos_c.1.1.1.dylib
49-
otool -L $PREFIX/lib/libproj.0.5.2.dylib
45+
otool -L $PREFIX/lib/libgeos.3.0.0.dylib
46+
otool -L $PREFIX/lib/libgeos_c.1.4.1.dylib
47+
otool -L $PREFIX/lib/libproj.0.5.4.dylib
5048
otool -L $PREFIX/lib/libsqlite3.0.8.6.dylib
5149
otool -L $PREFIX/lib/libxerces-c.28.0.dylib
52-
otool -L $PREFIX/lib/libgif.4.1.4.dylib
50+
otool -L $PREFIX/lib/libgif.4.1.6.dylib
5351
otool -L $PREFIX/lib/libjpeg.62.0.0.dylib
54-
otool -L $PREFIX/lib/libpng.3.1.2.8.dylib
52+
otool -L $PREFIX/lib/libpng.3.24.0.dylib
5553
otool -L $PREFIX/lib/libtiff.3.dylib
56-
otool -L $PREFIX/lib/libgeotiff.1.2.3.dylib
54+
otool -L $PREFIX/lib/libgeotiff.1.2.4.dylib
5755
otool -L $PREFIX/lib/libjasper-1.701.1.0.0.dylib
5856
otool -L $PREFIX/lib/libexpat.1.5.2.dylib
57+
otool -L $PREFIX/lib/libfftw3.3.1.2.dylib
5958
otool -L $PREFIX/lib/libgsl.0.9.0.dylib
6059
otool -L $PREFIX/lib/libgslcblas.0.0.0.dylib
61-
#otool -L $PREFIX/lib/libopenmodeller.0.0.0.dylib
62-
#otool -L $PREFIX/lib/openmodeller/libombioclim.0.0.0.dylib
63-
#otool -L $PREFIX/lib/openmodeller/libombioclim_distance.0.0.0.dylib
64-
#otool -L $PREFIX/lib/openmodeller/libomcsmbs.0.0.0.dylib
65-
#otool -L $PREFIX/lib/openmodeller/libomdg_bs.0.0.0.dylib
66-
#otool -L $PREFIX/lib/openmodeller/libomdistance_to_average.0.0.0.dylib
67-
#otool -L $PREFIX/lib/openmodeller/libomminimum_distance.0.0.0.dylib
68-
#otool -L $PREFIX/lib/openmodeller/libomoldgarp.0.0.0.dylib
6960
otool -L $PREFIX/lib/libpq.5.0.dylib
7061

7162
for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect
7263
do
73-
otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0RC3.dylib
64+
otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0RC4.dylib
7465
done
7566

7667
otool -L $PREFIX/share/qgis/python/qgis/core.so

‎mac/release-extra-grass.sh

+10-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
# Copy GRASS supporting libraries to qgis bundle
33
# and make search paths for them relative to bundle
44

5-
PREFIX=qgis0.9.1.app/Contents/MacOS
5+
PREFIX=qgis0.9.2.app/Contents/MacOS
66

77
# Edit version when any library is upgraded
88
LNKGDAL=libgdal.1.dylib
99
LNKPROJ=libproj.0.dylib
10-
GRASSVER=6.3.0RC3
10+
LIBFFTW=libfftw3.3.1.2.dylib
11+
LNKFFTW=libfftw3.3.dylib
12+
GRASSVER=6.3.0RC4
1113
GRASSLIB=/usr/local/grass-$GRASSVER/lib
1214

1315
cd $PREFIX/lib
@@ -24,6 +26,11 @@ if test ! -d grass; then
2426
install_name_tool -id @executable_path/lib/grass/$LNK grass/$LIB
2527
done
2628
fi
29+
if test ! -f $LIBFFTW; then
30+
cp /usr/local/lib/$LIBFFTW $LIBFFTW
31+
ln -s $LIBFFTW $LNKFFTW
32+
install_name_tool -id @executable_path/lib/$LNKFFTW $LIBFFTW
33+
fi
2734

2835
# Update library paths to supporting libraries
2936
install_name_tool -change $GRASSLIB/libgrass_datetime.dylib \
@@ -63,6 +70,7 @@ do
6370
grass/libgrass_vect.$GRASSVER.dylib
6471
done
6572

73+
install_name_tool -change /usr/local/lib/$LNKFFTW @executable_path/lib/$LNKFFTW grass/libgrass_gmath.$GRASSVER.dylib
6674
install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL grass/libgrass_gproj.$GRASSVER.dylib
6775
install_name_tool -change /usr/local/lib/$LNKPROJ @executable_path/lib/$LNKPROJ grass/libgrass_gproj.$GRASSVER.dylib
6876
install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL grass/libgrass_vect.$GRASSVER.dylib

‎mac/release-extra-py.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
66
INSTALLPREFIX=$PWD
77

8-
BUNDLE=qgis0.9.1.app/Contents/MacOS
8+
BUNDLE=qgis0.9.2.app/Contents/MacOS
99
SITEPKG=/Library/Python/2.3/site-packages
1010

1111
LNKGDAL=libgdal.1.dylib

‎mac/release-extra-qt.sh

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# Copy Qt frameworks to qgis bundle
33
# and make search paths for them relative to bundle
44

5-
PREFIX=qgis0.9.1.app/Contents/MacOS
5+
PREFIX=qgis0.9.2.app/Contents/MacOS
66

77
# Edit version when any library is upgraded
88
LIBJPEG=libjpeg.62.0.0.dylib
99
LNKJPEG=libjpeg.62.dylib
10-
LIBPNG=libpng.3.1.2.8.dylib
10+
LIBPNG=libpng.3.24.0.dylib
1111
LNKPNG=libpng.3.dylib
1212

1313
QTPREFIX=/usr/local/Qt4.3
@@ -82,7 +82,6 @@ cd ../../
8282
for FILE in \
8383
qgis \
8484
bin/qgis_help.app/Contents/MacOS/qgis_help \
85-
bin/msexport.app/Contents/MacOS/msexport \
8685
lib/libqgis_core.dylib \
8786
lib/libqgis_gui.dylib \
8887
lib/libqgisgrass.dylib \
@@ -100,12 +99,11 @@ for FILE in \
10099
lib/qgis/libogrprovider.so \
101100
lib/qgis/libpggeoprocessingplugin.so \
102101
lib/qgis/libpostgresprovider.so \
102+
lib/qgis/libquickprintplugin.so \
103103
lib/qgis/libscalebarplugin.so \
104104
lib/qgis/libspitplugin.so \
105105
lib/qgis/libwfsplugin.so \
106-
lib/qgis/libwmsprovider.so \
107-
#bin/omgui \
108-
#lib/qgis/libopenmodeller.so
106+
lib/qgis/libwmsprovider.so
109107
do
110108
for FRAMEWORK in QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support
111109
do

0 commit comments

Comments
 (0)