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

macOS: use $LOCAL_PREFIX for gtk locations

Browse Source
This commit is contained in:
Benitoite 2020-01-04 08:57:06 -08:00 committed by GitHub
parent f23cf0808b
commit f3d4d8027b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/osx/macosx_bundle.sh
View File

@ -92,6 +92,8 @@ GTK_PREFIX: ${GTK_PREFIX}
PWD: ${PWD} PWD: ${PWD}
__EOS__ __EOS__
LOCAL_PREFIX="$(cmake .. -LA -N | grep "LOCAL_PREFIX" | cut -d "=" -f2)"
APP="${PROJECT_NAME}.app" APP="${PROJECT_NAME}.app"
CONTENTS="${APP}/Contents" CONTENTS="${APP}/Contents"
RESOURCES="${CONTENTS}/Resources" RESOURCES="${CONTENTS}/Resources"
@ -99,7 +101,7 @@ MACOS="${CONTENTS}/MacOS"
LIB="${CONTENTS}/Frameworks" LIB="${CONTENTS}/Frameworks"
ETC="${RESOURCES}/etc" ETC="${RESOURCES}/etc"
EXECUTABLE="${MACOS}/rawtherapee" EXECUTABLE="${MACOS}/rawtherapee"
GDK_PREFIX="/usr/local/opt/gdk-pixbuf" GDK_PREFIX="${LOCAL_PREFIX}/opt/gdk-pixbuf"
msg "Removing old files:" msg "Removing old files:"
rm -rf "${APP}" "${PROJECT_NAME}_*.dmg" "*zip" rm -rf "${APP}" "${PROJECT_NAME}_*.dmg" "*zip"
@ -141,45 +143,45 @@ rm -r "${LIB}"/gdk-pixbuf-2.0
sed -i "" -e "s|${PWD}/RawTherapee.app/Contents/|/Applications/RawTherapee.app/Contents/|" "${ETC}/gtk-3.0/gdk-pixbuf.loaders" "${ETC}/gtk-3.0/gtk.immodules" sed -i "" -e "s|${PWD}/RawTherapee.app/Contents/|/Applications/RawTherapee.app/Contents/|" "${ETC}/gtk-3.0/gdk-pixbuf.loaders" "${ETC}/gtk-3.0/gtk.immodules"
mkdir -p ${RESOURCES}/share/glib-2.0 mkdir -p ${RESOURCES}/share/glib-2.0
cp -pRL {"/usr/local","${RESOURCES}"}/share/glib-2.0/schemas cp -pRL {"${LOCAL_PREFIX}","${RESOURCES}"}/share/glib-2.0/schemas
"/usr/local/bin/glib-compile-schemas" "${RESOURCES}/share/glib-2.0/schemas" "${LOCAL_PREFIX}/bin/glib-compile-schemas" "${RESOURCES}/share/glib-2.0/schemas"
msg "Copying shared files from ${GTK_PREFIX}:" msg "Copying shared files from ${GTK_PREFIX}:"
cp -pRL {"/usr/local","${RESOURCES}"}/share/mime cp -pRL {"${LOCAL_PREFIX}","${RESOURCES}"}/share/mime
# GTK3 themes # GTK3 themes
ditto {"/usr/local","${RESOURCES}"}/share/themes/Mac/gtk-3.0/gtk-keys.css ditto {"${LOCAL_PREFIX}","${RESOURCES}"}/share/themes/Mac/gtk-3.0/gtk-keys.css
ditto {"/usr/local","${RESOURCES}"}/share/themes/Default/gtk-3.0/gtk-keys.css ditto {"${LOCAL_PREFIX}","${RESOURCES}"}/share/themes/Default/gtk-3.0/gtk-keys.css
# Adwaita icons # Adwaita icons
iconfolders=("16x16/actions" "16x16/devices" "16x16/mimetypes" "16x16/places" "16x16/status" "48x48/devices") iconfolders=("16x16/actions" "16x16/devices" "16x16/mimetypes" "16x16/places" "16x16/status" "48x48/devices")
for f in "${iconfolders[@]}"; do for f in "${iconfolders[@]}"; do
mkdir -p ${RESOURCES}/share/icons/Adwaita/${f} mkdir -p ${RESOURCES}/share/icons/Adwaita/${f}
cp /usr/local/share/icons/Adwaita/${f}/* "${RESOURCES}"/share/icons/Adwaita/${f} cp ${LOCAL_PREFIX}/share/icons/Adwaita/${f}/* "${RESOURCES}"/share/icons/Adwaita/${f}
done done
ditto {"/usr/local","${RESOURCES}"}/share/icons/Adwaita/index.theme ditto {"${LOCAL_PREFIX}","${RESOURCES}"}/share/icons/Adwaita/index.theme
"/usr/local/bin/gtk-update-icon-cache" "${RESOURCES}/share/icons/Adwaita" "${LOCAL_PREFIX}/bin/gtk-update-icon-cache" "${RESOURCES}/share/icons/Adwaita"
# Copy libjpeg-turbo into the app bundle # Copy libjpeg-turbo into the app bundle
cp /usr/local/lib/libjpeg.*.dylib "${CONTENTS}/Frameworks" cp ${LOCAL_PREFIX}/lib/libjpeg.*.dylib "${CONTENTS}/Frameworks"
# Copy libexpat into the app bundle (which is keg-only) # Copy libexpat into the app bundle (which is keg-only)
cp /usr/local/Cellar/expat/*/lib/libexpat.1.dylib "${CONTENTS}/Frameworks" #cp ${LOCAL_PREFIX}/Cellar/expat/*/lib/libexpat.1.dylib "${CONTENTS}/Frameworks"
# Copy libz into the app bundle # Copy libz into the app bundle
cp /usr/lib/libz.1.dylib "${CONTENTS}/Frameworks" cp /usr/lib/libz.1.dylib "${CONTENTS}/Frameworks"
# Copy libtiff into the app bundle # Copy libtiff into the app bundle
cp /usr/local/lib/libtiff.5.dylib "${CONTENTS}/Frameworks" cp ${LOCAL_PREFIX}/lib/libtiff.5.dylib "${CONTENTS}/Frameworks"
# Copy the Lensfun database into the app bundle # Copy the Lensfun database into the app bundle
mkdir -p "${RESOURCES}/share/lensfun" mkdir -p "${RESOURCES}/share/lensfun"
cp /usr/local/share/lensfun/version_2/* "${RESOURCES}/share/lensfun" cp ${LOCAL_PREFIX}/share/lensfun/version_2/* "${RESOURCES}/share/lensfun"
# Copy liblensfun to Frameworks # Copy liblensfun to Frameworks
cp /usr/local/lib/liblensfun.2.dylib "${CONTENTS}/Frameworks" cp ${LOCAL_PREFIX}/lib/liblensfun.2.dylib "${CONTENTS}/Frameworks"
# Copy libomp to Frameworks # Copy libomp to Frameworks
cp /usr/local/lib/libomp.dylib "${CONTENTS}/Frameworks" cp ${LOCAL_PREFIX}/lib/libomp.dylib "${CONTENTS}/Frameworks"
# 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