razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Merge pull request #1208 from manongjohn/fix_macos_lib_path_reference

Browse source 
Fix macos library path reference
This commit is contained in:
manongjohn 2023-09-01 00:38:49 -04:00 committed by GitHub
parent 85bf1c6468 b7b01c7c85
commit b6069da562
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ci-scripts/osx/tahoma-buildpkg.sh
View file

@ -80,6 +80,17 @@ $QTDIR/bin/macdeployqt $TOONZDIR/Tahoma2D.app -verbose=0 -always-overwrite -no-s
-executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmcontroller \
-executable=$TOONZDIR/Tahoma2D.app/Contents/MacOS/tfarmserver
echo ">>> Copying missing Qt frameworks"
cp -r $QTDIR/Frameworks/QtDBus.framework $TOONZDIR/Tahoma2D.app/Contents/Frameworks
cp -r $QTDIR/Frameworks/QtPdf.framework $TOONZDIR/Tahoma2D.app/Contents/Frameworks
cp -r $QTDIR/Frameworks/QtQml.framework $TOONZDIR/Tahoma2D.app/Contents/Frameworks
cp -r $QTDIR/Frameworks/QtQmlModels.framework $TOONZDIR/Tahoma2D.app/Contents/Frameworks
cp -r $QTDIR/Frameworks/QtQuick.framework $TOONZDIR/Tahoma2D.app/Contents/Frameworks
cp -r $QTDIR/Frameworks/QtVirtualKeyboard.framework $TOONZDIR/Tahoma2D.app/Contents/Frameworks
echo ">>> Adding Contents/lib symbolic link to Frameworks"
ln -s Frameworks $TOONZDIR/Tahoma2D.app/Contents/lib
echo ">>> Correcting library paths"
function checkLibFile() {
local LIBFILE=$1
@ -93,11 +104,15 @@ function checkLibFile() {
if [ ! -f $TOONZDIR/Tahoma2D.app/Contents/Frameworks/$Y ]
then
local SRC=$DEPFILE
local Z=`echo $DEPFILE | cut -c 1-24`
if [ "$Z" = "@loader_path/../../../.." ]
local Z=`echo $DEPFILE | cut -c 1-16`
local Z2=`echo $DEPFILE | cut -c 1-6`
if [ "$Z" = "@loader_path/../" ]
then
local V=`echo $DEPFILE | cut -c 26-`
local V=`echo $DEPFILE | sed -e"s/^.*\/\.\.\///"`
local SRC=/usr/local/$V
elif [ "$Z2" = "@rpath" ]
then
local SRC=/usr/local/lib/$Y
fi
echo "Copying $SRC to Frameworks"
cp $SRC $TOONZDIR/Tahoma2D.app/Contents/Frameworks