Skip to content

Commit b9726a2

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

File tree

8 files changed

+307
-146
lines changed

8 files changed

+307
-146
lines changed

‎mac/Read Me (Mac).rtf‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf470
1+
{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf480
22
\readonlydoc1{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fmodern\fcharset77 Courier;
33
}
44
{\colortbl;\red255\green255\blue255;}
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.10.0 Release Notes for Macintosh
8+
\f0\b\fs24 \cf0 QGIS 0.11.0 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 \
@@ -44,22 +44,22 @@ The following libraries are included with this distribution of QGIS. If you have
4444
GDAL 1.5.1 (libgdal.1.dylib)\
4545
GEOS 3.0.0 (libgeos.3.0.0.dylib)\
4646
PROJ 4.6.0 (libproj.0.5.4.dylib)\
47-
SQLITE3 3.5.7 (libsqlite3.0.8.6.dylib)\
47+
SQLite 3.5.9 (libsqlite3.0.dylib)\
4848
Xerces-C++ 2.8.0 (libxerces-c.28.0.dylib)\
49-
Qt/Mac 4.3.4 (various Qt frameworks)\
49+
Qt/Mac 4.4.0 (various Qt frameworks)\
5050
GIF 4.1.6 (libgif.4.1.6.dylib)\
5151
JPEG 6b (libjpeg.62.0.0.dylib)\
52-
PNG 1.2.24 (libpng12.0.24.0.dylib)\
52+
PNG 1.2.29 (libpng12.0.dylib)\
5353
TIFF 3.8.2 (libtiff.3.dylib)\
5454
GeoTIFF 1.2.4 (libgeotiff.1.2.4.dylib)\
5555
JasPer 1.900.1.uuid (libjasper.1.0.0.dylib)\
5656
Expat 2.0.1 (libexpat.1.5.2.dylib)\
5757
FFTW 3.1.2 (libfftw3.3.1.2.dylib)\
5858
GSL 1.11 (libgsl.0.dylib, libgslcblas.0.dylib)\
59-
PostgreSQL 8.3.1 (libpq.5.1.dylib) This client can also access a version 7 server.\
60-
GRASS 6.3.0RC6 (libgrass_*.6.3.0RC6.dylib)\
61-
SIP 4.7.4 (sip.so)\
62-
PyQt4 4.3.3 (Qt*.so)\
59+
PostgreSQL 8.3.3 (libpq.5.1.dylib) This client can also access a version 7 server.\
60+
GRASS 6.3.0 (libgrass_*.6.3.0.dylib)\
61+
SIP 4.7.6 (sip.so)\
62+
PyQt4 4.4.2 (Qt*.so)\
6363
\
6464
\
6565
\
@@ -90,15 +90,15 @@ The main window cannot be resized while a WMS layer is displayed. Therefore adju
9090
\
9191
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
9292

93-
\f2 \cf0 ln -s /Applications/GPSBabel+-1.3.4/gpsbabel /usr/local/bin/gpsbabel\
93+
\f2 \cf0 ln -s /Applications/GPSBabel+-1.3.5/gpsbabel /usr/local/bin/gpsbabel\
9494
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
9595

9696
\f1 \cf0 \
9797
or add the folder containing GPSBabel to your search path:\
9898
\
9999
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
100100

101-
\f2 \cf0 export PATH=$PATH:/Applications/GPSBabel+-1.3.4\
101+
\f2 \cf0 export PATH=$PATH:/Applications/GPSBabel+-1.3.5\
102102
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
103103

104104
\f1 \cf0 \
@@ -115,7 +115,7 @@ or add the folder containing GPSBabel to your search path:\
115115
\
116116
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
117117

118-
\f2 \cf0 /Applications/qgis-0.10.0/qgis0.10.0.app/Contents/MacOS/qgis\
118+
\f2 \cf0 /Applications/qgis-0.11.0/qgis0.11.0.app/Contents/MacOS/qgis\
119119
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
120120

121121
\f1 \cf0 \

‎mac/install-extra.sh‎

Lines changed: 72 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,42 @@
55
# Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
66
INSTALLPREFIX=$PWD
77

8-
VER=0.10
8+
VER=0.11
99
BUNDLE=qgis$VER.0.app/Contents/MacOS
1010
BUILDPREFIX=$INSTALLPREFIX/$BUNDLE
1111

1212
QLIBNAMES="core gui"
1313

14-
# Declare libqgis_* relative to bundle and update qgis app client
14+
# Declare libqgis_* relative to bundle and update qgis and qgis_help app clients
1515
for NAME in $QLIBNAMES
1616
do
17-
install_name_tool -id @executable_path/lib/libqgis_$NAME.dylib \
18-
$BUILDPREFIX/lib/libqgis_$NAME.dylib
17+
install_name_tool -id @executable_path/lib/libqgis_$NAME.$VER.dylib \
18+
$BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib
1919

20-
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.dylib \
21-
@executable_path/lib/libqgis_$NAME.dylib \
20+
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \
21+
@executable_path/lib/libqgis_$NAME.$VER.dylib \
2222
$BUILDPREFIX/qgis
2323

2424
install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \
25-
@executable_path/lib/libqgis_$NAME.dylib \
25+
@executable_path/lib/libqgis_$NAME.$VER.dylib \
2626
$BUILDPREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
27-
28-
install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \
29-
@executable_path/lib/libqgis_$NAME.dylib \
30-
$BUILDPREFIX/share/qgis/python/qgis/core.so
31-
32-
install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \
33-
@executable_path/lib/libqgis_$NAME.dylib \
34-
$BUILDPREFIX/share/qgis/python/qgis/gui.so
3527
done
3628

37-
# Update libqgis_gui client of libqgis_*
38-
install_name_tool -change $BUILDPREFIX/lib/libqgis_core.dylib \
39-
@executable_path/lib/libqgis_core.dylib \
40-
$BUILDPREFIX/lib/libqgis_gui.dylib
29+
# Update libqgis_gui client of libqgis_core
30+
install_name_tool -change $BUILDPREFIX/lib/libqgis_core.$VER.dylib \
31+
@executable_path/lib/libqgis_core.$VER.dylib \
32+
$BUILDPREFIX/lib/libqgis_gui.$VER.dylib
4133

42-
# Update plugin and lib clients of libqgis_* and libqgsprojectionselector
34+
# Update plugin and lib clients of libqgis_*
4335
for PLUGIN in \
4436
qgis/libcopyrightlabelplugin.so \
4537
qgis/libdelimitedtextplugin.so \
4638
qgis/libdelimitedtextprovider.so \
4739
qgis/libgeorefplugin.so \
4840
qgis/libgpsimporterplugin.so \
4941
qgis/libgpxprovider.so \
50-
qgis/libgrassplugin.so \
51-
qgis/libgrassprovider.so \
5242
qgis/libgridmakerplugin.so \
53-
qgis/libwfsprovider.so \
43+
qgis/libmemoryprovider.so \
5444
qgis/libnortharrowplugin.so \
5545
qgis/libogrprovider.so \
5646
qgis/libpggeoprocessingplugin.so \
@@ -59,25 +49,70 @@ for PLUGIN in \
5949
qgis/libscalebarplugin.so \
6050
qgis/libspitplugin.so \
6151
qgis/libwfsplugin.so \
62-
qgis/libwmsprovider.so \
63-
libqgisgrass.dylib
52+
qgis/libwfsprovider.so \
53+
qgis/libwmsprovider.so
6454
do
6555
for NAME in $QLIBNAMES
6656
do
67-
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.dylib \
68-
@executable_path/lib/libqgis_$NAME.dylib \
57+
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \
58+
@executable_path/lib/libqgis_$NAME.$VER.dylib \
6959
$BUILDPREFIX/lib/$PLUGIN
7060
done
7161
done
7262

73-
# Declare libqgisgrass relative to bundle
74-
install_name_tool -id @executable_path/lib/libqgisgrass.dylib \
75-
$BUILDPREFIX/lib/libqgisgrass.dylib
63+
if test -f $BUILDPREFIX/lib/libqgisgrass.$VER.dylib; then
7664

77-
# Update plugin clients of libqgisgrass
78-
for PLUGIN in qgis/libgrassplugin.so qgis/libgrassprovider.so
79-
do
80-
install_name_tool -change $BUILDPREFIX/lib/libqgisgrass.dylib \
81-
@executable_path/lib/libqgisgrass.dylib \
82-
$BUILDPREFIX/lib/$PLUGIN
83-
done
65+
# Declare libqgisgrass relative to bundle
66+
install_name_tool -id @executable_path/lib/libqgisgrass.$VER.dylib \
67+
$BUILDPREFIX/lib/libqgisgrass.$VER.dylib
68+
69+
# Update plugin and lib clients of libqgis_*
70+
for PLUGIN in \
71+
qgis/libgrassplugin.so \
72+
qgis/libgrassprovider.so \
73+
libqgisgrass.$VER.dylib
74+
do
75+
for NAME in $QLIBNAMES
76+
do
77+
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \
78+
@executable_path/lib/libqgis_$NAME.$VER.dylib \
79+
$BUILDPREFIX/lib/$PLUGIN
80+
done
81+
done
82+
83+
# Update plugin clients of libqgisgrass
84+
for PLUGIN in qgis/libgrassplugin.so qgis/libgrassprovider.so
85+
do
86+
install_name_tool -change $BUILDPREFIX/lib/libqgisgrass.$VER.dylib \
87+
@executable_path/lib/libqgisgrass.$VER.dylib \
88+
$BUILDPREFIX/lib/$PLUGIN
89+
done
90+
91+
fi
92+
93+
if test -f $BUILDPREFIX/lib/libqgispython.$VER.dylib; then
94+
95+
# Declare libqgispython relative to bundle
96+
install_name_tool -id @executable_path/lib/libqgispython.$VER.dylib \
97+
$BUILDPREFIX/lib/libqgispython.$VER.dylib
98+
99+
# Update python lib paths to libqgis_*
100+
for NAME in $QLIBNAMES
101+
do
102+
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \
103+
@executable_path/lib/libqgis_$NAME.$VER.dylib \
104+
$BUILDPREFIX/lib/libqgispython.$VER.dylib
105+
done
106+
107+
# Update python plugin paths libqgis_*
108+
for PLUGIN in core.so gui.so
109+
do
110+
for NAME in $QLIBNAMES
111+
do
112+
install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \
113+
@executable_path/lib/libqgis_$NAME.$VER.dylib \
114+
$BUILDPREFIX/share/qgis/python/qgis/$PLUGIN
115+
done
116+
done
117+
118+
fi

‎mac/release-check.sh‎

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,21 @@
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.10.0.app/Contents/MacOS
5+
PREFIX=qgis0.11.0.app/Contents/MacOS
66

77
otool -L $PREFIX/qgis
88
otool -L $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
99

1010
otool -L $PREFIX/lib/libqgis_core.dylib
1111
otool -L $PREFIX/lib/libqgis_gui.dylib
12-
otool -L $PREFIX/lib/libqgisgrass.dylib
1312
otool -L $PREFIX/lib/qgis/libcopyrightlabelplugin.so
1413
otool -L $PREFIX/lib/qgis/libdelimitedtextplugin.so
1514
otool -L $PREFIX/lib/qgis/libdelimitedtextprovider.so
1615
otool -L $PREFIX/lib/qgis/libgeorefplugin.so
1716
otool -L $PREFIX/lib/qgis/libgpsimporterplugin.so
1817
otool -L $PREFIX/lib/qgis/libgpxprovider.so
19-
otool -L $PREFIX/lib/qgis/libgrassplugin.so
20-
otool -L $PREFIX/lib/qgis/libgrassprovider.so
2118
otool -L $PREFIX/lib/qgis/libgridmakerplugin.so
22-
otool -L $PREFIX/lib/qgis/libwfsprovider.so
19+
otool -L $PREFIX/lib/qgis/libmemoryprovider.so
2320
otool -L $PREFIX/lib/qgis/libnortharrowplugin.so
2421
otool -L $PREFIX/lib/qgis/libogrprovider.so
2522
otool -L $PREFIX/lib/qgis/libpggeoprocessingplugin.so
@@ -28,6 +25,7 @@ otool -L $PREFIX/lib/qgis/libquickprintplugin.so
2825
otool -L $PREFIX/lib/qgis/libscalebarplugin.so
2926
otool -L $PREFIX/lib/qgis/libspitplugin.so
3027
otool -L $PREFIX/lib/qgis/libwfsplugin.so
28+
otool -L $PREFIX/lib/qgis/libwfsprovider.so
3129
otool -L $PREFIX/lib/qgis/libwmsprovider.so
3230

3331
otool -L $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
@@ -40,16 +38,14 @@ otool -L $PREFIX/lib/QtXml.framework/Versions/4/QtXml
4038
otool -L $PREFIX/../plugins/imageformats/libqjpeg.dylib
4139

4240
otool -L $PREFIX/lib/libgdal.1.dylib
43-
otool -L $PREFIX/lib/gdalplugins/gdal_GRASS.so
44-
otool -L $PREFIX/lib/gdalplugins/ogr_GRASS.so
4541
otool -L $PREFIX/lib/libgeos.3.0.0.dylib
4642
otool -L $PREFIX/lib/libgeos_c.1.4.1.dylib
4743
otool -L $PREFIX/lib/libproj.0.5.4.dylib
48-
otool -L $PREFIX/lib/libsqlite3.0.8.6.dylib
44+
otool -L $PREFIX/lib/libsqlite3.0.dylib
4945
otool -L $PREFIX/lib/libxerces-c.28.0.dylib
5046
otool -L $PREFIX/lib/libgif.4.1.6.dylib
5147
otool -L $PREFIX/lib/libjpeg.62.0.0.dylib
52-
otool -L $PREFIX/lib/libpng12.0.24.0.dylib
48+
otool -L $PREFIX/lib/libpng12.0.dylib
5349
otool -L $PREFIX/lib/libtiff.3.dylib
5450
otool -L $PREFIX/lib/libgeotiff.1.2.4.dylib
5551
otool -L $PREFIX/lib/libjasper.1.0.0.dylib
@@ -59,15 +55,37 @@ otool -L $PREFIX/lib/libgsl.0.dylib
5955
otool -L $PREFIX/lib/libgslcblas.0.dylib
6056
otool -L $PREFIX/lib/libpq.5.1.dylib
6157

62-
for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect
63-
do
64-
otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0RC6.dylib
65-
done
58+
if test -f $PREFIX/lib/libqgisgrass.dylib; then
59+
otool -L $PREFIX/lib/libqgisgrass.dylib
60+
61+
otool -L $PREFIX/lib/qgis/libgrassplugin.so
62+
otool -L $PREFIX/lib/qgis/libgrassprovider.so
63+
64+
otool -L $PREFIX/lib/gdalplugins/gdal_GRASS.so
65+
otool -L $PREFIX/lib/gdalplugins/ogr_GRASS.so
66+
67+
for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect
68+
do
69+
otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0.dylib
70+
done
71+
fi
72+
73+
if test -f $PREFIX/lib/libqgispython.dylib; then
74+
otool -L $PREFIX/lib/libqgispython.dylib
75+
76+
otool -L $PREFIX/share/qgis/python/qgis/core.so
77+
otool -L $PREFIX/share/qgis/python/qgis/gui.so
78+
79+
for FRAMEWORK in QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
80+
do
81+
otool -L $PREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK
82+
done
83+
otool -L $PREFIX/lib/libQtCLucene.4.4.0.dylib
84+
85+
otool -L $PREFIX/share/qgis/python/sip.so
86+
for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
87+
do
88+
otool -L $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so
89+
done
90+
fi
6691

67-
otool -L $PREFIX/share/qgis/python/qgis/core.so
68-
otool -L $PREFIX/share/qgis/python/qgis/gui.so
69-
otool -L $PREFIX/share/qgis/python/sip.so
70-
for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtOpenGL QtScript QtTest
71-
do
72-
otool -L $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so
73-
done

‎mac/release-extra-grass.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# Copy GRASS supporting libraries to qgis bundle
33
# and make search paths for them relative to bundle
44

5-
PREFIX=qgis0.10.0.app/Contents/MacOS
5+
PREFIX=qgis0.11.0.app/Contents/MacOS
66

77
# Edit version when any library is upgraded
88
LNKGDAL=libgdal.1.dylib
99
LNKPROJ=libproj.0.dylib
1010
LIBFFTW=libfftw3.3.1.2.dylib
1111
LNKFFTW=libfftw3.3.dylib
12-
GRASSVER=6.3.0RC6
12+
GRASSVER=6.3.0
1313
GRASSLIB=/usr/local/grass-$GRASSVER/lib
1414

1515
cd $PREFIX/lib

0 commit comments

Comments
 (0)