ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Revised macOS bundle generation script and info (issue #730)

Browse Source
This commit is contained in:
Eberhard Graether
2019-11-17 15:49:19 +01:00
parent 6641c17b93
commit 9b86f0e824
5 changed files with 40 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup/MacOSX/Info.plist.in → setup/macOS/bundle_info.plist.in
+4 -10
View File
@@ -8,26 +8,20 @@
<string>English</string>
<key>CFBundleExecutable</key>
<string>@MACOSX_BINARY_NAME@</string>
<key>CFBundleGetInfoString</key>
<string></string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.sourcetrail</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string></string>
<key>CFBundleName</key>
<string></string>
<string>Sourcetrail</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string></string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>@GIT_VERSION_NUMBER@</string>
<string>@VERSION_STRING@</string>
<key>CFBundleShortVersionString</key>
<string>@VERSION_STRING@</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
setup/MacOSX/bundle_install.sh.in → setup/macOS/bundle_install.sh.in
+12 -16
View File
@@ -9,20 +9,18 @@ cd $MY_PATH
echo -e $INFO "Creating app bundle for macOS."
BUNDLE_NAME="@MACOSX_BUNDLE_NAME@"
APP_NAME="@MACOSX_BINARY_NAME@"
INDEXER_NAME="@MACOSX_INDEXER_BINARY_NAME@"
DYNLIB_PATHS=(@MACOSX_DYNAMIC_LIBRARIES@)
BUNDLE_NAME="@MACOS_BUNDLE_NAME@"
APP_NAME="@MACOS_BINARY_NAME@"
INDEXER_NAME="@MACOS_INDEXER_BINARY_NAME@"
VERSION_STRING=$(git describe --long)
VERSION_STRING="${VERSION_STRING//-/_}"
VERSION_STRING="@MACOS_BUNDLE_VERSION@"
VERSION_STRING="${VERSION_STRING//./_}"
VERSION_STRING="${VERSION_STRING%_*}"
PACKAGE_DIR=${BUNDLE_NAME}_${VERSION_STRING}
QT_DIR="@MACOSX_QT_DIR@"
QT_FRAMEWORK_PATHS=(@MACOSX_QT_FRAMEWORKS@)
BOOST_DIR="@MACOS_BOOST_DIR@"
CLANG_DIR="@MACOS_CLANG_DIR@"
QT_DIR="@MACOS_QT_DIR@"
QT_FRAMEWORK_PATHS=(@MACOS_QT_FRAMEWORKS@)
if [ ! -x "$APP_NAME" ]
then
@@ -89,15 +87,13 @@ $QT_DIR/bin/macdeployqt $BUNDLE_PATH
echo -e $INFO "edit qt.conf"
sed -i '' -e 's/PlugIns/Plugins/g' $RES_DIR/qt.conf
install_name_tool -delete_rpath "/Users/ebsi/Documents/clang-llvm/build_release/./lib" $APP_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/clang-llvm/build_release/lib" $APP_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/boost_1_68_0/stage/lib" $APP_PATH
install_name_tool -delete_rpath "$CLANG_DIR/./lib" $APP_PATH
install_name_tool -delete_rpath "$BOOST_DIR/stage/lib" $APP_PATH
install_name_tool -delete_rpath "@executable_path/../Frameworks" $APP_PATH
install_name_tool -add_rpath "@loader_path/../Frameworks" $APP_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/clang-llvm/build_release/./lib" $INDEXER_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/clang-llvm/build_release/lib" $INDEXER_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/boost_1_68_0/stage/lib" $INDEXER_PATH
install_name_tool -delete_rpath "$CLANG_DIR/./lib" $INDEXER_PATH
install_name_tool -delete_rpath "$BOOST_DIR/stage/lib" $INDEXER_PATH
install_name_tool -delete_rpath "$QT_DIR/lib" $INDEXER_PATH
install_name_tool -add_rpath "@loader_path/../Frameworks" $INDEXER_PATH