Skip to content

Commit ac147d1

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

File tree

8 files changed

+77
-40
lines changed

8 files changed

+77
-40
lines changed

‎mac/Read Me (Mac).rtf‎

Lines changed: 5 additions & 5 deletions
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.8.0 Preview 2 Release Notes for Macintosh
8+
\f0\b\fs24 \cf0 QGIS 0.8.0 Preview 3 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 \
@@ -55,8 +55,8 @@ GeoTIFF 1.2.3 (libgeotiff.1.2.3.dylib)\
5555
JasPer 1.701.0.GEO (libjasper-1.701.1.0.0.dylib)\
5656
Expat 2.0.0 (libexpat.1.5.0.dylib)\
5757
GSL 1.8 (libgsl.0.9.0.dylib, libgslcblas.0.0.0.dylib)\
58-
PostgreSQL 8.1.4 (libpq.4.1.dylib) This client can also access a version 7 server.\
59-
GRASS 6.0.2 (libgrass_*.6.0.2.dylib) The plugin will also work with GRASS 6.1.x.\
58+
PostgreSQL 8.1.5 (libpq.4.1.dylib) This client can also access a version 7 server.\
59+
GRASS 6.2.0 (libgrass_*.6.2.0.dylib)\
6060
\
6161
\
6262
\
@@ -118,7 +118,7 @@ One method is to launch QGIS from the GRASS command-line prompt:\
118118
\
119119
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
120120

121-
\f2 \cf0 /Applications/qgis-0.8.0pre2/qgis.app/Contents/MacOS/qgis\
121+
\f2 \cf0 /Applications/qgis-0.8.0pre3/qgis.app/Contents/MacOS/qgis\
122122
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
123123

124124
\f1 \cf0 \
@@ -135,7 +135,7 @@ To do this for GRASS 6.0.x, open the file\
135135
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
136136

137137
\f2 \cf0 "&Ext" all options $tmenu \{\
138-
\{command "Open QGIS" \{\} "Open QGIS (Quantum GIS) with Grass support enabled" \{\} -command \{ exec $env(GRASS_HTML_BROWSER) "/Applications/qgis-0.8.0pre2/qgis.app" & \} \}\
138+
\{command "Open QGIS" \{\} "Open QGIS (Quantum GIS) with Grass support enabled" \{\} -command \{ exec $env(GRASS_HTML_BROWSER) "/Applications/qgis-0.8.0pre3/qgis.app" & \} \}\
139139
\}\
140140
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
141141

‎mac/install-extra.sh‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ QLIBNAMES="composer core gui legend"
1313
# Declare libqgis_* relative to bundle and update qgis app client
1414
for NAME in $QLIBNAMES
1515
do
16-
install_name_tool -id @executable_path/lib/libqgis_$NAME.0.0.1.dylib \
17-
$BUILDPREFIX/lib/libqgis_$NAME.0.0.1.dylib
16+
install_name_tool -id @executable_path/lib/libqgis_$NAME.1.0.0.dylib \
17+
$BUILDPREFIX/lib/libqgis_$NAME.1.0.0.dylib
1818

19-
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.0.dylib \
20-
@executable_path/lib/libqgis_$NAME.0.dylib \
19+
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.1.dylib \
20+
@executable_path/lib/libqgis_$NAME.1.dylib \
2121
$BUILDPREFIX/qgis
22+
23+
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.1.dylib \
24+
@executable_path/lib/libqgis_$NAME.1.dylib \
25+
$BUILDPREFIX/bin/msexport.app/Contents/MacOS/msexport
2226
done
2327

2428
# Declare libqgis_libqgis_raster relative to bundle and update qgis app client
@@ -30,6 +34,10 @@ install_name_tool -change $BUILDPREFIX/lib/libqgis_raster.0.dylib \
3034
@executable_path/lib/libqgis_raster.0.dylib \
3135
$BUILDPREFIX/qgis
3236

37+
install_name_tool -change $BUILDPREFIX/lib/libqgis_raster.0.dylib \
38+
@executable_path/lib/libqgis_raster.0.dylib \
39+
$BUILDPREFIX/bin/msexport.app/Contents/MacOS/msexport
40+
3341
# Declare libqgsprojectionselector relative to bundle and update qgis app client
3442
install_name_tool -id @executable_path/lib/qgis/libqgsprojectionselector.dylib \
3543
$BUILDPREFIX/lib/qgis/libqgsprojectionselector.dylib
@@ -38,13 +46,17 @@ install_name_tool -change $BUILDPREFIX/lib/qgis/libqgsprojectionselector.dylib \
3846
@executable_path/lib/qgis/libqgsprojectionselector.dylib \
3947
$BUILDPREFIX/qgis
4048

49+
install_name_tool -change $BUILDPREFIX/lib/qgis/libqgsprojectionselector.dylib \
50+
@executable_path/lib/qgis/libqgsprojectionselector.dylib \
51+
$BUILDPREFIX/bin/msexport.app/Contents/MacOS/msexport
52+
4153
# Update libqgis_gui client of libqgis_*
42-
for LIB in libqgis_composer.0.dylib libqgis_core.0.dylib libqgis_legend.0.dylib \
54+
for LIB in libqgis_composer.1.dylib libqgis_core.1.dylib libqgis_legend.1.dylib \
4355
libqgis_raster.0.dylib qgis/libqgsprojectionselector.dylib
4456
do
4557
install_name_tool -change $BUILDPREFIX/lib/$LIB \
4658
@executable_path/lib/$LIB \
47-
$BUILDPREFIX/lib/libqgis_gui.0.0.1.dylib
59+
$BUILDPREFIX/lib/libqgis_gui.1.0.0.dylib
4860
done
4961

5062
# Update plugin and lib clients of libqgis_* and libqgsprojectionselector
@@ -59,35 +71,40 @@ for PLUGIN in \
5971
qgis/grassprovider.so \
6072
qgis/gridmakerplugin.so \
6173
qgis/libScaleBarplugin.so \
74+
qgis/libwfsprovider.so \
6275
qgis/northarrowplugin.so \
6376
qgis/ogrprovider.so \
6477
qgis/pggeoprocessingplugin.so \
6578
qgis/postgresprovider.so \
6679
qgis/spitplugin.so \
80+
qgis/wfsplugin.so \
6781
qgis/wmsprovider.so \
6882
qgis/libqgsprojectionselector.dylib \
69-
libqgisgrass.0.0.1.dylib
83+
libqgisgrass.1.0.0.dylib
7084
do
71-
for NAME in $QLIBNAMES raster
85+
for NAME in $QLIBNAMES
7286
do
73-
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.0.dylib \
74-
@executable_path/lib/libqgis_$NAME.0.dylib \
87+
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.1.dylib \
88+
@executable_path/lib/libqgis_$NAME.1.dylib \
7589
$BUILDPREFIX/lib/$PLUGIN
7690
done
91+
install_name_tool -change $BUILDPREFIX/lib/libqgis_raster.0.dylib \
92+
@executable_path/lib/libqgis_raster.0.dylib \
93+
$BUILDPREFIX/lib/$PLUGIN
7794
install_name_tool -change $BUILDPREFIX/lib/qgis/libqgsprojectionselector.dylib \
7895
@executable_path/lib/qgis/libqgsprojectionselector.dylib \
7996
$BUILDPREFIX/lib/$PLUGIN
8097
done
8198

8299
# Declare libqgisgrass relative to bundle
83-
install_name_tool -id @executable_path/lib/libqgisgrass.0.0.1.dylib \
84-
$BUILDPREFIX/lib/libqgisgrass.0.0.1.dylib
100+
install_name_tool -id @executable_path/lib/libqgisgrass.1.0.0.dylib \
101+
$BUILDPREFIX/lib/libqgisgrass.1.0.0.dylib
85102

86103
# Update plugin clients of libqgisgrass
87104
for PLUGIN in qgis/grassplugin.so qgis/grassprovider.so
88105
do
89-
install_name_tool -change $BUILDPREFIX/lib/libqgisgrass.0.dylib \
90-
@executable_path/lib/libqgisgrass.0.dylib \
106+
install_name_tool -change $BUILDPREFIX/lib/libqgisgrass.1.dylib \
107+
@executable_path/lib/libqgisgrass.1.dylib \
91108
$BUILDPREFIX/lib/$PLUGIN
92109
done
93110

‎mac/release-check.sh‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ otool -L $PREFIX/bin/qgis-config
1313
otool -L $PREFIX/bin/spit
1414

1515
otool -L $PREFIX/lib/libmsexport.0.0.0.dylib
16-
otool -L $PREFIX/lib/libqgis_composer.0.0.1.dylib
17-
otool -L $PREFIX/lib/libqgis_core.0.0.1.dylib
18-
otool -L $PREFIX/lib/libqgis_gui.0.0.1.dylib
19-
otool -L $PREFIX/lib/libqgis_legend.0.0.1.dylib
16+
otool -L $PREFIX/lib/libqgis_composer.1.0.0.dylib
17+
otool -L $PREFIX/lib/libqgis_core.1.0.0.dylib
18+
otool -L $PREFIX/lib/libqgis_gui.1.0.0.dylib
19+
otool -L $PREFIX/lib/libqgis_legend.1.0.0.dylib
2020
otool -L $PREFIX/lib/libqgis_raster.0.0.0.dylib
21-
otool -L $PREFIX/lib/libqgisgrass.0.0.1.dylib
21+
otool -L $PREFIX/lib/libqgisgrass.1.0.0.dylib
2222
otool -L $PREFIX/lib/qgis/copyrightlabelplugin.so
2323
otool -L $PREFIX/lib/qgis/delimitedtextplugin.so
2424
otool -L $PREFIX/lib/qgis/delimitedtextprovider.so
@@ -29,11 +29,13 @@ otool -L $PREFIX/lib/qgis/grassplugin.so
2929
otool -L $PREFIX/lib/qgis/grassprovider.so
3030
otool -L $PREFIX/lib/qgis/gridmakerplugin.so
3131
otool -L $PREFIX/lib/qgis/libScaleBarplugin.so
32+
otool -L $PREFIX/lib/qgis/libwfsprovider.so
3233
otool -L $PREFIX/lib/qgis/northarrowplugin.so
3334
otool -L $PREFIX/lib/qgis/ogrprovider.so
3435
otool -L $PREFIX/lib/qgis/pggeoprocessingplugin.so
3536
otool -L $PREFIX/lib/qgis/postgresprovider.so
3637
otool -L $PREFIX/lib/qgis/spitplugin.so
38+
otool -L $PREFIX/lib/qgis/wfsplugin.so
3739
otool -L $PREFIX/lib/qgis/wmsprovider.so
3840
otool -L $PREFIX/lib/qgis/libqgsprojectionselector.dylib
3941
#otool -L $PREFIX/lib/qgis/libopenmodellerplugin.so
@@ -77,5 +79,5 @@ otool -L $PREFIX/lib/libpq.4.1.dylib
7779

7880
for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect
7981
do
80-
otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.0.2.dylib
82+
otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.2.0.dylib
8183
done

‎mac/release-extra-grass.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PREFIX=qgis.app/Contents/MacOS
77
# Edit version when any library is upgraded
88
LNKGDAL=libgdal.1.dylib
99
LNKPROJ=libproj.0.dylib
10-
GRASSVER=6.0.2
10+
GRASSVER=6.2.0
1111
GRASSLIB=/usr/local/grass-$GRASSVER/lib
1212

1313
cd $PREFIX/lib

‎mac/release-extra-qt.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ for FILE in \
105105
bin/msexport.app/Contents/MacOS/msexport \
106106
bin/spit \
107107
lib/libmsexport.0.0.0.dylib \
108-
lib/libqgis_core.0.0.1.dylib \
109-
lib/libqgis_gui.0.0.1.dylib \
108+
lib/libqgis_core.1.0.0.dylib \
109+
lib/libqgis_gui.1.0.0.dylib \
110110
lib/libqgis_raster.0.0.0.dylib \
111-
lib/libqgisgrass.0.0.1.dylib \
111+
lib/libqgisgrass.1.0.0.dylib \
112112
lib/qgis/copyrightlabelplugin.so \
113113
lib/qgis/delimitedtextplugin.so \
114114
lib/qgis/delimitedtextprovider.so \
@@ -119,11 +119,13 @@ for FILE in \
119119
lib/qgis/grassprovider.so \
120120
lib/qgis/gridmakerplugin.so \
121121
lib/qgis/libScaleBarplugin.so \
122+
lib/qgis/libwfsprovider.so \
122123
lib/qgis/northarrowplugin.so \
123124
lib/qgis/ogrprovider.so \
124125
lib/qgis/pggeoprocessingplugin.so \
125126
lib/qgis/postgresprovider.so \
126127
lib/qgis/spitplugin.so \
128+
lib/qgis/wfsplugin.so \
127129
lib/qgis/wmsprovider.so \
128130
lib/qgis/libqgsprojectionselector.dylib
129131
#bin/omgui \

‎mac/release-extra.sh‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ LNKEXPAT=libexpat.1.dylib
4141
#LNKOPENMODELLER=libopenmodeller.0.dylib
4242
LIBPQ=libpq.4.1.dylib
4343
LNKPQ=libpq.4.dylib
44-
GRASSLIB=/usr/local/grass-6.0.2/lib
44+
GRASSLIB=/usr/local/grass-6.2.0/lib
4545

4646
# Copy supporting libraries to application bundle
4747
cd $PREFIX/lib
@@ -202,9 +202,9 @@ install_name_tool -change /usr/local/lib/$LNKJASPER @executable_path/lib/$LNKJAS
202202
install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKPQ $PREFIX/qgis
203203

204204
# Update library paths to supporting libraries
205-
install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX/lib/libqgis_core.0.0.1.dylib
206-
install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $PREFIX/lib/libqgis_core.0.0.1.dylib
207-
for LIB in _core.0.0.1 _gui.0.0.1 _raster.0.0.0 grass.0.0.1
205+
install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX/lib/libqgis_core.1.0.0.dylib
206+
install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $PREFIX/lib/libqgis_core.1.0.0.dylib
207+
for LIB in _core.1.0.0 _gui.1.0.0 _raster.0.0.0 grass.1.0.0
208208
do
209209
install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $PREFIX/lib/libqgis$LIB.dylib
210210
install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX/lib/libqgis$LIB.dylib
@@ -230,11 +230,13 @@ for PLUGIN in \
230230
grassprovider.so \
231231
gridmakerplugin.so \
232232
libScaleBarplugin.so \
233+
libwfsprovider.so \
233234
northarrowplugin.so \
234235
ogrprovider.so \
235236
pggeoprocessingplugin.so \
236237
postgresprovider.so \
237238
spitplugin.so \
239+
wfsplugin.so \
238240
wmsprovider.so \
239241
libqgsprojectionselector.dylib
240242
#libopenmodellerplugin.so
@@ -270,7 +272,7 @@ install_name_tool -change /usr/local/lib/$LNKEXPAT @executable_path/lib/$LNKEXPA
270272

271273
# Update GRASS plugins paths to GRASS libraries
272274
for PLUGIN in \
273-
libqgisgrass.0.0.1.dylib \
275+
libqgisgrass.1.0.0.dylib \
274276
qgis/grassplugin.so
275277
do
276278
for LIB in datetime dbmibase dbmiclient dgl dig2 form gis gproj linkm rtree shape vect
@@ -298,6 +300,17 @@ install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $H
298300
ln -sf $PREFIXBACKTRACK/lib $HELPPREFIX/lib
299301

300302
# Update msexort application paths to supporting libraries
303+
install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $MSEXPORTPREFIX/msexport
304+
install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $MSEXPORTPREFIX/msexport
305+
install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $MSEXPORTPREFIX/msexport
306+
install_name_tool -change /usr/local/lib/$LNKXERCESC @executable_path/lib/$LNKXERCESC $MSEXPORTPREFIX/msexport
307+
install_name_tool -change /usr/local/lib/$LNKGIF @executable_path/lib/$LNKGIF $MSEXPORTPREFIX/msexport
308+
install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $MSEXPORTPREFIX/msexport
309+
install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $MSEXPORTPREFIX/msexport
310+
install_name_tool -change /usr/local/lib/$LNKTIFF @executable_path/lib/$LNKTIFF $MSEXPORTPREFIX/msexport
311+
install_name_tool -change /usr/local/lib/$LNKGEOTIFF @executable_path/lib/$LNKGEOTIFF $MSEXPORTPREFIX/msexport
312+
install_name_tool -change /usr/local/lib/$LNKJASPER @executable_path/lib/$LNKJASPER $MSEXPORTPREFIX/msexport
313+
install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKPQ $MSEXPORTPREFIX/msexport
301314
ln -sf $PREFIXBACKTRACK/lib $MSEXPORTPREFIX/lib
302315

303316
# Update omgui application paths to supporting libraries

‎mac/release-strip.sh‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ strip -x $PREFIX/bin/qgis-config
1212
strip -x $PREFIX/bin/spit
1313

1414
strip -x $PREFIX/lib/libmsexport.0.0.0.dylib
15-
strip -x $PREFIX/lib/libqgis_composer.0.0.1.dylib
16-
strip -x $PREFIX/lib/libqgis_core.0.0.1.dylib
17-
strip -x $PREFIX/lib/libqgis_gui.0.0.1.dylib
18-
strip -x $PREFIX/lib/libqgis_legend.0.0.1.dylib
15+
strip -x $PREFIX/lib/libqgis_composer.1.0.0.dylib
16+
strip -x $PREFIX/lib/libqgis_core.1.0.0.dylib
17+
strip -x $PREFIX/lib/libqgis_gui.1.0.0.dylib
18+
strip -x $PREFIX/lib/libqgis_legend.1.0.0.dylib
1919
strip -x $PREFIX/lib/libqgis_raster.0.0.0.dylib
20-
strip -x $PREFIX/lib/libqgisgrass.0.0.1.dylib
20+
strip -x $PREFIX/lib/libqgisgrass.1.0.0.dylib
2121
strip -x $PREFIX/lib/qgis/copyrightlabelplugin.so
2222
strip -x $PREFIX/lib/qgis/delimitedtextplugin.so
2323
strip -x $PREFIX/lib/qgis/delimitedtextprovider.so
@@ -28,11 +28,13 @@ strip -x $PREFIX/lib/qgis/grassplugin.so
2828
strip -x $PREFIX/lib/qgis/grassprovider.so
2929
strip -x $PREFIX/lib/qgis/gridmakerplugin.so
3030
strip -x $PREFIX/lib/qgis/libScaleBarplugin.so
31+
strip -x $PREFIX/lib/qgis/libwfsprovider.so
3132
strip -x $PREFIX/lib/qgis/northarrowplugin.so
3233
strip -x $PREFIX/lib/qgis/ogrprovider.so
3334
strip -x $PREFIX/lib/qgis/pggeoprocessingplugin.so
3435
strip -x $PREFIX/lib/qgis/postgresprovider.so
3536
strip -x $PREFIX/lib/qgis/spitplugin.so
37+
strip -x $PREFIX/lib/qgis/wfsplugin.so
3638
strip -x $PREFIX/lib/qgis/wmsprovider.so
3739
strip -x $PREFIX/lib/qgis/libqgsprojectionselector.dylib
3840
#strip -x $PREFIX/lib/qgis/libopenmodellerplugin.so
@@ -76,7 +78,7 @@ strip -x $PREFIX/lib/libpq.4.1.dylib
7678

7779
for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect
7880
do
79-
strip -x $PREFIX/lib/grass/libgrass_$LIBGRASS.6.0.2.dylib
81+
strip -x $PREFIX/lib/grass/libgrass_$LIBGRASS.6.2.0.dylib
8082
done
8183

8284
# Delete unneeded files in application bundle

‎src/mac/Contents/Info.plist.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@
190190
<string>ru</string>
191191
<string>sk</string>
192192
<string>sv</string>
193+
<string>vi</string>
193194
<string>zh_CN</string>
194195
</array>
195196
</dict>

0 commit comments

Comments
 (0)