Updates for tims post install mac scripts

git-svn-id: http://svn.osgeo.org/qgis/trunk@8459 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 19, 2008 · dad16d5 · dad16d5
1 parent 8c91fce
commit dad16d5
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 6 deletions.
diff --git a/mac/1-release-extra.sh b/mac/1-release-extra.sh
@@ -4,7 +4,8 @@
 
 APP_PREFIX=/Applications/qgis0.11.0.app
 BUNDLE_DIR=${APP_PREFIX}/Contents/MacOS
-LIB_DIR=/usr/local/qgis_universal_deps/lib
+DEPS_BASE=/usr/local/qgis_universal_deps
+LIB_DIR=${DEPS_BASE}/lib
 #set -x
 cp -r ${LIB_DIR}/libexpat.dylib  ${BUNDLE_DIR}/lib
 cp -r ${LIB_DIR}/libgdal.1.dylib  ${BUNDLE_DIR}/lib
@@ -22,14 +23,14 @@ ln -s libgslcblas.dylib libgslcblas.0.dylib
 #ln -s libsqlite3.0.dylib libsqlite3.dylib
 popd
 
-
+set -x
 install_name_tool -change ${LIB_DIR}/libgdal.1.dylib \
                    @executable_path/lib/libgdal.1.dylib \
                    ${BUNDLE_DIR}/qgis
 install_name_tool -change ${LIB_DIR}/libproj.dylib \
                    @executable_path/lib/libproj.dylib \
                    ${BUNDLE_DIR}/qgis
-
+set +x
 
 LIBS="lib/libqgis_core.dylib \
       lib/libqgis_gui.dylib \
@@ -106,3 +107,21 @@ do
   #echo "----------------------------------"
 done
 
+#
+# Strip binaries - disable for debugging
+#
+#pushd .
+#cd ${APP_PREFIX}
+#for FILE in `find . -name *.dylib`; do echo "Stripping $FILE"; strip -x $FILE;  done 
+#for FILE in `find . -name *.so`; do echo "Stripping $FILE"; strip -x $FILE;  done
+#strip -x ${APP_PREFIX}/Contents/MacOS/qgis
+#popd
+
+#
+# Install GDAL and Proj support files
+# 
+cp -r ${DEPS_BASE}/share/proj ${APP_PREFIX}/Contents/MacOS/share/
+cp -r ${DEPS_BASE}/share/*.wkt ${APP_PREFIX}/Contents/MacOS/share/
+cp -r ${DEPS_BASE}/share/*.csv ${APP_PREFIX}/Contents/MacOS/share/
+cp -r ${DEPS_BASE}/share/*.dgn ${APP_PREFIX}/Contents/MacOS/share/
+
diff --git a/mac/2-release-extra-qt.sh b/mac/2-release-extra-qt.sh
@@ -13,7 +13,7 @@ cd $FRAMEWORKPREFIX
 # Edit version when any library is upgraded
 UNIVERSAL_LIBS_PREFIX=/usr/local/qgis_universal_deps
 QTPREFIX=${UNIVERSAL_LIBS_PREFIX}/lib
-QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml"
+QTFRAMEWORKS="QtCore QtGui QtNetwork QtSql QtSvg QtXml QtDesigner"
 
 #
 # Copy supporting frameworks to application bundle
@@ -55,7 +55,7 @@ cd $MACOS_PREFIX
 FILES="qgis
   lib/libqgis_core.dylib
   lib/libqgis_gui.dylib
-  lib/libomg_widgets.dylib
+  lib/qgis/libcatalogue.so
   lib/qgis/libcopyrightlabelplugin.so
   lib/qgis/libgpxprovider.so
   lib/qgis/libscalebarplugin.so
@@ -75,7 +75,6 @@ for FILE in ${FILES}
 do
  for FRAMEWORK in QtCore QtGui QtNetwork QtSql QtSvg QtXml
 	do
-    set -x
 		install_name_tool -change ${QTPREFIX}/${FRAMEWORK}.framework/Versions/4/$FRAMEWORK \
 			@executable_path/../Frameworks/$FRAMEWORK.framework/Versions/4/$FRAMEWORK \
 			$MACOS_PREFIX/$FILE
@@ -141,3 +140,16 @@ if test ! -f $LIBSQLITE; then
 fi
 
 popd
+
+#
+# Strip the qt libs
+#
+
+strip -x ${FRAMEWORKPREFIX}/QtGui.framework/Versions/4/QtGui 
+strip -x ${FRAMEWORKPREFIX}/QtCore.framework/Versions/4/QtCore 
+strip -x ${FRAMEWORKPREFIX}/Qt3Support.framework/Versions/4/Qt3Support 
+strip -x ${FRAMEWORKPREFIX}/QtSql.framework/Versions/4/QtSql 
+strip -x ${FRAMEWORKPREFIX}/QtSvg.framework/Versions/4/QtSvg 
+strip -x ${FRAMEWORKPREFIX}/QtXml.framework/Versions/4/QtXml 
+strip -x ${FRAMEWORKPREFIX}/QtNetwork.framework/Versions/4/QtNetwork 
+strip -x ${FRAMEWORKPREFIX}/QtDesigner.framework/Versions/4/QtDesigner