Navigation Menu

Skip to content

Commit

Permalink
Update Mac release scripts for 0.9.0.
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk@7295 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
telwertowski committed Oct 23, 2007
1 parent 7b39947 commit a46d1b4
Show file tree
Hide file tree
Showing 8 changed files with 289 additions and 348 deletions.
69 changes: 16 additions & 53 deletions mac/Read Me (Mac).rtf
View file
@@ -1,11 +1,11 @@
{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410
\readonlydoc1{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fmodern\fcharset77 Courier;
\f3\fswiss\fcharset77 Helvetica-Oblique;}
}
{\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.8.0 Release Notes for Macintosh
\f0\b\fs24 \cf0 QGIS 0.9.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 @@ -41,12 +41,12 @@ This release of QGIS requires Mac OS X 10.3.9 or 10.4. A PostgreSQL version 7 or
\f1\b0 \cf0 \
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.\
\
GDAL 1.3.2 (libgdal.1.10.0.dylib)\
GDAL 1.4.2 (libgdal.1.11.2.dylib)\
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.2.2 (various Qt frameworks)\
PROJ 4.5.0 (libproj.0.5.2.dylib)\
SQLITE3 3.4.2 (libsqlite3.0.8.6.dylib)\
Xerces-C++ 2.8.0 (libxerces-c.28.0.dylib)\
Qt/Mac 4.3.2 (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 All @@ -55,8 +55,10 @@ GeoTIFF 1.2.3 (libgeotiff.1.2.3.dylib)\
JasPer 1.701.0.GEO (libjasper-1.701.1.0.0.dylib)\
Expat 2.0.0 (libexpat.1.5.0.dylib)\
GSL 1.8 (libgsl.0.9.0.dylib, libgslcblas.0.0.0.dylib)\
PostgreSQL 8.2.0 (libpq.5.0.dylib) This client can also access a version 7 server.\
GRASS 6.2.1 (libgrass_*.6.2.1.dylib)\
PostgreSQL 8.2.5 (libpq.5.0.dylib) This client can also access a version 7 server.\
GRASS 6.2.2 (libgrass_*.6.2.2.dylib)\
SIP 4.5.2\
PyQt4 4.1.1\
\
\
\
Expand All @@ -70,14 +72,8 @@ GRASS 6.2.1 (libgrass_*.6.2.1.dylib)\
\cf0 Some dialogs have cosmetic issues with buttons.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\cf0 \
If the International System Preferences Language is changed, it will not affect QGIS until the next login. To use a different language without relogging in, start QGIS from a Terminal session. For example:\
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.\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural

\f2 \cf0 qgis.app/Contents/MacOS/qgis --lang it\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural

\f1 \cf0 \
\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
Expand All @@ -91,15 +87,15 @@ If the International System Preferences Language is changed, it will not affect
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f2 \cf0 ln -s /Applications/GPSBabel+\\ 1.3.0/gpsbabel /usr/local/bin/gpsbabel\
\f2 \cf0 ln -s /Applications/GPSBabel+-1.3.4/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.0\
\f2 \cf0 export PATH=$PATH:/Applications/GPSBabel+-1.3.4\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural

\f1 \cf0 \
Expand All @@ -112,46 +108,13 @@ or add the folder containing GPSBabel to your search path:\
\f1\b0 \cf0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
\cf0 To use all the functions of the GRASS plugin, QGIS should be launched from inside GRASS. This can be done in two ways.\
\
One method is to launch QGIS from the GRASS command-line prompt:\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

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

\f1 \cf0 \
Another method is to add a menu item for QGIS to the GRASS menu bar.\
\
To do this for GRASS 6.0.x, open the file\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f2 \cf0 /Applications/Grass/grass60.app/Contents/Resources/grass-6.0.0/etc/dm/menu.tcl\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f1 \cf0 using a text editor and add the following three lines just before the line beginning with "&Help" which should be line 500. (The second line is very long and is probably displayed here on more than one line. It begins with "\{command" and ends with "\} \}".)\
\cf0 To use all the functions of the GRASS plugin, QGIS should be launched from inside GRASS. Some GRASS distributions provide a GRASS menu item to launch QGIS. If GRASS does not contain a QGIS menu item, launch QGIS from the GRASS command-line prompt:\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f2 \cf0 "&Ext" all options $tmenu \{\
\{command "Open QGIS" \{\} "Open QGIS (Quantum GIS) with Grass support enabled" \{\} -command \{ exec $env(GRASS_HTML_BROWSER) "/Applications/qgis-0.8.0/qgis.app" & \} \}\
\}\
\f2 \cf0 /Applications/qgis-0.9.0/qgis0.9.0.app/Contents/MacOS/qgis\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f1 \cf0 \
For GRASS 6.1.x, the
\f2 menu.tcl
\f1 file has changed considerably. Although it is still possible to add an Open QGIS command, the above text must be modified and cannot be inserted as is.\
\
After making this edit and launching GRASS, you can select "Open QGIS" from the new Ext (external application) menu.\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f3\i \cf0 Thanks to Lorenzo Moretti for providing the GRASS 6.0.x menu information.\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
\f1\i0 \cf0 \
\
If you try to use the GRASS plugin while not running GRASS, you will be able to open GRASS files but not use GRASS tools. If you have not previously run QGIS with GRASS, you may be prompted for the location of the GRASS directory GISBASE. Because this directory is inside the GRASS application bundle and cannot be directly selected, you should choose Cancel and then run QGIS from inside GRASS. QGIS will remember the GISBASE directory for subsequent launches.\
}
106 changes: 43 additions & 63 deletions mac/install-extra.sh 100644 → 100755
View file
Expand Up @@ -2,96 +2,76 @@
# Make all libs and plugins in qgis bundle relative to bundle
# This allows the bundle to be moved to another folder and still work

# Edit CONFIGPREFIX to match the value of ./configure --prefix
CONFIGPREFIX=$PWD
# Edit INSTALLPREFIX to match the value of cmake INSTALL_PREFIX
INSTALLPREFIX=$PWD

BUNDLE=qgis.app/Contents/MacOS
BUILDPREFIX=$CONFIGPREFIX/$BUNDLE
BUNDLE=qgis0.9.0.app/Contents/MacOS
BUILDPREFIX=$INSTALLPREFIX/$BUNDLE

QLIBNAMES="composer core gui legend raster"
QLIBNAMES="core gui"

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

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

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

# Declare libqgsprojectionselector relative to bundle and update qgis app client
install_name_tool -id @executable_path/lib/qgis/libqgsprojectionselector.dylib \
$BUILDPREFIX/lib/qgis/libqgsprojectionselector.dylib

install_name_tool -change $BUILDPREFIX/lib/qgis/libqgsprojectionselector.dylib \
@executable_path/lib/qgis/libqgsprojectionselector.dylib \
$BUILDPREFIX/qgis

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

# Update libqgis_gui client of libqgis_*
for LIB in libqgis_composer.1.dylib libqgis_core.1.dylib libqgis_legend.1.dylib \
libqgis_raster.1.dylib qgis/libqgsprojectionselector.dylib
do
install_name_tool -change $BUILDPREFIX/lib/$LIB \
@executable_path/lib/$LIB \
$BUILDPREFIX/lib/libqgis_gui.1.0.0.dylib
done
install_name_tool -change $BUILDPREFIX/lib/libqgis_core.dylib \
@executable_path/lib/libqgis_core.dylib \
$BUILDPREFIX/lib/libqgis_gui.dylib

# Update plugin and lib clients of libqgis_* and libqgsprojectionselector
for PLUGIN in \
qgis/copyrightlabelplugin.so \
qgis/delimitedtextplugin.so \
qgis/delimitedtextprovider.so \
qgis/georefplugin.so \
qgis/gpsimporterplugin.so \
qgis/gpxprovider.so \
qgis/grassplugin.so \
qgis/grassprovider.so \
qgis/gridmakerplugin.so \
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/northarrowplugin.so \
qgis/ogrprovider.so \
qgis/pggeoprocessingplugin.so \
qgis/postgresprovider.so \
qgis/scalebarplugin.so \
qgis/spitplugin.so \
qgis/wfsplugin.so \
qgis/wmsprovider.so \
qgis/libqgsprojectionselector.dylib \
libqgisgrass.1.0.0.dylib
qgis/libnortharrowplugin.so \
qgis/libogrprovider.so \
qgis/libpggeoprocessingplugin.so \
qgis/libpostgresprovider.so \
qgis/libscalebarplugin.so \
qgis/libspitplugin.so \
qgis/libwfsplugin.so \
qgis/libwmsprovider.so \
libqgisgrass.dylib
do
for NAME in $QLIBNAMES
do
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.1.dylib \
@executable_path/lib/libqgis_$NAME.1.dylib \
install_name_tool -change $BUILDPREFIX/lib/libqgis_$NAME.dylib \
@executable_path/lib/libqgis_$NAME.dylib \
$BUILDPREFIX/lib/$PLUGIN
done
install_name_tool -change $BUILDPREFIX/lib/qgis/libqgsprojectionselector.dylib \
@executable_path/lib/qgis/libqgsprojectionselector.dylib \
$BUILDPREFIX/lib/$PLUGIN
done

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

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

# Declare libmsexport relative to bundle
install_name_tool -id @executable_path/lib/libmsexport.1.0.0.dylib \
$BUILDPREFIX/lib/libmsexport.1.0.0.dylib
71 changes: 35 additions & 36 deletions mac/release-check.sh 100644 → 100755
View file
Expand Up @@ -2,42 +2,34 @@
# Display all paths to supporting libraries
# Output should be visually inspected for paths which haven't been made relative (such as /usr/local)

PREFIX=qgis.app/Contents/MacOS
PREFIX=qgis0.9.0.app/Contents/MacOS

otool -L $PREFIX/qgis
otool -L $PREFIX/bin/qgis-config
otool -L $PREFIX/bin/qgis_help.app/Contents/MacOS/qgis_help
otool -L $PREFIX/bin/msexport.app/Contents/MacOS/msexport
#otool -L $PREFIX/bin/gridmaker
#otool -L $PREFIX/bin/spit
#otool -L $PREFIX/bin/omgui

otool -L $PREFIX/lib/libmsexport.1.0.0.dylib
otool -L $PREFIX/lib/libqgis_composer.1.0.0.dylib
otool -L $PREFIX/lib/libqgis_core.1.0.0.dylib
otool -L $PREFIX/lib/libqgis_gui.1.0.0.dylib
otool -L $PREFIX/lib/libqgis_legend.1.0.0.dylib
otool -L $PREFIX/lib/libqgis_raster.1.0.0.dylib
otool -L $PREFIX/lib/libqgisgrass.1.0.0.dylib
otool -L $PREFIX/lib/qgis/copyrightlabelplugin.so
otool -L $PREFIX/lib/qgis/delimitedtextplugin.so
otool -L $PREFIX/lib/qgis/delimitedtextprovider.so
otool -L $PREFIX/lib/qgis/georefplugin.so
otool -L $PREFIX/lib/qgis/gpsimporterplugin.so
otool -L $PREFIX/lib/qgis/gpxprovider.so
otool -L $PREFIX/lib/qgis/grassplugin.so
otool -L $PREFIX/lib/qgis/grassprovider.so
otool -L $PREFIX/lib/qgis/gridmakerplugin.so
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/northarrowplugin.so
otool -L $PREFIX/lib/qgis/ogrprovider.so
otool -L $PREFIX/lib/qgis/pggeoprocessingplugin.so
otool -L $PREFIX/lib/qgis/postgresprovider.so
otool -L $PREFIX/lib/qgis/scalebarplugin.so
otool -L $PREFIX/lib/qgis/spitplugin.so
otool -L $PREFIX/lib/qgis/wfsplugin.so
otool -L $PREFIX/lib/qgis/wmsprovider.so
otool -L $PREFIX/lib/qgis/libqgsprojectionselector.dylib
otool -L $PREFIX/lib/qgis/libnortharrowplugin.so
otool -L $PREFIX/lib/qgis/libogrprovider.so
otool -L $PREFIX/lib/qgis/libpggeoprocessingplugin.so
otool -L $PREFIX/lib/qgis/libpostgresprovider.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/libwmsprovider.so
#otool -L $PREFIX/lib/qgis/libopenmodellerplugin.so

otool -L $PREFIX/lib/Qt3Support.framework/Versions/4/Qt3Support
Expand All @@ -47,17 +39,16 @@ 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/../plugins/imageformats/libqjpeg.dylib

otool -L $PREFIX/lib/libgdal.1.10.0.dylib
otool -L $PREFIX/lib/libgdal.1.11.2.dylib
otool -L $PREFIX/lib/gdalplugins/gdal_GRASS.so
otool -L $PREFIX/lib/gdalplugins/ogr_GRASS.so
otool -L $PREFIX/lib/libgeos.2.2.3.dylib
otool -L $PREFIX/lib/libproj.0.5.0.dylib
otool -L $PREFIX/lib/libgeos_c.1.1.1.dylib
otool -L $PREFIX/lib/libproj.0.5.2.dylib
otool -L $PREFIX/lib/libsqlite3.0.8.6.dylib
otool -L $PREFIX/lib/libxerces-c.27.0.dylib
otool -L $PREFIX/lib/libxerces-c.28.0.dylib
otool -L $PREFIX/lib/libgif.4.1.4.dylib
otool -L $PREFIX/lib/libjpeg.62.0.0.dylib
otool -L $PREFIX/lib/libpng.3.1.2.8.dylib
Expand All @@ -79,5 +70,13 @@ otool -L $PREFIX/lib/libpq.5.0.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.2.1.dylib
otool -L $PREFIX/lib/grass/libgrass_$LIBGRASS.6.2.2.dylib
done

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 QtCore QtGui QtNetwork QtSql QtSvg QtXml QtAssistant QtOpenGL QtTest
do
otool -L $PREFIX/share/qgis/python/PyQt4/$LIBPYQT4.so
done
4 changes: 2 additions & 2 deletions mac/release-extra-grass.sh 100644 → 100755
View file
Expand Up @@ -2,12 +2,12 @@
# Copy GRASS supporting libraries to qgis bundle
# and make search paths for them relative to bundle

PREFIX=qgis.app/Contents/MacOS
PREFIX=qgis0.9.0.app/Contents/MacOS

# Edit version when any library is upgraded
LNKGDAL=libgdal.1.dylib
LNKPROJ=libproj.0.dylib
GRASSVER=6.2.1
GRASSVER=6.2.2
GRASSLIB=/usr/local/grass-$GRASSVER/lib

cd $PREFIX/lib
Expand Down

0 comments on commit a46d1b4

Please sign in to comment.