mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-01-23 23:13:38 -06:00
Ensure the Mac Appbundle builds properly with QtWebEngine.
This commit is contained in:
parent
bfbafaac4b
commit
8e60f33e65
@ -15,7 +15,7 @@
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>__FRAMEWORK_NAME__</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.qt-project.__FRAMEWORK_NAME__</string>
|
||||
<string>org.qt-project.Qt.__FRAMEWORK_NAME__</string>
|
||||
<key>NOTE</key>
|
||||
<string>Please, do NOT change this file -- It was generated by Qt/QMake.</string>
|
||||
</dict>
|
||||
|
@ -24,7 +24,9 @@ find "${BUNDLE}/Contents/Frameworks"/*framework -type d -name "Versions" | while
|
||||
ln -s $VERSION_NUMBER Current
|
||||
|
||||
# Create "Resources" subdirectory
|
||||
if [ ! -d Current/Resources ]; then
|
||||
mkdir Current/Resources
|
||||
fi
|
||||
|
||||
cd "${MYDIR}"
|
||||
done
|
||||
|
@ -84,7 +84,15 @@ function CompleteSingleApp() {
|
||||
# Copy the QT and Python framework
|
||||
if echo $lib | grep Qt > /dev/null ; then
|
||||
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/
|
||||
|
||||
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
|
||||
test -d $lib_loc || mkdir -p $lib_loc
|
||||
cp -R "$lib" "$lib_loc/$lib_bn"
|
||||
|
Loading…
Reference in New Issue
Block a user