Skip to content

Commit cb45edd

Browse files
author
telwertowski
committed
Update Mac release scripts for 1.0.0.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9364 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 2089b03 commit cb45edd

File tree

8 files changed

+87
-73
lines changed

8 files changed

+87
-73
lines changed

‎mac/Read Me (Mac).rtf‎

Lines changed: 23 additions & 13 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.11.0 Release Notes for Macintosh
8+
\f0\b\fs24 \cf0 QGIS 1.0.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 \
@@ -20,6 +20,7 @@
2020
3. Known limitations\
2121
4. GPS Plugin\
2222
5. GRASS Plugin\
23+
6. Python Language and Plugins\
2324
\
2425
\
2526
\
@@ -41,12 +42,12 @@ This release of QGIS requires Mac OS X 10.3.9 or later. A PostgreSQL version 7 o
4142
\f1\b0 \cf0 \
4243
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.\
4344
\
44-
GDAL 1.5.1 (libgdal.1.dylib)\
45-
GEOS 3.0.0 (libgeos.3.0.0.dylib)\
46-
PROJ 4.6.0 (libproj.0.5.4.dylib)\
47-
SQLite 3.5.9 (libsqlite3.0.dylib)\
45+
GDAL 1.5.2 (libgdal.1.dylib)\
46+
GEOS 3.0.0 (libgeos_c.1.4.1.dylib)\
47+
PROJ 4.6.1 (libproj.0.5.5.dylib)\
48+
SQLite 3.6.2 (libsqlite3.0.dylib)\
4849
Xerces-C++ 2.8.0 (libxerces-c.28.0.dylib)\
49-
Qt/Mac 4.4.0 (various Qt frameworks)\
50+
Qt/Mac 4.4.2 (various Qt frameworks)\
5051
GIF 4.1.6 (libgif.4.1.6.dylib)\
5152
JPEG 6b (libjpeg.62.0.0.dylib)\
5253
PNG 1.2.29 (libpng12.0.dylib)\
@@ -58,21 +59,19 @@ FFTW 3.1.2 (libfftw3.3.1.2.dylib)\
5859
GSL 1.11 (libgsl.0.dylib, libgslcblas.0.dylib)\
5960
PostgreSQL 8.3.3 (libpq.5.1.dylib) This client can also access a version 7 server.\
6061
GRASS 6.3.0 (libgrass_*.6.3.0.dylib)\
61-
SIP 4.7.6 (sip.so)\
62-
PyQt4 4.4.2 (Qt*.so)\
62+
SIP 4.7.7 (sip.so)\
63+
PyQt4 4.4.3 (Qt*.so)\
6364
\
6465
\
6566
\
66-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
67+
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
6768

6869
\f0\b \cf0 3. Known limitations\
6970
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
7071
7172
\f1\b0 \cf0 \
7273
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
73-
\cf0 Some dialogs have cosmetic issues with buttons.\
74-
\
75-
The main window cannot be resized while a WMS layer is displayed. Therefore adjust the window size before opening a WMS layer.\
74+
\cf0 The main window cannot be resized while a WMS layer is displayed. Therefore adjust the window size before opening a WMS layer.\
7675
\
7776
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
7877
\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:\
115114
\
116115
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
117116

118-
\f2 \cf0 /Applications/qgis-0.11.0/qgis0.11.0.app/Contents/MacOS/qgis\
117+
\f2 \cf0 /Applications/qgis-1.0.0/qgis1.0.0.app/Contents/MacOS/qgis\
119118
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
120119

121120
\f1 \cf0 \
122121
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
123122
\f2 bin
124123
\f1 folder containing many files beginning with "d."\
125124
(d dot).\
125+
\
126+
\
127+
\
128+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
129+
130+
\f0\b \cf0 6. Python Language and Plugins\
131+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
132+
133+
\f1\b0 \cf0 \
134+
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
135+
\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.\
126136
}

‎mac/install-extra.sh‎

Lines changed: 5 additions & 3 deletions
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-
VER=0.11
8+
VER=1.0
99
BUNDLE=qgis$VER.0.app/Contents/MacOS
1010
BUILDPREFIX=$INSTALLPREFIX/$BUNDLE
1111

@@ -33,19 +33,21 @@ install_name_tool -change $BUILDPREFIX/lib/libqgis_core.$VER.dylib \
3333

3434
# Update plugin and lib clients of libqgis_*
3535
for PLUGIN in \
36+
qgis/libcoordinatecaptureplugin.so \
3637
qgis/libcopyrightlabelplugin.so \
3738
qgis/libdelimitedtextplugin.so \
3839
qgis/libdelimitedtextprovider.so \
40+
qgis/libdxf2shpconverterplugin.so \
3941
qgis/libgeorefplugin.so \
4042
qgis/libgpsimporterplugin.so \
4143
qgis/libgpxprovider.so \
4244
qgis/libgridmakerplugin.so \
45+
qgis/libinterpolationplugin.so \
4346
qgis/libmemoryprovider.so \
4447
qgis/libnortharrowplugin.so \
48+
qgis/libogrconverterplugin.so \
4549
qgis/libogrprovider.so \
46-
qgis/libpggeoprocessingplugin.so \
4750
qgis/libpostgresprovider.so \
48-
qgis/libquickprintplugin.so \
4951
qgis/libscalebarplugin.so \
5052
qgis/libspitplugin.so \
5153
qgis/libwfsplugin.so \

‎mac/release-check.sh‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,28 @@
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.11.0.app/Contents/MacOS
5+
PREFIX=qgis1.0.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/qgis/libcoordinatecaptureplugin.so
1213
otool -L $PREFIX/lib/qgis/libcopyrightlabelplugin.so
1314
otool -L $PREFIX/lib/qgis/libdelimitedtextplugin.so
1415
otool -L $PREFIX/lib/qgis/libdelimitedtextprovider.so
16+
otool -L $PREFIX/lib/qgis/libdxf2shpconverterplugin.so
1517
otool -L $PREFIX/lib/qgis/libgeorefplugin.so
1618
otool -L $PREFIX/lib/qgis/libgpsimporterplugin.so
1719
otool -L $PREFIX/lib/qgis/libgpxprovider.so
1820
otool -L $PREFIX/lib/qgis/libgridmakerplugin.so
21+
otool -L $PREFIX/lib/qgis/libinterpolationplugin.so
1922
otool -L $PREFIX/lib/qgis/libmemoryprovider.so
2023
otool -L $PREFIX/lib/qgis/libnortharrowplugin.so
24+
otool -L $PREFIX/lib/qgis/libogrconverterplugin.so
2125
otool -L $PREFIX/lib/qgis/libogrprovider.so
22-
otool -L $PREFIX/lib/qgis/libpggeoprocessingplugin.so
2326
otool -L $PREFIX/lib/qgis/libpostgresprovider.so
24-
otool -L $PREFIX/lib/qgis/libquickprintplugin.so
2527
otool -L $PREFIX/lib/qgis/libscalebarplugin.so
2628
otool -L $PREFIX/lib/qgis/libspitplugin.so
2729
otool -L $PREFIX/lib/qgis/libwfsplugin.so
@@ -40,7 +42,7 @@ otool -L $PREFIX/../plugins/imageformats/libqjpeg.dylib
4042
otool -L $PREFIX/lib/libgdal.1.dylib
4143
otool -L $PREFIX/lib/libgeos.3.0.0.dylib
4244
otool -L $PREFIX/lib/libgeos_c.1.4.1.dylib
43-
otool -L $PREFIX/lib/libproj.0.5.4.dylib
45+
otool -L $PREFIX/lib/libproj.0.5.5.dylib
4446
otool -L $PREFIX/lib/libsqlite3.0.dylib
4547
otool -L $PREFIX/lib/libxerces-c.28.0.dylib
4648
otool -L $PREFIX/lib/libgif.4.1.6.dylib
@@ -76,14 +78,14 @@ if test -f $PREFIX/lib/libqgispython.dylib; then
7678
otool -L $PREFIX/share/qgis/python/qgis/core.so
7779
otool -L $PREFIX/share/qgis/python/qgis/gui.so
7880

79-
for FRAMEWORK in QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
81+
for FRAMEWORK in QtAssistant QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
8082
do
8183
otool -L $PREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK
8284
done
83-
otool -L $PREFIX/lib/libQtCLucene.4.4.0.dylib
85+
otool -L $PREFIX/lib/libQtCLucene.4.4.2.dylib
8486

8587
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
88+
for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
8789
do
8890
otool -L $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so
8991
done

‎mac/release-extra-grass.sh‎

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

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

77
# Edit version when any library is upgraded
88
LNKGDAL=libgdal.1.dylib

‎mac/release-extra-py.sh‎

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

5-
BUNDLE=qgis0.11.0.app/Contents/MacOS
5+
BUNDLE=qgis1.0.0.app/Contents/MacOS
66

77
# Edit version when any library is upgraded
88
LNKGDAL=libgdal.1.dylib
9-
LNKGEOS=libgeos.3.dylib
9+
LNKGEOSC=libgeos_c.1.dylib
1010

11-
QTPREFIX=/usr/local/Trolltech/Qt-4.4.0
12-
QTFRAMEWORKS="QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon"
13-
LIBQTCL=libQtCLucene.4.4.0.dylib
11+
QTPREFIX=/usr/local/Trolltech/Qt-4.4.2
12+
QTFRAMEWORKS="QtAssistant QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon"
13+
LIBQTCL=libQtCLucene.4.4.2.dylib
1414
LNKQTCL=libQtCLucene.4.dylib
1515

16-
SITEPKG=/Library/Python/2.3/site-packages
16+
SITEPKG=/Library/Python/2.5/site-packages
1717

1818
# Copy additional Qt frameworks needed by PyQt to application bundle
1919
cd $BUNDLE/lib
@@ -36,7 +36,7 @@ if test ! -f $LIBQTCL; then
3636
fi
3737

3838
# Update paths to supporting Qt frameworks
39-
for FRAMEWORK in QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
39+
for FRAMEWORK in QtAssistant QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
4040
do
4141
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \
4242
@executable_path/lib/QtCore.framework/Versions/4/QtCore \
@@ -45,13 +45,13 @@ done
4545
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \
4646
@executable_path/lib/QtCore.framework/Versions/4/QtCore \
4747
$LIBQTCL
48-
for FRAMEWORK in QtAssistant QtDesigner QtHelp QtOpenGL QtWebKit phonon
48+
for FRAMEWORK in QtAssistant QtHelp QtOpenGL QtWebKit phonon
4949
do
5050
install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4/QtGui \
5151
@executable_path/lib/QtGui.framework/Versions/4/QtGui \
5252
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
5353
done
54-
for FRAMEWORK in QtAssistant QtWebKit QtXmlPatterns
54+
for FRAMEWORK in QtAssistant QtHelp QtWebKit QtXmlPatterns
5555
do
5656
install_name_tool -change $QTPREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork \
5757
@executable_path/lib/QtNetwork.framework/Versions/4/QtNetwork \
@@ -60,15 +60,9 @@ done
6060
install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4/QtSql \
6161
@executable_path/lib/QtSql.framework/Versions/4/QtSql \
6262
QtHelp.framework/Versions/4/QtHelp
63-
for FRAMEWORK in QtDesigner QtHelp
64-
do
65-
install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4/QtXml \
66-
@executable_path/lib/QtXml.framework/Versions/4/QtXml \
67-
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
68-
done
69-
install_name_tool -change $QTPREFIX/lib/QtScript.framework/Versions/4/QtScript \
70-
@executable_path/lib/QtScript.framework/Versions/4/QtScript \
71-
QtDesigner.framework/Versions/4/QtDesigner
63+
install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4/QtXml \
64+
@executable_path/lib/QtXml.framework/Versions/4/QtXml \
65+
QtHelp.framework/Versions/4/QtHelp
7266
install_name_tool -change $QTPREFIX/lib/$LNKQTCL \
7367
@executable_path/lib/$LNKQTCL \
7468
QtHelp.framework/Versions/4/QtHelp
@@ -85,7 +79,7 @@ fi
8579

8680
if test ! -d PyQt4; then
8781
cp -R $SITEPKG/PyQt4 .
88-
for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
82+
for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
8983
do
9084
cp $SITEPKG/PyQt4/$LIBPYQT4.so PyQt4/$LIBPYQT4.so
9185
# Update paths to supporting Qt frameworks
@@ -109,15 +103,12 @@ if test ! -d PyQt4; then
109103
install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4/QtSql \
110104
@executable_path/lib/QtSql.framework/Versions/4/QtSql \
111105
PyQt4/QtHelp.so
112-
for LIBPYQT4 in QtSvg QtDesigner QtHelp
106+
for LIBPYQT4 in QtSvg QtHelp
113107
do
114108
install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4/QtXml \
115109
@executable_path/lib/QtXml.framework/Versions/4/QtXml \
116110
PyQt4/$LIBPYQT4.so
117111
done
118-
install_name_tool -change $QTPREFIX/lib/QtScript.framework/Versions/4/QtScript \
119-
@executable_path/lib/QtScript.framework/Versions/4/QtScript \
120-
PyQt4/QtDesigner.so
121112
install_name_tool -change $QTPREFIX/lib/libQtCLucene.4.dylib \
122113
@executable_path/lib/libQtCLucene.4.dylib \
123114
PyQt4/QtHelp.so
@@ -129,8 +120,8 @@ do
129120
install_name_tool -change /usr/local/lib/$LNKGDAL \
130121
@executable_path/lib/$LNKGDAL \
131122
qgis/$LIBQGIS.so
132-
install_name_tool -change /usr/local/lib/$LNKGEOS \
133-
@executable_path/lib/$LNKGEOS \
123+
install_name_tool -change /usr/local/lib/$LNKGEOSC \
124+
@executable_path/lib/$LNKGEOSC \
134125
qgis/$LIBQGIS.so
135126
for FRAMEWORK in QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support
136127
do

‎mac/release-extra-qt.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# Copy Qt frameworks to qgis bundle
33
# and make search paths for them relative to bundle
44

5-
BUNDLE=qgis0.11.0.app/Contents/MacOS
5+
BUNDLE=qgis1.0.0.app/Contents/MacOS
66

77
# Edit version when any library is upgraded
88
LIBJPEG=libjpeg.62.0.0.dylib
99
LNKJPEG=libjpeg.62.dylib
1010
LIBPNG=libpng12.0.dylib
1111
LNKPNG=libpng12.0.dylib
1212

13-
QTPREFIX=/usr/local/Trolltech/Qt-4.4.0
13+
QTPREFIX=/usr/local/Trolltech/Qt-4.4.2
1414
QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support"
1515

1616
# Copy Qt frameworks to application bundle
@@ -92,21 +92,23 @@ for FILE in \
9292
lib/libqgis_gui.dylib \
9393
lib/libqgisgrass.dylib \
9494
lib/libqgispython.dylib \
95+
lib/qgis/libcoordinatecaptureplugin.so \
9596
lib/qgis/libcopyrightlabelplugin.so \
9697
lib/qgis/libdelimitedtextplugin.so \
9798
lib/qgis/libdelimitedtextprovider.so \
99+
lib/qgis/libdxf2shpconverterplugin.so \
98100
lib/qgis/libgeorefplugin.so \
99101
lib/qgis/libgpsimporterplugin.so \
100102
lib/qgis/libgpxprovider.so \
101103
lib/qgis/libgrassplugin.so \
102104
lib/qgis/libgrassprovider.so \
103105
lib/qgis/libgridmakerplugin.so \
106+
lib/qgis/libinterpolationplugin.so \
104107
lib/qgis/libmemoryprovider.so \
105108
lib/qgis/libnortharrowplugin.so \
109+
lib/qgis/libogrconverterplugin.so \
106110
lib/qgis/libogrprovider.so \
107-
lib/qgis/libpggeoprocessingplugin.so \
108111
lib/qgis/libpostgresprovider.so \
109-
lib/qgis/libquickprintplugin.so \
110112
lib/qgis/libscalebarplugin.so \
111113
lib/qgis/libspitplugin.so \
112114
lib/qgis/libwfsplugin.so \

0 commit comments

Comments
 (0)