liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5347 from Benitoite/patch-15

Browse Source 
Mac bundle: update to libomp
This commit is contained in:
Ingo Weyrich 2019-06-07 12:38:58 +02:00 committed by GitHub
commit d1e6c57885
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/osx/macosx_bundle.sh
View File

@ -165,11 +165,8 @@ cp /opt/local/share/lensfun/version_2/* "${RESOURCES}/share/lensfun"
# Copy liblensfun to Frameworks # Copy liblensfun to Frameworks
cp /opt/local/lib/liblensfun.2.dylib "${RESOURCES}/../Frameworks" cp /opt/local/lib/liblensfun.2.dylib "${RESOURCES}/../Frameworks"
# Copy libiomp5 to Frameworks # Copy libomp to Frameworks
cp /opt/local/lib/libomp/libiomp5.dylib "${RESOURCES}/../Frameworks" cp /opt/local/lib/libomp.dylib "${RESOURCES}/../Frameworks"
# Copy the libiomp5 license into the app bundle
cp "${PROJECT_SOURCE_DIR}/licenses/osx_libiomp5_LICENSE.txt" "${RESOURCES}"
# Install names # Install names
find -E "${CONTENTS}" -type f -regex '.*/(rawtherapee-cli|rawtherapee|.*\.(dylib|so))' | while read -r x; do find -E "${CONTENTS}" -type f -regex '.*/(rawtherapee-cli|rawtherapee|.*\.(dylib|so))' | while read -r x; do
@ -207,7 +204,7 @@ plutil -convert binary1 "${CONTENTS}/Info.plist"
# Sign the app # Sign the app
CODESIGNID="$(cmake .. -LA -N | grep "CODESIGNID" | cut -d "=" -f2)" CODESIGNID="$(cmake .. -LA -N | grep "CODESIGNID" | cut -d "=" -f2)"
codesign --deep --force -v -s "${CODESIGNID}" "${APP}" codesign --deep --force -v -s "${CODESIGNID}" --timestamp "${APP}"
spctl -a -vvvv "${APP}" spctl -a -vvvv "${APP}"
function CreateDmg { function CreateDmg {
@ -237,7 +234,7 @@ function CreateDmg {
hdiutil create -format UDBZ -fs HFS+ -srcdir "${srcDir}" -volname "${PROJECT_NAME}_${PROJECT_FULL_VERSION}" "${dmg_name}.dmg" hdiutil create -format UDBZ -fs HFS+ -srcdir "${srcDir}" -volname "${PROJECT_NAME}_${PROJECT_FULL_VERSION}" "${dmg_name}.dmg"
# Sign disk image # Sign disk image
codesign --deep --force -v -s "${CODESIGNID}" "${dmg_name}.dmg" codesign --deep --force -v -s "${CODESIGNID}" --timestamp "${dmg_name}.dmg"
# Zip disk image for redistribution # Zip disk image for redistribution
zip "${dmg_name}.zip" "${dmg_name}.dmg" AboutThisBuild.txt zip "${dmg_name}.zip" "${dmg_name}.dmg" AboutThisBuild.txt