mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-06 00:07:29 -04:00
Update Mac release scripts for Qt 4.2.
git-svn-id: http://svn.osgeo.org/qgis/trunk@6137 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
1ffcb6e4aa
commit
042fb3be83
@ -46,7 +46,7 @@ GEOS 2.2.3 (libgeos.2.2.3.dylib)\
|
|||||||
PROJ 4.4.9 (libproj.0.5.0.dylib)\
|
PROJ 4.4.9 (libproj.0.5.0.dylib)\
|
||||||
SQLITE3 3.3.6 (libsqlite3.0.8.6.dylib)\
|
SQLITE3 3.3.6 (libsqlite3.0.8.6.dylib)\
|
||||||
Xerces-C++ 2.7.0 (libxerces-c.27.0.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)\
|
GIF 4.1.4 (libgif.4.1.4.dylib)\
|
||||||
JPEG 6b (libjpeg.62.0.0.dylib)\
|
JPEG 6b (libjpeg.62.0.0.dylib)\
|
||||||
PNG 1.2.8 (libpng.3.1.2.8.dylib)\
|
PNG 1.2.8 (libpng.3.1.2.8.dylib)\
|
||||||
|
@ -40,15 +40,15 @@ otool -L $PREFIX/lib/qgis/wmsprovider.so
|
|||||||
otool -L $PREFIX/lib/qgis/libqgsprojectionselector.dylib
|
otool -L $PREFIX/lib/qgis/libqgsprojectionselector.dylib
|
||||||
#otool -L $PREFIX/lib/qgis/libopenmodellerplugin.so
|
#otool -L $PREFIX/lib/qgis/libopenmodellerplugin.so
|
||||||
|
|
||||||
otool -L $PREFIX/lib/Qt3Support.framework/Versions/4.0/Qt3Support
|
otool -L $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
|
||||||
otool -L $PREFIX/lib/QtCore.framework/Versions/4.0/QtCore
|
otool -L $PREFIX/lib/QtCore.framework/Versions/4/QtCore
|
||||||
otool -L $PREFIX/lib/QtGui.framework/Versions/4.0/QtGui
|
otool -L $PREFIX/lib/QtGui.framework/Versions/4/QtGui
|
||||||
otool -L $PREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork
|
otool -L $PREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork
|
||||||
otool -L $PREFIX/lib/QtSql.framework/Versions/4.0/QtSql
|
otool -L $PREFIX/lib/QtSql.framework/Versions/4/QtSql
|
||||||
otool -L $PREFIX/lib/QtSvg.framework/Versions/4.0/QtSvg
|
otool -L $PREFIX/lib/QtSvg.framework/Versions/4/QtSvg
|
||||||
otool -L $PREFIX/lib/QtXml.framework/Versions/4.0/QtXml
|
otool -L $PREFIX/lib/QtXml.framework/Versions/4/QtXml
|
||||||
otool -L $PREFIX/lib/libQtDesigner.4.1.4.dylib
|
otool -L $PREFIX/lib/QtDesigner.framework/Versions/4/QtDesigner
|
||||||
otool -L $PREFIX/lib/libQtTest.4.1.4.dylib
|
otool -L $PREFIX/lib/QtTest.framework/Versions/4/QtTest
|
||||||
otool -L $PREFIX/imageformats/libqjpeg.dylib
|
otool -L $PREFIX/imageformats/libqjpeg.dylib
|
||||||
|
|
||||||
otool -L $PREFIX/lib/libgdal.1.10.0.dylib
|
otool -L $PREFIX/lib/libgdal.1.10.0.dylib
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/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
|
# and make search paths for them relative to bundle
|
||||||
|
|
||||||
PREFIX=qgis.app/Contents/MacOS
|
PREFIX=qgis.app/Contents/MacOS
|
||||||
@ -10,88 +10,66 @@ LNKJPEG=libjpeg.62.dylib
|
|||||||
LIBPNG=libpng.3.1.2.8.dylib
|
LIBPNG=libpng.3.1.2.8.dylib
|
||||||
LNKPNG=libpng.3.dylib
|
LNKPNG=libpng.3.dylib
|
||||||
|
|
||||||
QTVER=4.1.4
|
QTVER=4.2.0
|
||||||
QTPREFIX=/usr/local/Trolltech/Qt-$QTVER
|
QTPREFIX=/usr/local/Trolltech/Qt-$QTVER
|
||||||
QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support"
|
QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml Qt3Support QtDesigner QtTest"
|
||||||
QTLIBRARIES="QtDesigner QtTest"
|
|
||||||
|
|
||||||
# Copy supporting frameworks to application bundle
|
# Copy supporting frameworks to application bundle
|
||||||
cd $PREFIX/lib
|
cd $PREFIX/lib
|
||||||
|
|
||||||
for FRAMEWORK in $QTFRAMEWORKS
|
for FRAMEWORK in $QTFRAMEWORKS
|
||||||
do
|
do
|
||||||
LIBFRAMEWORK=$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
|
LIBFRAMEWORK=$FRAMEWORK.framework/Versions/4/$FRAMEWORK
|
||||||
if test ! -f $LIBFRAMEWORK; then
|
if test ! -f $LIBFRAMEWORK; then
|
||||||
mkdir $FRAMEWORK.framework
|
mkdir $FRAMEWORK.framework
|
||||||
mkdir $FRAMEWORK.framework/Versions
|
mkdir $FRAMEWORK.framework/Versions
|
||||||
mkdir $FRAMEWORK.framework/Versions/4.0
|
mkdir $FRAMEWORK.framework/Versions/4
|
||||||
cp $QTPREFIX/lib/$LIBFRAMEWORK $LIBFRAMEWORK
|
cp $QTPREFIX/lib/$LIBFRAMEWORK $LIBFRAMEWORK
|
||||||
install_name_tool -id @executable_path/libs/$LIBFRAMEWORK $LIBFRAMEWORK
|
install_name_tool -id @executable_path/libs/$LIBFRAMEWORK $LIBFRAMEWORK
|
||||||
fi
|
fi
|
||||||
done
|
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
|
# 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
|
do
|
||||||
install_name_tool -change $QTPREFIX/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.0/QtCore \
|
@executable_path/lib/QtCore.framework/Versions/4/QtCore \
|
||||||
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
|
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
|
||||||
done
|
done
|
||||||
for FRAMEWORK in QtSvg Qt3Support
|
for FRAMEWORK in QtSvg Qt3Support QtDesigner
|
||||||
do
|
do
|
||||||
install_name_tool -change $QTPREFIX/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.0/QtGui \
|
@executable_path/lib/QtGui.framework/Versions/4/QtGui \
|
||||||
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
|
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
|
||||||
install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4.0/QtXml \
|
install_name_tool -change $QTPREFIX/lib/QtXml.framework/Versions/4/QtXml \
|
||||||
@executable_path/lib/QtXml.framework/Versions/4.0/QtXml \
|
@executable_path/lib/QtXml.framework/Versions/4/QtXml \
|
||||||
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
|
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
|
||||||
done
|
done
|
||||||
for FRAMEWORK in Qt3Support
|
for FRAMEWORK in Qt3Support
|
||||||
do
|
do
|
||||||
install_name_tool -change $QTPREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork \
|
install_name_tool -change $QTPREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork \
|
||||||
@executable_path/lib/QtNetwork.framework/Versions/4.0/QtNetwork \
|
@executable_path/lib/QtNetwork.framework/Versions/4/QtNetwork \
|
||||||
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
|
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
|
||||||
install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4.0/QtSql \
|
install_name_tool -change $QTPREFIX/lib/QtSql.framework/Versions/4/QtSql \
|
||||||
@executable_path/lib/QtSql.framework/Versions/4.0/QtSql \
|
@executable_path/lib/QtSql.framework/Versions/4/QtSql \
|
||||||
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
|
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
|
||||||
done
|
done
|
||||||
for FRAMEWORK in QtGui QtSvg Qt3Support
|
for FRAMEWORK in QtGui QtSvg Qt3Support QtDesigner
|
||||||
do
|
do
|
||||||
install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG \
|
install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG \
|
||||||
$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK
|
$FRAMEWORK.framework/Versions/4/$FRAMEWORK
|
||||||
done
|
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
|
|
||||||
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 ../
|
cd ../
|
||||||
LIBQJPEG=imageformats/libqjpeg.dylib
|
LIBQJPEG=imageformats/libqjpeg.dylib
|
||||||
if test ! -f $LIBQJPEG; then
|
if test ! -f $LIBQJPEG; then
|
||||||
mkdir imageformats
|
mkdir imageformats
|
||||||
cp $QTPREFIX/plugins/$LIBQJPEG $LIBQJPEG
|
cp $QTPREFIX/plugins/$LIBQJPEG $LIBQJPEG
|
||||||
# Update path to supporting libraries
|
# Update path to supporting libraries
|
||||||
install_name_tool -change $QTPREFIX/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.0/QtCore \
|
@executable_path/lib/QtCore.framework/Versions/4/QtCore \
|
||||||
$LIBQJPEG
|
$LIBQJPEG
|
||||||
install_name_tool -change $QTPREFIX/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.0/QtGui \
|
@executable_path/lib/QtGui.framework/Versions/4/QtGui \
|
||||||
$LIBQJPEG
|
$LIBQJPEG
|
||||||
install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $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
|
install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $LIBQJPEG
|
||||||
@ -131,16 +109,10 @@ for FILE in \
|
|||||||
#bin/omgui \
|
#bin/omgui \
|
||||||
#lib/qgis/libopenmodeller.so
|
#lib/qgis/libopenmodeller.so
|
||||||
do
|
do
|
||||||
for FRAMEWORK in QtCore QtGui QtNetwork QtSvg QtXml Qt3Support
|
for FRAMEWORK in QtCore QtGui QtNetwork QtSvg QtXml Qt3Support QtDesigner QtTest
|
||||||
do
|
do
|
||||||
install_name_tool -change $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK \
|
install_name_tool -change $QTPREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \
|
||||||
@executable_path/lib/$FRAMEWORK.framework/Versions/4.0/$FRAMEWORK \
|
@executable_path/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \
|
||||||
$PREFIX/$FILE
|
|
||||||
done
|
|
||||||
for LIB in QtDesigner QtTest
|
|
||||||
do
|
|
||||||
install_name_tool -change $QTPREFIX/lib/lib$LIB.4.dylib \
|
|
||||||
@executable_path/lib/lib$LIB.4.dylib \
|
|
||||||
$PREFIX/$FILE
|
$PREFIX/$FILE
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
@ -39,15 +39,15 @@ strip -x $PREFIX/lib/qgis/wmsprovider.so
|
|||||||
strip -x $PREFIX/lib/qgis/libqgsprojectionselector.dylib
|
strip -x $PREFIX/lib/qgis/libqgsprojectionselector.dylib
|
||||||
#strip -x $PREFIX/lib/qgis/libopenmodellerplugin.so
|
#strip -x $PREFIX/lib/qgis/libopenmodellerplugin.so
|
||||||
|
|
||||||
strip -x $PREFIX/lib/Qt3Support.framework/Versions/4.0/Qt3Support
|
strip -x $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
|
||||||
strip -x $PREFIX/lib/QtCore.framework/Versions/4.0/QtCore
|
strip -x $PREFIX/lib/QtCore.framework/Versions/4/QtCore
|
||||||
strip -x $PREFIX/lib/QtGui.framework/Versions/4.0/QtGui
|
strip -x $PREFIX/lib/QtGui.framework/Versions/4/QtGui
|
||||||
strip -x $PREFIX/lib/QtNetwork.framework/Versions/4.0/QtNetwork
|
strip -x $PREFIX/lib/QtNetwork.framework/Versions/4/QtNetwork
|
||||||
strip -x $PREFIX/lib/QtSql.framework/Versions/4.0/QtSql
|
strip -x $PREFIX/lib/QtSql.framework/Versions/4/QtSql
|
||||||
strip -x $PREFIX/lib/QtSvg.framework/Versions/4.0/QtSvg
|
strip -x $PREFIX/lib/QtSvg.framework/Versions/4/QtSvg
|
||||||
strip -x $PREFIX/lib/QtXml.framework/Versions/4.0/QtXml
|
strip -x $PREFIX/lib/QtXml.framework/Versions/4/QtXml
|
||||||
strip -x $PREFIX/lib/libQtDesigner.4.1.4.dylib
|
strip -x $PREFIX/lib/QtDesigner.framework/Versions/4/QtDesigner
|
||||||
strip -x $PREFIX/lib/libQtTest.4.1.4.dylib
|
strip -x $PREFIX/lib/QtTest.framework/Versions/4/QtTest
|
||||||
strip -x $PREFIX/imageformats/libqjpeg.dylib
|
strip -x $PREFIX/imageformats/libqjpeg.dylib
|
||||||
|
|
||||||
strip -x $PREFIX/lib/libgdal.1.10.0.dylib
|
strip -x $PREFIX/lib/libgdal.1.10.0.dylib
|
||||||
|
Loading…
x
Reference in New Issue
Block a user