IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-24 07:16:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the Mac Appbundle builds properly with QtWebEngine.

Browse Source
This commit is contained in:
Dave Page 2016-11-17 16:22:45 +00:00
parent bfbafaac4b
commit 8e60f33e65
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/mac/Info.plist-template_Qt5
View File

@ -15,7 +15,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>__FRAMEWORK_NAME__</string> <string>__FRAMEWORK_NAME__</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.qt-project.__FRAMEWORK_NAME__</string> <string>org.qt-project.Qt.__FRAMEWORK_NAME__</string>
<key>NOTE</key> <key>NOTE</key>
<string>Please, do NOT change this file -- It was generated by Qt/QMake.</string> <string>Please, do NOT change this file -- It was generated by Qt/QMake.</string>
</dict> </dict>

2
pkg/mac/codesign-bundle.sh
View File

@ -24,7 +24,9 @@ find "${BUNDLE}/Contents/Frameworks"/*framework -type d -name "Versions" | while
ln -s $VERSION_NUMBER Current ln -s $VERSION_NUMBER Current
# Create "Resources" subdirectory # Create "Resources" subdirectory
if [ ! -d Current/Resources ]; then
mkdir Current/Resources mkdir Current/Resources
fi
cd "${MYDIR}" cd "${MYDIR}"
done done

8
pkg/mac/complete-bundle.sh
View File

@ -84,7 +84,15 @@ function CompleteSingleApp() {
# Copy the QT and Python framework # Copy the QT and Python framework
if echo $lib | grep Qt > /dev/null ; then if echo $lib | grep Qt > /dev/null ; then
test -d $lib_loc || mkdir -p $lib_loc test -d $lib_loc || mkdir -p $lib_loc
echo Copying -R $QTDIR/lib/$qtfw_path/$lib_bn to $lib_loc/
cp $QTDIR/lib/$qtfw_path/$lib_bn $lib_loc/ cp $QTDIR/lib/$qtfw_path/$lib_bn $lib_loc/
if [ "$lib_bn" = "QtWebEngineCore" ]; then
# QtWebEngineCore has some required resources
cp -R $QTDIR/lib/$qtfw_path/Resources $lib_loc/
cp -R $QTDIR/lib/$qtfw_path/Helpers $lib_loc/
ln -s Versions/Current/Helpers "$bundle/Contents/Frameworks/QtWebEngineCore.Framework/Helpers"
fi
elif echo $lib | grep Python > /dev/null ; then elif echo $lib | grep Python > /dev/null ; then
test -d $lib_loc || mkdir -p $lib_loc test -d $lib_loc || mkdir -p $lib_loc
cp -R "$lib" "$lib_loc/$lib_bn" cp -R "$lib" "$lib_loc/$lib_bn"