Skip to content

Commit

Permalink
Update Mac release scripts for Qt 4.2.
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk@6137 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
telwertowski committed Nov 27, 2006
1 parent 1ffcb6e commit 042fb3b
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 78 deletions.
2 changes: 1 addition & 1 deletion mac/Read Me (Mac).rtf
View file
Expand Up @@ -46,7 +46,7 @@ GEOS 2.2.3 (libgeos.2.2.3.dylib)\
PROJ 4.4.9 (libproj.0.5.0.dylib)\
SQLITE3 3.3.6 (libsqlite3.0.8.6.dylib)\
Xerces-C++ 2.7.0 (libxerces-c.27.0.dylib)\
Qt/Mac 4.1.4 (various Qt frameworks)\
Qt/Mac 4.2.0 (various Qt frameworks)\
GIF 4.1.4 (libgif.4.1.4.dylib)\
JPEG 6b (libjpeg.62.0.0.dylib)\
PNG 1.2.8 (libpng.3.1.2.8.dylib)\
Expand Down
18 changes: 9 additions & 9 deletions mac/release-check.sh
View file
Expand Up @@ -40,15 +40,15 @@ otool -L $PREFIX/lib/qgis/wmsprovider.so
otool -L $PREFIX/lib/qgis/libqgsprojectionselector.dylib
#otool -L $PREFIX/lib/qgis/libopenmodellerplugin.so

otool -L $PREFIX/lib/Qt3Support.framework/Versions/4.0/Qt3Support
otool -L $PREFIX/lib/QtCore.framework/Versions/4.0/QtCore
otool -L $PREFIX/lib/QtGui.framework/Versions/4.0/QtGui
otool -L $PREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork
otool -L $PREFIX/lib/QtSql.framework/Versions/4.0/QtSql
otool -L $PREFIX/lib/QtSvg.framework/Versions/4.0/QtSvg
otool -L $PREFIX/lib/QtXml.framework/Versions/4.0/QtXml
otool -L $PREFIX/lib/libQtDesigner.4.1.4.dylib
otool -L $PREFIX/lib/libQtTest.4.1.4.dylib
otool -L $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
otool -L $PREFIX/lib/QtCore.framework/Versions/4/QtCore
otool -L $PREFIX/lib/QtGui.framework/Versions/4/QtGui
otool -L $PREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork
otool -L $PREFIX/lib/QtSql.framework/Versions/4/QtSql
otool -L $PREFIX/lib/QtSvg.framework/Versions/4/QtSvg
otool -L $PREFIX/lib/QtXml.framework/Versions/4/QtXml
otool -L $PREFIX/lib/QtDesigner.framework/Versions/4/QtDesigner
otool -L $PREFIX/lib/QtTest.framework/Versions/4/QtTest
otool -L $PREFIX/imageformats/libqjpeg.dylib

otool -L $PREFIX/lib/libgdal.1.10.0.dylib
Expand Down
90 changes: 31 additions & 59 deletions mac/release-extra-qt.sh
View file
@@ -1,5 +1,5 @@
#!/bin/sh
# Copy Qt frameworks and libraries to qgis bundle
# Copy Qt frameworks to qgis bundle
# and make search paths for them relative to bundle

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

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

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

for FRAMEWORK in $QTFRAMEWORKS
do
LIBFRAMEWORK=$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
LIBFRAMEWORK=$FRAMEWORK.framework/Versions/4/$FRAMEWORK
if test ! -f $LIBFRAMEWORK; then
mkdir $FRAMEWORK.framework
mkdir $FRAMEWORK.framework/Versions
mkdir $FRAMEWORK.framework/Versions/4.0
mkdir $FRAMEWORK.framework/Versions/4
cp $QTPREFIX/lib/$LIBFRAMEWORK $LIBFRAMEWORK
install_name_tool -id @executable_path/libs/$LIBFRAMEWORK $LIBFRAMEWORK
fi
done
for LIBRARY in $QTLIBRARIES
do
LIB=lib$LIBRARY.$QTVER.dylib
if test ! -f $LIB; then
cp $QTPREFIX/lib/$LIB $LIB
ln -s $LIB lib$LIBRARY.4.dylib
install_name_tool -id @executable_path/libs/$LIB $LIB
fi
done

# Update path to supporting frameworks
for FRAMEWORK in QtGui QtNetwork QtSql QtSvg QtXml Qt3Support
for FRAMEWORK in QtGui QtNetwork QtSql QtSvg QtXml Qt3Support QtDesigner QtTest
do
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4.0/QtCore \
@executable_path/lib/QtCore.framework/Versions/4.0/QtCore \
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \
@executable_path/lib/QtCore.framework/Versions/4/QtCore \
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
done
for FRAMEWORK in QtSvg Qt3Support
for FRAMEWORK in QtSvg Qt3Support QtDesigner
do
install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4.0/QtGui \
@executable_path/lib/QtGui.framework/Versions/4.0/QtGui \
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4.0/QtXml \
@executable_path/lib/QtXml.framework/Versions/4.0/QtXml \
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4/QtGui \
@executable_path/lib/QtGui.framework/Versions/4/QtGui \
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4/QtXml \
@executable_path/lib/QtXml.framework/Versions/4/QtXml \
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
done
for FRAMEWORK in Qt3Support
do
install_name_tool -change $QTPREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork \
@executable_path/lib/QtNetwork.framework/Versions/4.0/QtNetwork \
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4.0/QtSql \
@executable_path/lib/QtSql.framework/Versions/4.0/QtSql \
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
install_name_tool -change $QTPREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork \
@executable_path/lib/QtNetwork.framework/Versions/4/QtNetwork \
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4/QtSql \
@executable_path/lib/QtSql.framework/Versions/4/QtSql \
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
done
for FRAMEWORK in QtGui QtSvg Qt3Support
for FRAMEWORK in QtGui QtSvg Qt3Support QtDesigner
do
install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG \
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
done
for FRAMEWORK in QtCore QtGui QtXml
do
install_name_tool -change $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK \
@executable_path/lib/$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK \
libQtDesigner.$QTVER.dylib
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
done
install_name_tool -change /usr/local/lib/$LNKPNG \
@executable_path/lib/$LNKPNG \
libQtDesigner.$QTVER.dylib
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4.0/QtCore \
@executable_path/lib/QtCore.framework/Versions/4.0/QtCore \
libQtTest.$QTVER.dylib
cd ../
LIBQJPEG=imageformats/libqjpeg.dylib
if test ! -f $LIBQJPEG; then
mkdir imageformats
cp $QTPREFIX/plugins/$LIBQJPEG $LIBQJPEG
# Update path to supporting libraries
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4.0/QtCore \
@executable_path/lib/QtCore.framework/Versions/4.0/QtCore \
install_name_tool -change $QTPREFIX/lib/QtCore.framework/Versions/4/QtCore \
@executable_path/lib/QtCore.framework/Versions/4/QtCore \
$LIBQJPEG
install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4.0/QtGui \
@executable_path/lib/QtGui.framework/Versions/4.0/QtGui \
install_name_tool -change $QTPREFIX/lib/QtGui.framework/Versions/4/QtGui \
@executable_path/lib/QtGui.framework/Versions/4/QtGui \
$LIBQJPEG
install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $LIBQJPEG
install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $LIBQJPEG
Expand Down Expand Up @@ -131,16 +109,10 @@ for FILE in \
#bin/omgui \
#lib/qgis/libopenmodeller.so
do
for FRAMEWORK in QtCore QtGui QtNetwork QtSvg QtXml Qt3Support
do
install_name_tool -change $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK \
@executable_path/lib/$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK \
$PREFIX/$FILE
done
for LIB in QtDesigner QtTest
for FRAMEWORK in QtCore QtGui QtNetwork QtSvg QtXml Qt3Support QtDesigner QtTest
do
install_name_tool -change $QTPREFIX/lib/lib$LIB.4.dylib \
@executable_path/lib/lib$LIB.4.dylib \
install_name_tool -change $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \
@executable_path/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \
$PREFIX/$FILE
done
done
18 changes: 9 additions & 9 deletions mac/release-strip.sh
View file
Expand Up @@ -39,15 +39,15 @@ strip -x $PREFIX/lib/qgis/wmsprovider.so
strip -x $PREFIX/lib/qgis/libqgsprojectionselector.dylib
#strip -x $PREFIX/lib/qgis/libopenmodellerplugin.so

strip -x $PREFIX/lib/Qt3Support.framework/Versions/4.0/Qt3Support
strip -x $PREFIX/lib/QtCore.framework/Versions/4.0/QtCore
strip -x $PREFIX/lib/QtGui.framework/Versions/4.0/QtGui
strip -x $PREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork
strip -x $PREFIX/lib/QtSql.framework/Versions/4.0/QtSql
strip -x $PREFIX/lib/QtSvg.framework/Versions/4.0/QtSvg
strip -x $PREFIX/lib/QtXml.framework/Versions/4.0/QtXml
strip -x $PREFIX/lib/libQtDesigner.4.1.4.dylib
strip -x $PREFIX/lib/libQtTest.4.1.4.dylib
strip -x $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
strip -x $PREFIX/lib/QtCore.framework/Versions/4/QtCore
strip -x $PREFIX/lib/QtGui.framework/Versions/4/QtGui
strip -x $PREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork
strip -x $PREFIX/lib/QtSql.framework/Versions/4/QtSql
strip -x $PREFIX/lib/QtSvg.framework/Versions/4/QtSvg
strip -x $PREFIX/lib/QtXml.framework/Versions/4/QtXml
strip -x $PREFIX/lib/QtDesigner.framework/Versions/4/QtDesigner
strip -x $PREFIX/lib/QtTest.framework/Versions/4/QtTest
strip -x $PREFIX/imageformats/libqjpeg.dylib

strip -x $PREFIX/lib/libgdal.1.10.0.dylib
Expand Down

0 comments on commit 042fb3b

Please sign in to comment.