diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2016-06-13 18:42:57 -0400 |
| commit | 65d5f68cc6dc81799c5a5d90400a2c1f0dd02547 (patch) | |
| tree | 6f245ba901b87ef42fed69965aea22f5eea6b590 /SQLiteStudio3/create_macosx_bundle.sh | |
| parent | aeb6bad01630d325a4e768e798a7a6d44e18fdaf (diff) | |
| parent | 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f (diff) | |
Merge tag 'upstream/3.1.0'
Upstream version 3.1.0
# gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'SQLiteStudio3/create_macosx_bundle.sh')
| -rwxr-xr-x | SQLiteStudio3/create_macosx_bundle.sh | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/SQLiteStudio3/create_macosx_bundle.sh b/SQLiteStudio3/create_macosx_bundle.sh index d3ce15b..51b563a 100755 --- a/SQLiteStudio3/create_macosx_bundle.sh +++ b/SQLiteStudio3/create_macosx_bundle.sh @@ -15,7 +15,7 @@ if [ "$#" -eq 3 ] && [ "$3" != "dmg" ] && [ "$3" != "dist" ] && [ "$3" != "dist_ fi qt_deploy_bin="${2/qmake/macdeployqt}" -$qt_deploy_bin -v >/dev/null 2>&1 +ls $qt_deploy_bin >/dev/null 2>&1 if [ "$?" -ne 0 ]; then echo "macdeployqt program missing!" exit 1 @@ -35,20 +35,37 @@ mv SQLiteStudio.app/Contents/plugins SQLiteStudio.app/Contents/PlugIns cp -RP lib*SQLiteStudio*.dylib SQLiteStudio.app/Contents/Frameworks +# CLI paths qtcore_path=`otool -L sqlitestudiocli | grep QtCore | awk '{print $1;}'` -new_qtcore_path="@loader_path/../Frameworks/QtCore.framework/Versions/5/QtCore" +new_qtcore_path="@rpath/QtCore.framework/Versions/5/QtCore" cp -P sqlitestudiocli SQLiteStudio.app/Contents/MacOS -install_name_tool -change libcoreSQLiteStudio.1.dylib "@loader_path/../Frameworks/libcoreSQLiteStudio.1.dylib" SQLiteStudio.app/Contents/MacOS/sqlitestudiocli +install_name_tool -change libcoreSQLiteStudio.1.dylib "@rpath/libcoreSQLiteStudio.1.dylib" SQLiteStudio.app/Contents/MacOS/sqlitestudiocli install_name_tool -change $qtcore_path $new_qtcore_path SQLiteStudio.app/Contents/MacOS/sqlitestudiocli +# SQLiteStudio binary paths +install_name_tool -change libcoreSQLiteStudio.1.dylib "@rpath/libcoreSQLiteStudio.1.dylib" SQLiteStudio.app/Contents/MacOS/SQLiteStudio +install_name_tool -change libguiSQLiteStudio.1.dylib "@rpath/libguiSQLiteStudio.1.dylib" SQLiteStudio.app/Contents/MacOS/SQLiteStudio + +# Lib paths +install_name_tool -change libcoreSQLiteStudio.1.dylib "@rpath/libcoreSQLiteStudio.1.dylib" SQLiteStudio.app/Contents/Frameworks/libguiSQLiteStudio.1.dylib + cp -RP ../../../lib/*.dylib SQLiteStudio.app/Contents/Frameworks +# Plugin paths +for f in `ls SQLiteStudio.app/Contents/PlugIns` +do + PLUGIN_FILE=SQLiteStudio.app/Contents/PlugIns/$f + install_name_tool -change libcoreSQLiteStudio.1.dylib "@rpath/libcoreSQLiteStudio.1.dylib" $PLUGIN_FILE + install_name_tool -change libguiSQLiteStudio.1.dylib "@rpath/libguiSQLiteStudio.1.dylib" $PLUGIN_FILE +done + + if [ "$3" == "dmg" ]; then $qt_deploy_bin SQLiteStudio.app -dmg elif [ "$3" == "dist" ] || [ "$3" == "dist_plugins" ] || [ "$3" == "dist_full" ]; then if [ "$3" == "dist" ] || [ "$3" == "dist_full" ]; then - $qt_deploy_bin SQLiteStudio.app -dmg + $qt_deploy_bin SQLiteStudio.app -dmg -executable=SQLiteStudio.app/Contents/MacOS/SQLiteStudio -always-overwrite -verbose=3 2> /tmp/log.txt cd $1/SQLiteStudio VERSION=`SQLiteStudio.app/Contents/MacOS/sqlitestudiocli -v | awk '{print $2}'` @@ -75,11 +92,12 @@ elif [ "$3" == "dist" ] || [ "$3" == "dist_plugins" ] || [ "$3" == "dist_full" ] # Plugins mkdir Contents Contents/PlugIns - SQLiteStudio.app/Contents/MacOS/sqlitestudio --list-plugins | while read line + SQLiteStudio.app/Contents/MacOS/SQLiteStudio --list-plugins | while read line do PLUGIN=`echo $line | awk '{print $1}'` PLUGIN_VER=`echo $line | awk '{print $2}'` - if [ -f SQLiteStudio.app/Contents/PlugIns/lib$PLUGIN.dylib ]; then + PLUGIN_FILE=SQLiteStudio.app/Contents/PlugIns/lib$PLUGIN.dylib + if [ -f $PLUGIN_FILE ]; then echo "Building plugin package: $PLUGIN-$PLUGIN_VER.tar.gz" cp SQLiteStudio.app/Contents/PlugIns/lib$PLUGIN.dylib Contents/PlugIns zip -r $PLUGIN\-$PLUGIN_VER.zip Contents @@ -91,3 +109,4 @@ elif [ "$3" == "dist" ] || [ "$3" == "dist_plugins" ] || [ "$3" == "dist_full" ] else $qt_deploy_bin SQLiteStudio.app fi + |