Skip to content

Commit

Permalink
Update Mac release scripts for 0.11.0.
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk@8743 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
telwertowski committed Jul 9, 2008
1 parent 47fbc24 commit f068c2d
Show file tree
Hide file tree
Showing 8 changed files with 307 additions and 146 deletions.
24 changes: 12 additions & 12 deletions mac/Read Me (Mac).rtf
View file
@@ -1,11 +1,11 @@
{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf470
{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf480
\readonlydoc1{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fmodern\fcharset77 Courier;
}
{\colortbl;\red255\green255\blue255;}
\margl1440\margr1440\vieww11100\viewh8700\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc

\f0\b\fs24 \cf0 QGIS 0.10.0 Release Notes for Macintosh
\f0\b\fs24 \cf0 QGIS 0.11.0 Release Notes for Macintosh
\f1\b0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\cf0 \
Expand Down Expand Up @@ -44,22 +44,22 @@ The following libraries are included with this distribution of QGIS. If you have
GDAL 1.5.1 (libgdal.1.dylib)\
GEOS 3.0.0 (libgeos.3.0.0.dylib)\
PROJ 4.6.0 (libproj.0.5.4.dylib)\
SQLITE3 3.5.7 (libsqlite3.0.8.6.dylib)\
SQLite 3.5.9 (libsqlite3.0.dylib)\
Xerces-C++ 2.8.0 (libxerces-c.28.0.dylib)\
Qt/Mac 4.3.4 (various Qt frameworks)\
Qt/Mac 4.4.0 (various Qt frameworks)\
GIF 4.1.6 (libgif.4.1.6.dylib)\
JPEG 6b (libjpeg.62.0.0.dylib)\
PNG 1.2.24 (libpng12.0.24.0.dylib)\
PNG 1.2.29 (libpng12.0.dylib)\
TIFF 3.8.2 (libtiff.3.dylib)\
GeoTIFF 1.2.4 (libgeotiff.1.2.4.dylib)\
JasPer 1.900.1.uuid (libjasper.1.0.0.dylib)\
Expat 2.0.1 (libexpat.1.5.2.dylib)\
FFTW 3.1.2 (libfftw3.3.1.2.dylib)\
GSL 1.11 (libgsl.0.dylib, libgslcblas.0.dylib)\
PostgreSQL 8.3.1 (libpq.5.1.dylib) This client can also access a version 7 server.\
GRASS 6.3.0RC6 (libgrass_*.6.3.0RC6.dylib)\
SIP 4.7.4 (sip.so)\
PyQt4 4.3.3 (Qt*.so)\
PostgreSQL 8.3.3 (libpq.5.1.dylib) This client can also access a version 7 server.\
GRASS 6.3.0 (libgrass_*.6.3.0.dylib)\
SIP 4.7.6 (sip.so)\
PyQt4 4.4.2 (Qt*.so)\
\
\
\
Expand Down Expand Up @@ -90,15 +90,15 @@ The main window cannot be resized while a WMS layer is displayed. Therefore adju
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f2 \cf0 ln -s /Applications/GPSBabel+-1.3.4/gpsbabel /usr/local/bin/gpsbabel\
\f2 \cf0 ln -s /Applications/GPSBabel+-1.3.5/gpsbabel /usr/local/bin/gpsbabel\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f1 \cf0 \
or add the folder containing GPSBabel to your search path:\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f2 \cf0 export PATH=$PATH:/Applications/GPSBabel+-1.3.4\
\f2 \cf0 export PATH=$PATH:/Applications/GPSBabel+-1.3.5\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural

\f1 \cf0 \
Expand All @@ -115,7 +115,7 @@ or add the folder containing GPSBabel to your search path:\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f2 \cf0 /Applications/qgis-0.10.0/qgis0.10.0.app/Contents/MacOS/qgis\
\f2 \cf0 /Applications/qgis-0.11.0/qgis0.11.0.app/Contents/MacOS/qgis\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f1 \cf0 \
Expand Down
109 changes: 72 additions & 37 deletions mac/install-extra.sh
View file
Expand Up @@ -5,52 +5,42 @@
# Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
INSTALLPREFIX=$PWD

VER=0.10
VER=0.11
BUNDLE=qgis$VER.0.app/Contents/MacOS
BUILDPREFIX=$INSTALLPREFIX/$BUNDLE

QLIBNAMES="core gui"

# Declare libqgis_* relative to bundle and update qgis app client
# Declare libqgis_* relative to bundle and update qgis and qgis_help app clients
for NAME in $QLIBNAMES
do
install_name_tool -id @executable_path/lib/libqgis_$NAME.dylib \
$BUILDPREFIX/lib/libqgis_$NAME.dylib
install_name_tool -id @executable_path/lib/libqgis_$NAME.$VER.dylib \
$BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib

install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.dylib \
@executable_path/lib/libqgis_$NAME.dylib \
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \
@executable_path/lib/libqgis_$NAME.$VER.dylib \
$BUILDPREFIX/qgis

install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \
@executable_path/lib/libqgis_$NAME.dylib \
@executable_path/lib/libqgis_$NAME.$VER.dylib \
$BUILDPREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help

install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \
@executable_path/lib/libqgis_$NAME.dylib \
$BUILDPREFIX/share/qgis/python/qgis/core.so

install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \
@executable_path/lib/libqgis_$NAME.dylib \
$BUILDPREFIX/share/qgis/python/qgis/gui.so
done

# Update libqgis_gui client of libqgis_*
install_name_tool -change $BUILDPREFIX/lib/libqgis_core.dylib \
@executable_path/lib/libqgis_core.dylib \
$BUILDPREFIX/lib/libqgis_gui.dylib
# Update libqgis_gui client of libqgis_core
install_name_tool -change $BUILDPREFIX/lib/libqgis_core.$VER.dylib \
@executable_path/lib/libqgis_core.$VER.dylib \
$BUILDPREFIX/lib/libqgis_gui.$VER.dylib

# Update plugin and lib clients of libqgis_* and libqgsprojectionselector
# Update plugin and lib clients of libqgis_*
for PLUGIN in \
qgis/libcopyrightlabelplugin.so \
qgis/libdelimitedtextplugin.so \
qgis/libdelimitedtextprovider.so \
qgis/libgeorefplugin.so \
qgis/libgpsimporterplugin.so \
qgis/libgpxprovider.so \
qgis/libgrassplugin.so \
qgis/libgrassprovider.so \
qgis/libgridmakerplugin.so \
qgis/libwfsprovider.so \
qgis/libmemoryprovider.so \
qgis/libnortharrowplugin.so \
qgis/libogrprovider.so \
qgis/libpggeoprocessingplugin.so \
Expand All @@ -59,25 +49,70 @@ for PLUGIN in \
qgis/libscalebarplugin.so \
qgis/libspitplugin.so \
qgis/libwfsplugin.so \
qgis/libwmsprovider.so \
libqgisgrass.dylib
qgis/libwfsprovider.so \
qgis/libwmsprovider.so
do
for NAME in $QLIBNAMES
do
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.dylib \
@executable_path/lib/libqgis_$NAME.dylib \
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \
@executable_path/lib/libqgis_$NAME.$VER.dylib \
$BUILDPREFIX/lib/$PLUGIN
done
done

# Declare libqgisgrass relative to bundle
install_name_tool -id @executable_path/lib/libqgisgrass.dylib \
$BUILDPREFIX/lib/libqgisgrass.dylib
if test -f $BUILDPREFIX/lib/libqgisgrass.$VER.dylib; then

# Update plugin clients of libqgisgrass
for PLUGIN in qgis/libgrassplugin.so qgis/libgrassprovider.so
do
install_name_tool -change $BUILDPREFIX/lib/libqgisgrass.dylib \
@executable_path/lib/libqgisgrass.dylib \
$BUILDPREFIX/lib/$PLUGIN
done
# Declare libqgisgrass relative to bundle
install_name_tool -id @executable_path/lib/libqgisgrass.$VER.dylib \
$BUILDPREFIX/lib/libqgisgrass.$VER.dylib

# Update plugin and lib clients of libqgis_*
for PLUGIN in \
qgis/libgrassplugin.so \
qgis/libgrassprovider.so \
libqgisgrass.$VER.dylib
do
for NAME in $QLIBNAMES
do
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \
@executable_path/lib/libqgis_$NAME.$VER.dylib \
$BUILDPREFIX/lib/$PLUGIN
done
done

# Update plugin clients of libqgisgrass
for PLUGIN in qgis/libgrassplugin.so qgis/libgrassprovider.so
do
install_name_tool -change $BUILDPREFIX/lib/libqgisgrass.$VER.dylib \
@executable_path/lib/libqgisgrass.$VER.dylib \
$BUILDPREFIX/lib/$PLUGIN
done

fi

if test -f $BUILDPREFIX/lib/libqgispython.$VER.dylib; then

# Declare libqgispython relative to bundle
install_name_tool -id @executable_path/lib/libqgispython.$VER.dylib \
$BUILDPREFIX/lib/libqgispython.$VER.dylib

# Update python lib paths to libqgis_*
for NAME in $QLIBNAMES
do
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.$VER.dylib \
@executable_path/lib/libqgis_$NAME.$VER.dylib \
$BUILDPREFIX/lib/libqgispython.$VER.dylib
done

# Update python plugin paths libqgis_*
for PLUGIN in core.so gui.so
do
for NAME in $QLIBNAMES
do
install_name_tool -change $INSTALLPREFIX/src/$NAME/libqgis_$NAME.$VER.dylib \
@executable_path/lib/libqgis_$NAME.$VER.dylib \
$BUILDPREFIX/share/qgis/python/qgis/$PLUGIN
done
done

fi
58 changes: 38 additions & 20 deletions mac/release-check.sh
View file
Expand Up @@ -2,24 +2,21 @@
# Display all paths to supporting libraries
# Output should be visually inspected for paths which haven't been made relative (such as /usr/local)

PREFIX=qgis0.10.0.app/Contents/MacOS
PREFIX=qgis0.11.0.app/Contents/MacOS

otool -L $PREFIX/qgis
otool -L $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help

otool -L $PREFIX/lib/libqgis_core.dylib
otool -L $PREFIX/lib/libqgis_gui.dylib
otool -L $PREFIX/lib/libqgisgrass.dylib
otool -L $PREFIX/lib/qgis/libcopyrightlabelplugin.so
otool -L $PREFIX/lib/qgis/libdelimitedtextplugin.so
otool -L $PREFIX/lib/qgis/libdelimitedtextprovider.so
otool -L $PREFIX/lib/qgis/libgeorefplugin.so
otool -L $PREFIX/lib/qgis/libgpsimporterplugin.so
otool -L $PREFIX/lib/qgis/libgpxprovider.so
otool -L $PREFIX/lib/qgis/libgrassplugin.so
otool -L $PREFIX/lib/qgis/libgrassprovider.so
otool -L $PREFIX/lib/qgis/libgridmakerplugin.so
otool -L $PREFIX/lib/qgis/libwfsprovider.so
otool -L $PREFIX/lib/qgis/libmemoryprovider.so
otool -L $PREFIX/lib/qgis/libnortharrowplugin.so
otool -L $PREFIX/lib/qgis/libogrprovider.so
otool -L $PREFIX/lib/qgis/libpggeoprocessingplugin.so
Expand All @@ -28,6 +25,7 @@ otool -L $PREFIX/lib/qgis/libquickprintplugin.so
otool -L $PREFIX/lib/qgis/libscalebarplugin.so
otool -L $PREFIX/lib/qgis/libspitplugin.so
otool -L $PREFIX/lib/qgis/libwfsplugin.so
otool -L $PREFIX/lib/qgis/libwfsprovider.so
otool -L $PREFIX/lib/qgis/libwmsprovider.so

otool -L $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
Expand All @@ -40,16 +38,14 @@ otool -L $PREFIX/lib/QtXml.framework/Versions/4/QtXml
otool -L $PREFIX/../plugins/imageformats/libqjpeg.dylib

otool -L $PREFIX/lib/libgdal.1.dylib
otool -L $PREFIX/lib/gdalplugins/gdal_GRASS.so
otool -L $PREFIX/lib/gdalplugins/ogr_GRASS.so
otool -L $PREFIX/lib/libgeos.3.0.0.dylib
otool -L $PREFIX/lib/libgeos_c.1.4.1.dylib
otool -L $PREFIX/lib/libproj.0.5.4.dylib
otool -L $PREFIX/lib/libsqlite3.0.8.6.dylib
otool -L $PREFIX/lib/libsqlite3.0.dylib
otool -L $PREFIX/lib/libxerces-c.28.0.dylib
otool -L $PREFIX/lib/libgif.4.1.6.dylib
otool -L $PREFIX/lib/libjpeg.62.0.0.dylib
otool -L $PREFIX/lib/libpng12.0.24.0.dylib
otool -L $PREFIX/lib/libpng12.0.dylib
otool -L $PREFIX/lib/libtiff.3.dylib
otool -L $PREFIX/lib/libgeotiff.1.2.4.dylib
otool -L $PREFIX/lib/libjasper.1.0.0.dylib
Expand All @@ -59,15 +55,37 @@ otool -L $PREFIX/lib/libgsl.0.dylib
otool -L $PREFIX/lib/libgslcblas.0.dylib
otool -L $PREFIX/lib/libpq.5.1.dylib

for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect
do
otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0RC6.dylib
done
if test -f $PREFIX/lib/libqgisgrass.dylib; then
otool -L $PREFIX/lib/libqgisgrass.dylib

otool -L $PREFIX/lib/qgis/libgrassplugin.so
otool -L $PREFIX/lib/qgis/libgrassprovider.so

otool -L $PREFIX/lib/gdalplugins/gdal_GRASS.so
otool -L $PREFIX/lib/gdalplugins/ogr_GRASS.so

for LIBGRASS in datetime dbmibase dbmiclient dgl dig2 form gis gmath gproj I linkm rtree shape vask vect
do
otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.3.0.dylib
done
fi

if test -f $PREFIX/lib/libqgispython.dylib; then
otool -L $PREFIX/lib/libqgispython.dylib

otool -L $PREFIX/share/qgis/python/qgis/core.so
otool -L $PREFIX/share/qgis/python/qgis/gui.so

for FRAMEWORK in QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
do
otool -L $PREFIX/lib/$FRAMEWORK.framework/Versions/4/$FRAMEWORK
done
otool -L $PREFIX/lib/libQtCLucene.4.4.0.dylib

otool -L $PREFIX/share/qgis/python/sip.so
for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtHelp QtOpenGL QtScript QtTest QtWebKit QtXmlPatterns phonon
do
otool -L $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so
done
fi

otool -L $PREFIX/share/qgis/python/qgis/core.so
otool -L $PREFIX/share/qgis/python/qgis/gui.so
otool -L $PREFIX/share/qgis/python/sip.so
for LIBPYQT4 in Qt QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtDesigner QtOpenGL QtScript QtTest
do
otool -L $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so
done
4 changes: 2 additions & 2 deletions mac/release-extra-grass.sh
View file
Expand Up @@ -2,14 +2,14 @@
# Copy GRASS supporting libraries to qgis bundle
# and make search paths for them relative to bundle

PREFIX=qgis0.10.0.app/Contents/MacOS
PREFIX=qgis0.11.0.app/Contents/MacOS

# Edit version when any library is upgraded
LNKGDAL=libgdal.1.dylib
LNKPROJ=libproj.0.dylib
LIBFFTW=libfftw3.3.1.2.dylib
LNKFFTW=libfftw3.3.dylib
GRASSVER=6.3.0RC6
GRASSVER=6.3.0
GRASSLIB=/usr/local/grass-$GRASSVER/lib

cd $PREFIX/lib
Expand Down

0 comments on commit f068c2d

Please sign in to comment.