Skip to content

Commit 042fb3b

Browse files
author
telwertowski
committed
Update Mac release scripts for Qt 4.2.
git-svn-id: http://svn.osgeo.org/qgis/trunk@6137 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 1ffcb6e commit 042fb3b

File tree

4 files changed

+50
-78
lines changed

4 files changed

+50
-78
lines changed

‎mac/Read Me (Mac).rtf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ GEOS 2.2.3 (libgeos.2.2.3.dylib)\
4646
PROJ 4.4.9 (libproj.0.5.0.dylib)\
4747
SQLITE3 3.3.6 (libsqlite3.0.8.6.dylib)\
4848
Xerces-C++ 2.7.0 (libxerces-c.27.0.dylib)\
49-
Qt/Mac 4.1.4 (various Qt frameworks)\
49+
Qt/Mac 4.2.0 (various Qt frameworks)\
5050
GIF 4.1.4 (libgif.4.1.4.dylib)\
5151
JPEG 6b (libjpeg.62.0.0.dylib)\
5252
PNG 1.2.8 (libpng.3.1.2.8.dylib)\

‎mac/release-check.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ otool -L $PREFIX/lib/qgis/wmsprovider.so
4040
otool -L $PREFIX/lib/qgis/libqgsprojectionselector.dylib
4141
#otool -L $PREFIX/lib/qgis/libopenmodellerplugin.so
4242

43-
otool -L $PREFIX/lib/Qt3Support.framework/Versions/4.0/Qt3Support
44-
otool -L $PREFIX/lib/QtCore.framework/Versions/4.0/QtCore
45-
otool -L $PREFIX/lib/QtGui.framework/Versions/4.0/QtGui
46-
otool -L $PREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork
47-
otool -L $PREFIX/lib/QtSql.framework/Versions/4.0/QtSql
48-
otool -L $PREFIX/lib/QtSvg.framework/Versions/4.0/QtSvg
49-
otool -L $PREFIX/lib/QtXml.framework/Versions/4.0/QtXml
50-
otool -L $PREFIX/lib/libQtDesigner.4.1.4.dylib
51-
otool -L $PREFIX/lib/libQtTest.4.1.4.dylib
43+
otool -L $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
44+
otool -L $PREFIX/lib/QtCore.framework/Versions/4/QtCore
45+
otool -L $PREFIX/lib/QtGui.framework/Versions/4/QtGui
46+
otool -L $PREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork
47+
otool -L $PREFIX/lib/QtSql.framework/Versions/4/QtSql
48+
otool -L $PREFIX/lib/QtSvg.framework/Versions/4/QtSvg
49+
otool -L $PREFIX/lib/QtXml.framework/Versions/4/QtXml
50+
otool -L $PREFIX/lib/QtDesigner.framework/Versions/4/QtDesigner
51+
otool -L $PREFIX/lib/QtTest.framework/Versions/4/QtTest
5252
otool -L $PREFIX/imageformats/libqjpeg.dylib
5353

5454
otool -L $PREFIX/lib/libgdal.1.10.0.dylib

‎mac/release-extra-qt.sh‎

Lines changed: 31 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# Copy Qt frameworks and libraries to qgis bundle
2+
# Copy Qt frameworks to qgis bundle
33
# and make search paths for them relative to bundle
44

55
PREFIX=qgis.app/Contents/MacOS
@@ -10,88 +10,66 @@ LNKJPEG=libjpeg.62.dylib
1010
LIBPNG=libpng.3.1.2.8.dylib
1111
LNKPNG=libpng.3.dylib
1212

13-
QTVER=4.1.4
13+
QTVER=4.2.0
1414
QTPREFIX=/usr/local/Trolltech/Qt-$QTVER
15-
QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support"
16-
QTLIBRARIES="QtDesigner QtTest"
15+
QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support QtDesigner QtTest"
1716

1817
# Copy supporting frameworks to application bundle
1918
cd $PREFIX/lib
2019

2120
for FRAMEWORK in $QTFRAMEWORKS
2221
do
23-
LIBFRAMEWORK=$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
22+
LIBFRAMEWORK=$FRAMEWORK.framework/Versions/4/$FRAMEWORK
2423
if test ! -f $LIBFRAMEWORK; then
2524
mkdir $FRAMEWORK.framework
2625
mkdir $FRAMEWORK.framework/Versions
27-
mkdir $FRAMEWORK.framework/Versions/4.0
26+
mkdir $FRAMEWORK.framework/Versions/4
2827
cp $QTPREFIX/lib/$LIBFRAMEWORK $LIBFRAMEWORK
2928
install_name_tool -id @executable_path/libs/$LIBFRAMEWORK $LIBFRAMEWORK
3029
fi
3130
done
32-
for LIBRARY in $QTLIBRARIES
33-
do
34-
LIB=lib$LIBRARY.$QTVER.dylib
35-
if test ! -f $LIB; then
36-
cp $QTPREFIX/lib/$LIB $LIB
37-
ln -s $LIB lib$LIBRARY.4.dylib
38-
install_name_tool -id @executable_path/libs/$LIB $LIB
39-
fi
40-
done
4131

4232
# Update path to supporting frameworks
43-
for FRAMEWORK in QtGui QtNetwork QtSql QtSvg QtXml Qt3Support
33+
for FRAMEWORK in QtGui QtNetwork QtSql QtSvg QtXml Qt3Support QtDesigner QtTest
4434
do
45-
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4.0/QtCore \
46-
@executable_path/lib/QtCore.framework/Versions/4.0/QtCore \
47-
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
35+
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \
36+
@executable_path/lib/QtCore.framework/Versions/4/QtCore \
37+
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
4838
done
49-
for FRAMEWORK in QtSvg Qt3Support
39+
for FRAMEWORK in QtSvg Qt3Support QtDesigner
5040
do
51-
install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4.0/QtGui \
52-
@executable_path/lib/QtGui.framework/Versions/4.0/QtGui \
53-
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
54-
install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4.0/QtXml \
55-
@executable_path/lib/QtXml.framework/Versions/4.0/QtXml \
56-
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
41+
install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4/QtGui \
42+
@executable_path/lib/QtGui.framework/Versions/4/QtGui \
43+
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
44+
install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4/QtXml \
45+
@executable_path/lib/QtXml.framework/Versions/4/QtXml \
46+
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
5747
done
5848
for FRAMEWORK in Qt3Support
5949
do
60-
install_name_tool -change $QTPREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork \
61-
@executable_path/lib/QtNetwork.framework/Versions/4.0/QtNetwork \
62-
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
63-
install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4.0/QtSql \
64-
@executable_path/lib/QtSql.framework/Versions/4.0/QtSql \
65-
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
50+
install_name_tool -change $QTPREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork \
51+
@executable_path/lib/QtNetwork.framework/Versions/4/QtNetwork \
52+
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
53+
install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4/QtSql \
54+
@executable_path/lib/QtSql.framework/Versions/4/QtSql \
55+
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
6656
done
67-
for FRAMEWORK in QtGui QtSvg Qt3Support
57+
for FRAMEWORK in QtGui QtSvg Qt3Support QtDesigner
6858
do
6959
install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG \
70-
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
71-
done
72-
for FRAMEWORK in QtCore QtGui QtXml
73-
do
74-
install_name_tool -change $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK \
75-
@executable_path/lib/$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK \
76-
libQtDesigner.$QTVER.dylib
60+
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
7761
done
78-
install_name_tool -change /usr/local/lib/$LNKPNG \
79-
@executable_path/lib/$LNKPNG \
80-
libQtDesigner.$QTVER.dylib
81-
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4.0/QtCore \
82-
@executable_path/lib/QtCore.framework/Versions/4.0/QtCore \
83-
libQtTest.$QTVER.dylib
8462
cd ../
8563
LIBQJPEG=imageformats/libqjpeg.dylib
8664
if test ! -f $LIBQJPEG; then
8765
mkdir imageformats
8866
cp $QTPREFIX/plugins/$LIBQJPEG $LIBQJPEG
8967
# Update path to supporting libraries
90-
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4.0/QtCore \
91-
@executable_path/lib/QtCore.framework/Versions/4.0/QtCore \
68+
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \
69+
@executable_path/lib/QtCore.framework/Versions/4/QtCore \
9270
$LIBQJPEG
93-
install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4.0/QtGui \
94-
@executable_path/lib/QtGui.framework/Versions/4.0/QtGui \
71+
install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4/QtGui \
72+
@executable_path/lib/QtGui.framework/Versions/4/QtGui \
9573
$LIBQJPEG
9674
install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $LIBQJPEG
9775
install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $LIBQJPEG
@@ -131,16 +109,10 @@ for FILE in \
131109
#bin/omgui \
132110
#lib/qgis/libopenmodeller.so
133111
do
134-
for FRAMEWORK in QtCore QtGui QtNetwork QtSvg QtXml Qt3Support
135-
do
136-
install_name_tool -change $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK \
137-
@executable_path/lib/$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK \
138-
$PREFIX/$FILE
139-
done
140-
for LIB in QtDesigner QtTest
112+
for FRAMEWORK in QtCore QtGui QtNetwork QtSvg QtXml Qt3Support QtDesigner QtTest
141113
do
142-
install_name_tool -change $QTPREFIX/lib/lib$LIB.4.dylib \
143-
@executable_path/lib/lib$LIB.4.dylib \
114+
install_name_tool -change $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \
115+
@executable_path/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \
144116
$PREFIX/$FILE
145117
done
146118
done

‎mac/release-strip.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ strip -x $PREFIX/lib/qgis/wmsprovider.so
3939
strip -x $PREFIX/lib/qgis/libqgsprojectionselector.dylib
4040
#strip -x $PREFIX/lib/qgis/libopenmodellerplugin.so
4141

42-
strip -x $PREFIX/lib/Qt3Support.framework/Versions/4.0/Qt3Support
43-
strip -x $PREFIX/lib/QtCore.framework/Versions/4.0/QtCore
44-
strip -x $PREFIX/lib/QtGui.framework/Versions/4.0/QtGui
45-
strip -x $PREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork
46-
strip -x $PREFIX/lib/QtSql.framework/Versions/4.0/QtSql
47-
strip -x $PREFIX/lib/QtSvg.framework/Versions/4.0/QtSvg
48-
strip -x $PREFIX/lib/QtXml.framework/Versions/4.0/QtXml
49-
strip -x $PREFIX/lib/libQtDesigner.4.1.4.dylib
50-
strip -x $PREFIX/lib/libQtTest.4.1.4.dylib
42+
strip -x $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
43+
strip -x $PREFIX/lib/QtCore.framework/Versions/4/QtCore
44+
strip -x $PREFIX/lib/QtGui.framework/Versions/4/QtGui
45+
strip -x $PREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork
46+
strip -x $PREFIX/lib/QtSql.framework/Versions/4/QtSql
47+
strip -x $PREFIX/lib/QtSvg.framework/Versions/4/QtSvg
48+
strip -x $PREFIX/lib/QtXml.framework/Versions/4/QtXml
49+
strip -x $PREFIX/lib/QtDesigner.framework/Versions/4/QtDesigner
50+
strip -x $PREFIX/lib/QtTest.framework/Versions/4/QtTest
5151
strip -x $PREFIX/imageformats/libqjpeg.dylib
5252

5353
strip -x $PREFIX/lib/libgdal.1.10.0.dylib

0 commit comments

Comments
 (0)