Skip to content

Commit db8db7e

Browse files
author
telwertowski
committed
Update Mac release scripts for 0.8.0 Preview 2.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5826 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent cf777df commit db8db7e

File tree

6 files changed

+239
-39
lines changed

6 files changed

+239
-39
lines changed

‎mac/Read Me (Mac).rtf‎

Lines changed: 49 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf380
1+
{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410
22
\readonlydoc1{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fmodern\fcharset77 Courier;
33
\f3\fswiss\fcharset77 Helvetica-Oblique;}
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.8.0 Preview 1 Release Notes for Macintosh
8+
\f0\b\fs24 \cf0 QGIS 0.8.0 Preview 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 \
@@ -18,7 +18,8 @@
1818
1. Requirements\
1919
2. Included Libraries\
2020
3. Known limitations\
21-
4. GRASS Plugin\
21+
4. GPS Plugin\
22+
5. GRASS Plugin\
2223
\
2324
\
2425
\
@@ -41,16 +42,21 @@ This release of QGIS requires Mac OS X 10.3.9 or 10.4. A PostgreSQL version 7 or
4142
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.\
4243
\
4344
GDAL 1.3.2 (libgdal.1.10.0.dylib)\
44-
GEOS 2.2.2 (libgeos.2.2.2.dylib)\
45+
GEOS 2.2.3 (libgeos.2.2.3.dylib)\
4546
PROJ 4.4.9 (libproj.0.5.0.dylib)\
4647
SQLITE3 3.3.6 (libsqlite3.0.8.6.dylib)\
4748
Xerces-C++ 2.7.0 (libxerces-c.27.0.dylib)\
48-
Qt/Mac 4.1.3 (various Qt frameworks)\
49+
Qt/Mac 4.1.4 (various Qt frameworks)\
50+
GIF 4.1.4 (libgif.4.1.4.dylib)\
4951
JPEG 6b (libjpeg.62.0.0.dylib)\
50-
PNG 1.2.8 (libpng.3.1.2.8.dylib\
51-
Expat 1.95.8 (libexpat.0.5.0.dylib)\
52-
GSL 1.6 (libgsl.0.7.0.dylib, libgslcblas.0.0.0.dylib)\
52+
PNG 1.2.8 (libpng.3.1.2.8.dylib)\
53+
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)\
56+
Expat 2.0.0 (libexpat.1.5.0.dylib)\
57+
GSL 1.8 (libgsl.0.9.0.dylib, libgslcblas.0.0.0.dylib)\
5358
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.\
5460
\
5561
\
5662
\
@@ -76,27 +82,49 @@ If the International System Preferences Language is changed, it will not affect
7682
\
7783
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
7884

79-
\f0\b \cf0 4. GRASS Plugin\
85+
\f0\b \cf0 4. GPS Plugin\
8086
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
8187
8288
\f1\b0 \cf0 \
83-
The GRASS Plugin included in this release is configured to work with the Mac OS X GRASS6 distribution provided by Lorenzo Moretti at http://wwwamb.bologna.enea.it/forgrass/\
89+
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
90+
\cf0 To use GPSBabel with the GPS plugin, QGIS must be able to find it. This can be done in one of two ways. Create a symbolic link to GPSBabel in some directory already on your search path:\
8491
\
85-
If GRASS6 is correctly installed, the GRASS plugin will appear in the list when you open the QGIS Plugin Manager. This release of QGIS no longer requires any symbolic links to be changed in order to activate the GRASS plugin.\
92+
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
93+
94+
\f2 \cf0 ln -s /Applications/GPSBabel+\\ 1.3.0/gpsbabel /usr/local/bin/gpsbabel\
95+
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
96+
97+
\f1 \cf0 \
98+
or add the folder containing GPSBabel to your search path:\
8699
\
87100
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
88-
\cf0 \
89-
To use all the functions of the GRASS plugin, QGIS should be launched from inside GRASS. This can be done in two ways.\
101+
102+
\f2 \cf0 export PATH=$PATH:/Applications/GPSBabel+\\ 1.3.0\
103+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
104+
105+
\f1 \cf0 \
106+
\
107+
\
108+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
109+
110+
\f0\b \cf0 5. GRASS Plugin\
111+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
112+
113+
\f1\b0 \cf0 \
114+
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
115+
\cf0 To use all the functions of the GRASS plugin, QGIS should be launched from inside GRASS. This can be done in two ways.\
90116
\
91117
One method is to launch QGIS from the GRASS command-line prompt:\
92118
\
93119
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
94120

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

98124
\f1 \cf0 \
99-
Another method is to add a menu item for QGIS to the GRASS menu bar. To do this, open the file\
125+
Another method is to add a menu item for QGIS to the GRASS menu bar.\
126+
\
127+
To do this for GRASS 6.0.x, open the file\
100128
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
101129

102130
\f2 \cf0 /Applications/Grass/grass60.app/Contents/Resources/grass-6.0.0/etc/dm/menu.tcl\
@@ -107,16 +135,20 @@ Another method is to add a menu item for QGIS to the GRASS menu bar. To do this,
107135
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
108136

109137
\f2 \cf0 "&Ext" all options $tmenu \{\
110-
\{command "Open QGIS" \{\} "open QGIS (Quantum GIS) with Grass support enabled" \{\} -command \{ exec $env(GRASS_HTML_BROWSER) "/Applications/qgis-0.8.0pre1/qgis.app" & \} \}\
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" & \} \}\
111139
\}\
112140
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
113141

114142
\f1 \cf0 \
143+
For GRASS 6.1.x, the
144+
\f2 menu.tcl
145+
\f1 file has changed considerably. Although it is still possible to add an Open QGIS command, the above text must be modified and cannot be inserted as is.\
146+
\
115147
After making this edit and launching GRASS, you can select "Open QGIS" from the new Ext (external application) menu.\
116148
\
117149
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
118150

119-
\f3\i \cf0 Thanks to Lorenzo Moretti for providing the GRASS menu information.\
151+
\f3\i \cf0 Thanks to Lorenzo Moretti for providing the GRASS 6.0.x menu information.\
120152
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
121153
122154
\f1\i0 \cf0 \

‎mac/release-check.sh‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PREFIX=qgis.app/Contents/MacOS
77
otool -L $PREFIX/qgis
88
otool -L $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
99
otool -L $PREFIX/bin/gridmaker
10-
otool -L $PREFIX/bin/msexport
10+
otool -L $PREFIX/bin/msexport.app/Contents/MacOS/msexport
1111
#otool -L $PREFIX/bin/omgui
1212
otool -L $PREFIX/bin/qgis-config
1313
otool -L $PREFIX/bin/spit
@@ -45,21 +45,25 @@ otool -L $PREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork
4545
otool -L $PREFIX/lib/QtSql.framework/Versions/4.0/QtSql
4646
otool -L $PREFIX/lib/QtSvg.framework/Versions/4.0/QtSvg
4747
otool -L $PREFIX/lib/QtXml.framework/Versions/4.0/QtXml
48-
otool -L $PREFIX/lib/libQtDesigner.4.1.3.dylib
49-
otool -L $PREFIX/lib/libQtTest.4.1.3.dylib
48+
otool -L $PREFIX/lib/libQtDesigner.4.1.4.dylib
49+
otool -L $PREFIX/lib/libQtTest.4.1.4.dylib
5050
otool -L $PREFIX/imageformats/libqjpeg.dylib
5151

5252
otool -L $PREFIX/lib/libgdal.1.10.0.dylib
5353
otool -L $PREFIX/lib/gdalplugins/gdal_GRASS.so
5454
otool -L $PREFIX/lib/gdalplugins/ogr_GRASS.so
55-
otool -L $PREFIX/lib/libgeos.2.2.2.dylib
55+
otool -L $PREFIX/lib/libgeos.2.2.3.dylib
5656
otool -L $PREFIX/lib/libproj.0.5.0.dylib
5757
otool -L $PREFIX/lib/libsqlite3.0.8.6.dylib
5858
otool -L $PREFIX/lib/libxerces-c.27.0.dylib
59+
otool -L $PREFIX/lib/libgif.4.1.4.dylib
5960
otool -L $PREFIX/lib/libjpeg.62.0.0.dylib
6061
otool -L $PREFIX/lib/libpng.3.1.2.8.dylib
61-
otool -L $PREFIX/lib/libexpat.0.5.0.dylib
62-
otool -L $PREFIX/lib/libgsl.0.7.0.dylib
62+
otool -L $PREFIX/lib/libtiff.3.dylib
63+
otool -L $PREFIX/lib/libgeotiff.1.2.3.dylib
64+
otool -L $PREFIX/lib/libjasper-1.701.1.0.0.dylib
65+
otool -L $PREFIX/lib/libexpat.1.5.0.dylib
66+
otool -L $PREFIX/lib/libgsl.0.9.0.dylib
6367
otool -L $PREFIX/lib/libgslcblas.0.0.0.dylib
6468
#otool -L $PREFIX/lib/libopenmodeller.0.0.0.dylib
6569
#otool -L $PREFIX/lib/openmodeller/libombioclim.0.0.0.dylib
@@ -70,3 +74,8 @@ otool -L $PREFIX/lib/libgslcblas.0.0.0.dylib
7074
#otool -L $PREFIX/lib/openmodeller/libomminimum_distance.0.0.0.dylib
7175
#otool -L $PREFIX/lib/openmodeller/libomoldgarp.0.0.0.dylib
7276
otool -L $PREFIX/lib/libpq.4.1.dylib
77+
78+
for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect
79+
do
80+
otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.0.2.dylib
81+
done

‎mac/release-extra-grass.sh‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
#!/bin/sh
2+
# Copy GRASS supporting libraries to qgis bundle
3+
# and make search paths for them relative to bundle
4+
5+
PREFIX=qgis.app/Contents/MacOS
6+
7+
# Edit version when any library is upgraded
8+
LNKGDAL=libgdal.1.dylib
9+
LNKPROJ=libproj.0.dylib
10+
GRASSVER=6.0.2
11+
GRASSLIB=/usr/local/grass-$GRASSVER/lib
12+
13+
cd $PREFIX/lib
14+
15+
# Copy supporting libraries to application bundle
16+
if test ! -d grass; then
17+
mkdir grass
18+
for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect
19+
do
20+
LIB=libgrass_$LIBGRASS.$GRASSVER.dylib
21+
LNK=libgrass_$LIBGRASS.dylib
22+
cp $GRASSLIB/$LIB grass/$LIB
23+
ln -s $LIB grass/$LNK
24+
install_name_tool -id @executable_path/lib/grass/$LNK grass/$LIB
25+
done
26+
fi
27+
28+
# Update library paths to supporting libraries
29+
install_name_tool -change $GRASSLIB/libgrass_datetime.dylib \
30+
@executable_path/lib/grass/libgrass_datetime.dylib \
31+
grass/libgrass_gis.$GRASSVER.dylib
32+
for LIBGRASS in dbmibase dbmiclient dig2 form gmath gproj I
33+
do
34+
install_name_tool -change $GRASSLIB/libgrass_datetime.dylib \
35+
@executable_path/lib/grass/libgrass_datetime.dylib \
36+
grass/libgrass_$LIBGRASS.$GRASSVER.dylib
37+
install_name_tool -change $GRASSLIB/libgrass_gis.dylib \
38+
@executable_path/lib/grass/libgrass_gis.dylib \
39+
grass/libgrass_$LIBGRASS.$GRASSVER.dylib
40+
done
41+
for LIBGRASS in dbmiclient form
42+
do
43+
install_name_tool -change $GRASSLIB/libgrass_dbmibase.dylib \
44+
@executable_path/lib/grass/libgrass_dbmibase.dylib \
45+
grass/libgrass_$LIBGRASS.$GRASSVER.dylib
46+
done
47+
install_name_tool -change $GRASSLIB/libgrass_dbmiclient.dylib \
48+
@executable_path/lib/grass/libgrass_dbmiclient.dylib \
49+
grass/libgrass_form.$GRASSVER.dylib
50+
install_name_tool -change $GRASSLIB/libgrass_gmath.dylib \
51+
@executable_path/lib/grass/libgrass_gmath.dylib \
52+
grass/libgrass_I.$GRASSVER.dylib
53+
install_name_tool -change $GRASSLIB/libgrass_rtree.dylib \
54+
@executable_path/lib/grass/libgrass_rtree.dylib \
55+
grass/libgrass_dig2.$GRASSVER.dylib
56+
install_name_tool -change $GRASSLIB/libgrass_vask.dylib \
57+
@executable_path/lib/grass/libgrass_vask.dylib \
58+
grass/libgrass_I.$GRASSVER.dylib
59+
for LIBGRASS in datetime dbmibase dbmiclient gis dgl dig2 linkm rtree
60+
do
61+
install_name_tool -change $GRASSLIB/libgrass_$LIBGRASS.dylib \
62+
@executable_path/lib/grass/libgrass_$LIBGRASS.dylib \
63+
grass/libgrass_vect.$GRASSVER.dylib
64+
done
65+
66+
install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL grass/libgrass_gproj.$GRASSVER.dylib
67+
install_name_tool -change /usr/local/lib/$LNKPROJ @executable_path/lib/$LNKPROJ grass/libgrass_gproj.$GRASSVER.dylib
68+
install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL grass/libgrass_vect.$GRASSVER.dylib
69+
70+
cd ../../../../

‎mac/release-extra-qt.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LNKJPEG=libjpeg.62.dylib
1010
LIBPNG=libpng.3.1.2.8.dylib
1111
LNKPNG=libpng.3.dylib
1212

13-
QTVER=4.1.3
13+
QTVER=4.1.4
1414
QTPREFIX=/usr/local/Trolltech/Qt-$QTVER
1515
QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support"
1616
QTLIBRARIES="QtDesigner QtTest"
@@ -102,7 +102,7 @@ for FILE in \
102102
qgis \
103103
bin/qgis_help.app/Contents/MacOS/qgis_help \
104104
bin/gridmaker \
105-
bin/msexport \
105+
bin/msexport.app/Contents/MacOS/msexport \
106106
bin/spit \
107107
lib/libmsexport.0.0.0.dylib \
108108
lib/libqgis_core.0.0.1.dylib \

0 commit comments

Comments
 (0)