mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-03 04:00:55 -06:00
Ensure the Mac Appbundle builds properly with QtWebEngine.
This commit is contained in:
parent
bfbafaac4b
commit
8e60f33e65
@ -1,22 +1,22 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
<plist version="1.0">
|
<plist version="1.0">
|
||||||
<dict>
|
<dict>
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>FMWK</string>
|
<string>FMWK</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>__SHORT_VERSION__</string>
|
<string>__SHORT_VERSION__</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>__FULL_VERSION__</string>
|
<string>__FULL_VERSION__</string>
|
||||||
<key>CFBundleGetInfoString</key>
|
<key>CFBundleGetInfoString</key>
|
||||||
<string>Created by Qt/QMake</string>
|
<string>Created by Qt/QMake</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<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>
|
||||||
</plist>
|
</plist>
|
||||||
|
@ -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
|
||||||
mkdir Current/Resources
|
if [ ! -d Current/Resources ]; then
|
||||||
|
mkdir Current/Resources
|
||||||
|
fi
|
||||||
|
|
||||||
cd "${MYDIR}"
|
cd "${MYDIR}"
|
||||||
done
|
done
|
||||||
|
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user