diff --git a/CMakeLists.txt b/CMakeLists.txt index 68eeccd5f..2e6cf0b30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,7 +175,7 @@ if(APPLE) # TODO make -mtune generic conditional and/or specifiable. if(CMAKE_CXX_COMPILER MATCHES "g\\+\\+-mp-4.[5-8]" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "g\\+\\+-mp-4.[5-8]") set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} /usr/lib/libstdc++.6.dylib -Wl,-headerpad_max_install_names -mtune=generic" + "${CMAKE_EXE_LINKER_FLAGS} /usr/lib/libstdc++.6.dylib -Wl,-headerpad_max_install_names -mtune=generic -framework Foundation" ) message( STATUS @@ -190,7 +190,7 @@ if(APPLE) # TODO make -mtune generic conditional and/or specifiable. set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} -Wl,-headerpad_max_install_names -mtune=generic" + "${CMAKE_EXE_LINKER_FLAGS} -Wl,-headerpad_max_install_names -mtune=generic -framework Foundation" ) endif() @@ -304,7 +304,7 @@ endif() if(NOT DEFINED CREDITSDIR) if(BUILD_BUNDLE) if(APPLE) - set(CREDITSDIR "${DATADIR}") + set(CREDITSDIR "${DATADIR}/..") else() set(CREDITSDIR "${DATADIR}") endif() @@ -371,6 +371,8 @@ if(NOT APPLE) if(DEFINED LENSFUNDBDIR AND NOT IS_ABSOLUTE "${LENSFUNDBDIR}") set(LENSFUNDBDIR "${DATADIR}/${LENSFUNDBDIR}") endif() +else() + set(LENSFUNDBDIR "${LENSFUNDBDIR}") endif() if(APPLE) @@ -387,11 +389,11 @@ if(APPLE) if("${LOCAL_PREFIX}") set(LOCAL_PREFIX "${LOCAL_PREFIX}" - CACHE STRING "macos/gtk parent directory ie /usr or /opt") + CACHE STRING "macos/gtk parent directory ie /usr/local or /opt/local or /opt/homebrew (for arm64)") else() set(LOCAL_PREFIX - /usr - CACHE STRING "macos/gtk parent directory ie /usr or /opt") + /usr/local + CACHE STRING "macos/gtk parent directory ie /usr/local (default) or /opt/local (macports) or /opt/homebrew (for arm64)") endif() if("${FANCY_DMG}") set(FANCY_DMG @@ -686,11 +688,18 @@ elseif(APPLE) ${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR:STRING=${PROJECT_SOURCE_DIR} -DCACHE_NAME_SUFFIX:STRING=${CACHE_NAME_SUFFIX} - -P ${PROJECT_SOURCE_DIR}/UpdateInfo.cmake -DSYSTEM:STRING=Apple -DCXX_FLAGS:STRING=${CXX_FLAGS} -DLFLAGS:STRING=${LFLAGS} - -DCOMPILER_INFO:STRING=${COMPILER_INFO}) + -DCOMPILER_INFO:STRING=${COMPILER_INFO} + -DPROC_LABEL:STRING="${PROC_LABEL}" + -DPROC_BIT_DEPTH:STRING="${PROC_BIT_DEPTH}" + -DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} + -DGTKMM_VERSION:STRING=${GTKMM_VERSION} + -DOPTION_OMP:STRING=${OPTION_OMP} + -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP} + -DLENSFUN_VERSION:STRING=${LENSFUN_VERSION} + -P ${PROJECT_SOURCE_DIR}/UpdateInfo.cmake) else() list(APPEND ABOUT_COMMAND_WITH_ARGS -DSYSTEM:STRING=Linux -DCXX_FLAGS:STRING=${CXX_FLAGS} -DLFLAGS:STRING=${LFLAGS} diff --git a/rtgui/multilangmgr.cc b/rtgui/multilangmgr.cc index ecf744519..57d1eff5f 100644 --- a/rtgui/multilangmgr.cc +++ b/rtgui/multilangmgr.cc @@ -24,6 +24,9 @@ #include #include #endif +#ifdef __APPLE__ +#include +#endif namespace { @@ -122,6 +125,20 @@ void setGtkLanguage(const Glib::ustring &language) { if(language != "default") { // nothing to change when using default std::string lang = localeToLang.getLocale(language); +#ifdef __APPLE__ + + // On MacOS, LANG environment variable is not defined when running app bundle + // So we should set all locale data + const Glib::ustring localeUTF8 = lang + ".UTF-8"; + + lang = lang + ".UTF-8"; // According to Apple documentation, UTF-8 is a built-in encoding on all platforms on which macOS runs + + g_setenv("LANG", lang.c_str(), true); + setlocale(LC_ALL, lang.c_str()); + setlocale (LC_NUMERIC, "C"); // Force decimal point to dot. + +#else + const gchar *env_langc = g_getenv("LANG"); if(env_langc) { const std::string env_lang(env_langc); @@ -134,6 +151,8 @@ void setGtkLanguage(const Glib::ustring &language) } g_setenv("LANG", lang.c_str(), true); + +#endif } } @@ -228,7 +247,7 @@ Glib::ustring MultiLangMgr::getOSUserLanguage () langName = localeToLang (localeName); -#elif defined (__linux__) || defined (__APPLE__) +#elif defined (__linux__) // Query the current locale and force decimal point to dot. const char *locale = getenv("LANG"); @@ -238,6 +257,51 @@ Glib::ustring MultiLangMgr::getOSUserLanguage () setlocale (LC_NUMERIC, "C"); +#elif defined (__APPLE__) + + // "LANG" environment variable is not defined. Retrieving it from CoreFundation API + // Get used Mac string encoding + CFStringEncoding strEncoding = CFStringGetSystemEncoding(); + // Get user locale data + CFLocaleRef cfLocale = CFLocaleCopyCurrent(); + // Get locale language code + CFStringRef langCodeStr = (CFStringRef)CFLocaleGetValue(cfLocale, kCFLocaleLanguageCode); + Glib::ustring langCode(""); + + if (langCodeStr != NULL) { + const auto langCodeStrLength = CFStringGetLength(langCodeStr) + 1; + char langCodeBuffer[langCodeStrLength]; + CFStringGetCString(langCodeStr, langCodeBuffer, langCodeStrLength, strEncoding); + langCode = Glib::ustring(langCodeBuffer); + } + + // Get locale country code + CFStringRef countryCodeStr = (CFStringRef)CFLocaleGetValue(cfLocale, kCFLocaleCountryCode); + Glib::ustring countryCode(""); + + if (countryCodeStr != NULL) { + const auto countryCodeStrLength = CFStringGetLength(countryCodeStr) + 1; + char countryCodeBuffer[countryCodeStrLength]; + CFStringGetCString(countryCodeStr, countryCodeBuffer, countryCodeStrLength, strEncoding); + countryCode = Glib::ustring(countryCodeBuffer); + } + + // Concatenate locale data + Glib::ustring locale = langCode + "_" + countryCode; + + // Release user locale data + CFRelease(cfLocale); + CFRelease(langCodeStr); + CFRelease(countryCodeStr); + + // Set locale environment data + locale = locale + ".UTF-8"; // According to Apple documentation, UTF-8 is a built-in encoding on all platforms on which macOS runs + g_setenv("LANG", locale.c_str(), true); + setlocale(LC_ALL, locale.c_str()); + setlocale (LC_NUMERIC, "C"); // Force decimal point to dot. + + langName = localeToLang(locale); + #endif return langName; diff --git a/tools/osx/INSTALL.readme.rtf b/tools/osx/INSTALL.readme.rtf new file mode 100644 index 000000000..799ff5bd7 --- /dev/null +++ b/tools/osx/INSTALL.readme.rtf @@ -0,0 +1,3 @@ +An unsigned -cli is in the zip along with the .dmg. +You must install the app from the .dmg into /Applications and copy the -cli to your /usr/local/bin. +The -cli will load its libraries dynamically from the app in /Applications. diff --git a/tools/osx/Info.plist.in b/tools/osx/Info.plist.in index 6970ed4da..d1582a4f1 100644 --- a/tools/osx/Info.plist.in +++ b/tools/osx/Info.plist.in @@ -5,14 +5,10 @@ XDG_DATA_DIRS /Applications/RawTherapee.app/Contents/Resources/share - DYLD_FALLBACK_LIBRARY_PATH - /Applications/RawTherapee.app/Contents/Frameworks GTK_PATH /Applications/RawTherapee.app/Contents/Frameworks GTK_IM_MODULE_FILE /Applications/RawTherapee.app/Contents/Resources/etc/gtk-3.0/gtk.immodules - GTK_MODULES - /Applications/RawTherapee.app/Contents/Frameworks/im-quartz.so XDG_DATA_HOME /Applications/RawTherapee.app/Contents/Resources/share GSETTINGS_SCHEMA_DIR @@ -21,8 +17,6 @@ /Applications/RawTherapee.app/Contents/Resources/etc/gtk-3.0/gdk-pixbuf.loaders GDK_PIXBUF_MODULEDIR /Applications/RawTherapee.app/Contents/Frameworks - FONTCONFIG_PATH - /Applications/RawTherapee.app/Contents/Resources/etc/fonts LIBDIR /Applications/RawTherapee.app/Contents/Frameworks DATADIR @@ -31,17 +25,13 @@ similar GTK_OVERLAY_SCROLLING 0 - GDK_NATIVE_WINDOWS - 1 - ATSApplicationFontsPath - etc/fonts LSMultipleInstancesProhibited LSMinimumSystemVersion @minimum_macos_version@ - CFBundleDevelopmentRegion - English + CFBundleAllowMixedLocalizations + CFBundleDisplayName RawTherapee CFBundleDocumentTypes @@ -202,4 +192,4 @@ - \ No newline at end of file + diff --git a/tools/osx/info-plist.cmake b/tools/osx/info-plist.cmake new file mode 100644 index 000000000..9d64529f3 --- /dev/null +++ b/tools/osx/info-plist.cmake @@ -0,0 +1 @@ +configure_file(${PROJECT_SOURCE_DATA_DIR}/Info.plist.in ${CONTENTS}/Info.plist) diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh index e3dc61857..3fc70223a 100644 --- a/tools/osx/macosx_bundle.sh +++ b/tools/osx/macosx_bundle.sh @@ -138,7 +138,7 @@ MACOS="${CONTENTS}/MacOS" LIB="${CONTENTS}/Frameworks" ETC="${RESOURCES}/etc" EXECUTABLE="${MACOS}/rawtherapee" -GDK_PREFIX="${LOCAL_PREFIX}/local/" +GDK_PREFIX="${LOCAL_PREFIX}/" msg "Removing old files:" rm -rf "${APP}" *.dmg *.zip @@ -153,7 +153,7 @@ msg "Copying binary executable files." ditto "${CMAKE_BUILD_TYPE}/MacOS" "${MACOS}" msg "Copying Resources directory." -cp AboutThisBuild.txt "${RESOURCES}" +#cp AboutThisBuild.txt "${RESOURCES}" ditto "${CMAKE_BUILD_TYPE}/Resources" "${RESOURCES}" echo "\n--------\n" >> "${RESOURCES}/AboutThisBuild.txt" @@ -165,13 +165,19 @@ echo "Bundle UUID: $(uuidgen|tr 'A-Z' 'a-z')" >> "${RESOURCES}/AboutThisBuild. # Copy the Lensfun database into the app bundle mkdir -p "${RESOURCES}/share/lensfun" -ditto ${LOCAL_PREFIX}/local/share/lensfun/version_2/* "${RESOURCES}/share/lensfun" +lensfunversion=$(pkg-config --modversion lensfun | cut -f3 -d'.') +if [ $lensfunversion = 95 ] +then + ditto ${LOCAL_PREFIX}/share/lensfun/version_2/* "${RESOURCES}/share/lensfun" +else + ditto ${LOCAL_PREFIX}/share/lensfun/version_1/* "${RESOURCES}/share/lensfun" +fi # Copy liblensfun to Frameworks -ditto ${LOCAL_PREFIX}/local/lib/liblensfun.2.dylib "${CONTENTS}/Frameworks/liblensfun.2.dylib" +ditto ${LOCAL_PREFIX}/lib/liblensfun.2.dylib "${CONTENTS}/Frameworks/liblensfun.2.dylib" # Copy libomp to Frameworks -ditto ${LOCAL_PREFIX}/local/lib/libomp.dylib "${CONTENTS}/Frameworks" +ditto ${LOCAL_PREFIX}/lib/libomp.dylib "${CONTENTS}/Frameworks" msg "Copying dependencies from ${GTK_PREFIX}." CheckLink "${EXECUTABLE}" @@ -180,101 +186,92 @@ CheckLink "${EXECUTABLE}" ModifyInstallNames # Copy libjpeg-turbo ("62") into the app bundle -ditto ${LOCAL_PREFIX}/local/lib/libjpeg.62.dylib "${CONTENTS}/Frameworks/libjpeg.62.dylib" +ditto ${LOCAL_PREFIX}/lib/libjpeg.62.dylib "${CONTENTS}/Frameworks/libjpeg.62.dylib" # Copy libexpat into the app bundle (which is keg-only) if [[ -d /usr/local/Cellar/expat ]]; then ditto /usr/local/Cellar/expat/*/lib/libexpat.1.dylib "${CONTENTS}/Frameworks"; else ditto "${EXPATLIB}" "${CONTENTS}/Frameworks/libexpat.1.dylib"; fi # Copy libz into the app bundle -ditto ${LOCAL_PREFIX}/local/lib/libz.1.dylib "${CONTENTS}/Frameworks" +ditto ${LOCAL_PREFIX}/lib/libz.1.dylib "${CONTENTS}/Frameworks" -# Copy libpng16 to the app bundle -ditto ${LOCAL_PREFIX}/local/lib/libpng16.16.dylib "${CONTENTS}/Frameworks/libpng16.16.dylib" +# Copy libpng12 & 16 to the app bundle +ditto ${LOCAL_PREFIX}/lib/libpng16.16.dylib "${CONTENTS}/Frameworks/libpng16.16.dylib" +ditto ${LOCAL_PREFIX}/lib/libpng12.0.dylib "${CONTENTS}/Frameworks/libpng12.0.dylib" # Copy libtiff 5 into the app bundle -ditto ${LOCAL_PREFIX}/local/lib/libtiff.5.dylib "${CONTENTS}/Frameworks/libtiff.5.dylib" - -# Copy the Lensfun database into the app bundle -mkdir -p "${RESOURCES}/share/lensfun" -ditto ${LOCAL_PREFIX}/local/share/lensfun/version_2/* "${RESOURCES}/share/lensfun" - -# Copy liblensfun to Frameworks -ditto ${LOCAL_PREFIX}/local/lib/liblensfun.2.dylib "${CONTENTS}/Frameworks/liblensfun.2.dylib" +ditto ${LOCAL_PREFIX}/lib/libtiff.5.dylib "${CONTENTS}/Frameworks/libtiff.5.dylib" # Copy libomp to Frameworks -ditto ${LOCAL_PREFIX}/local/lib/libomp.dylib "${CONTENTS}/Frameworks" +ditto ${LOCAL_PREFIX}/lib/libomp.dylib "${CONTENTS}/Frameworks" # Prepare GTK+3 installation msg "Copying configuration files from ${GTK_PREFIX}:" -install -d "${ETC}/gtk-3.0" +cp -RL {"${GDK_PREFIX}/lib","${LIB}"}/gdk-pixbuf-2.0 msg "Copying library modules from ${GTK_PREFIX}:" -ditto --arch "${arch}" {"${GTK_PREFIX}/lib","${LIB}"}/gdk-pixbuf-2.0 +cp -RL {"${GDK_PREFIX}/lib","${LIB}"}/gdk-pixbuf-2.0 ditto --arch "${arch}" {"${GTK_PREFIX}/lib","${LIB}"}/gtk-3.0 msg "Removing static libraries and cache files:" find -E "${LIB}" -type f -regex '.*\.(a|la|cache)$' | while read -r; do rm "${REPLY}"; done # Make Frameworks folder flat msg "Flattening the Frameworks folder" -ditto "${LIB}"/gdk-pixbuf-2.0/2*/loaders/*.so "${LIB}" -ditto "${LIB}"/gtk-3.0/3*/immodules/*.{dylib,so} "${LIB}" +cp -RL "${LIB}"/gdk-pixbuf-2.0/2*/loaders/* "${LIB}" +cp "${LIB}"/gtk-3.0/3*/immodules/*.{dylib,so} "${LIB}" rm -r "${LIB}"/gtk-3.0 rm -r "${LIB}"/gdk-pixbuf-2.0 # GTK+3 themes msg "Copy GTK+3 theme and icon resources:" -ditto {"${LOCAL_PREFIX}/local","${RESOURCES}"}/share/themes/Mac/gtk-3.0/gtk-keys.css -ditto {"${LOCAL_PREFIX}/local","${RESOURCES}"}/share/themes/Default/gtk-3.0/gtk-keys.css +ditto {"${LOCAL_PREFIX}","${RESOURCES}"}/share/themes/Mac/gtk-3.0/gtk-keys.css +ditto {"${LOCAL_PREFIX}","${RESOURCES}"}/share/themes/Default/gtk-3.0/gtk-keys.css # Adwaita icons msg "Copy 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" "16x16/ui" "48x48/devices") for f in "${iconfolders[@]}"; do mkdir -p ${RESOURCES}/share/icons/Adwaita/${f} - ditto ${LOCAL_PREFIX}/local/share/icons/Adwaita/${f}/* "${RESOURCES}"/share/icons/Adwaita/${f} + cp -RL ${LOCAL_PREFIX}/share/icons/Adwaita/${f}/* "${RESOURCES}"/share/icons/Adwaita/${f} done -ditto {"${LOCAL_PREFIX}/local","${RESOURCES}"}/share/icons/Adwaita/index.theme -"${LOCAL_PREFIX}/local/bin/gtk-update-icon-cache" "${RESOURCES}/share/icons/Adwaita" -ditto "${LOCAL_PREFIX}/local/share/icons/hicolor" "${RESOURCES}/share/icons/hicolor" +cp -RL {"${LOCAL_PREFIX}","${RESOURCES}"}/share/icons/Adwaita/index.theme +"${LOCAL_PREFIX}/bin/gtk-update-icon-cache" "${RESOURCES}/share/icons/Adwaita" || "${LOCAL_PREFIX}/bin/gtk-update-icon-cache-3.0" "${RESOURCES}/share/icons/Adwaita" +cp -RL "${LOCAL_PREFIX}/share/icons/hicolor" "${RESOURCES}/share/icons/hicolor" # fix libfreetype install name for lib in "${LIB}"/*; do install_name_tool -change libfreetype.6.dylib "${LIB}"/libfreetype.6.dylib "${lib}" done -# pixbuf loaders & immodules +# Build GTK3 pixbuf loaders & immodules database msg "Build GTK3 databases:" -"${LOCAL_PREFIX}"/local/bin/gdk-pixbuf-query-loaders "${LIB}"/libpix*.so > "${ETC}"/gtk-3.0/gdk-pixbuf.loaders -"${LOCAL_PREFIX}"/local/bin/gtk-query-immodules-3.0 "${LIB}"/im-* > "${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" -sed -i "" -e "s|/opt/local/|/Applications/RawTherapee.app/Contents/Frameworks/|" "${ETC}/gtk-3.0/gtk.immodules" +"${LOCAL_PREFIX}"/bin/gdk-pixbuf-query-loaders "${LIB}"/libpixbufloader-*.so > "${ETC}"/gtk-3.0/gdk-pixbuf.loaders +"${LOCAL_PREFIX}"/bin/gtk-query-immodules-3.0 "${LIB}"/im-* > "${ETC}"/gtk-3.0/gtk.immodules || "${LOCAL_PREFIX}"/bin/gtk-query-immodules "${LIB}"/im-* > "${ETC}"/gtk-3.0/gtk.immodules +sed -i.bak -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.bak -e "s|${LOCAL_PREFIX}/share/|/Applications/RawTherapee.app/Contents/Resources/share/|" "${ETC}"/gtk-3.0/gtk.immodules +sed -i.bak -e "s|${LOCAL_PREFIX}/|/Applications/RawTherapee.app/Contents/Frameworks/|" "${ETC}"/gtk-3.0/gtk.immodules +rm "${ETC}"/*.bak # Install names ModifyInstallNames # Mime directory msg "Copying shared files from ${GTK_PREFIX}:" -ditto {"${LOCAL_PREFIX}/local","${RESOURCES}"}/share/mime +ditto {"${LOCAL_PREFIX}","${RESOURCES}"}/share/mime msg "Installing required application bundle files:" PROJECT_SOURCE_DATA_DIR="${PROJECT_SOURCE_DIR}/tools/osx" -ditto "${CMAKE_BUILD_TYPE}/Resources" "${RESOURCES}" ditto "${PROJECT_SOURCE_DIR}/rtdata/fonts" "${ETC}/fonts" # App bundle resources ditto "${PROJECT_SOURCE_DATA_DIR}/"{rawtherapee,profile}.icns "${RESOURCES}" ditto "${PROJECT_SOURCE_DATA_DIR}/PkgInfo" "${CONTENTS}" -install -m 0644 "${PROJECT_SOURCE_DATA_DIR}/Info.plist.in" "${CONTENTS}/Info.plist" -install -m 0644 "${PROJECT_SOURCE_DATA_DIR}/cliInfo.plist.in" "${LIB}/Info.plist" -sed -i "" -e "s|@version@|${PROJECT_FULL_VERSION}| -s|@shortVersion@|${PROJECT_VERSION}| -s|@arch@|${arch}|" \ -"${CONTENTS}/Info.plist" +cmake -DPROJECT_SOURCE_DATA_DIR=${PROJECT_SOURCE_DATA_DIR} -DCONTENTS=${CONTENTS} -Dversion=${PROJECT_FULL_VERSION} -DshortVersion=${PROJECT_VERSION} -Darch=${arch} -P "${PROJECT_SOURCE_DATA_DIR}/info-plist.cmake" update-mime-database -V "${RESOURCES}/share/mime" +cp -RL "${LOCAL_PREFIX}/share/locale" "${RESOURCES}/share/locale" msg "Build glib database:" mkdir -p ${RESOURCES}/share/glib-2.0 -ditto {"${LOCAL_PREFIX}/local","${RESOURCES}"}/share/glib-2.0/schemas -"${LOCAL_PREFIX}/local/bin/glib-compile-schemas" "${RESOURCES}/share/glib-2.0/schemas" +cp -LR {"${LOCAL_PREFIX}","${RESOURCES}"}/share/glib-2.0/schemas +"${LOCAL_PREFIX}/bin/glib-compile-schemas" "${RESOURCES}/share/glib-2.0/schemas" # Append an LC_RPATH msg "Registering @rpath into the main executable." @@ -285,7 +282,7 @@ ModifyInstallNames # fix @rpath in Frameworks msg "Registering @rpath in Frameworks folder." for frameworklibs in "${LIB}"/*{dylib,so,cli}; do - install_name_tool -delete_rpath ${LOCAL_PREFIX}/local/lib "${frameworklibs}" + install_name_tool -delete_rpath ${LOCAL_PREFIX}/lib "${frameworklibs}" install_name_tool -add_rpath /Applications/"${LIB}" "${frameworklibs}" done install_name_tool -delete_rpath RawTherapee.app/Contents/Frameworks "${EXECUTABLE}"-cli @@ -296,13 +293,8 @@ ditto "${EXECUTABLE}"-cli "${APP}"/.. if [[ -n $CODESIGNID ]]; then msg "Codesigning Application." iconv -f UTF-8 -t ASCII "${PROJECT_SOURCE_DATA_DIR}"/rt.entitlements > "${CMAKE_BUILD_TYPE}"/rt.entitlements - iconv -f UTF-8 -t ASCII "${PROJECT_SOURCE_DATA_DIR}"/rt-cli.entitlements > "${CMAKE_BUILD_TYPE}"/rt-cli.entitlements mv "${EXECUTABLE}"-cli "${LIB}" - for frameworklibs in "${LIB}"/*{dylib,so}; do - codesign -v -s "${CODESIGNID}" -i com.rawtherapee.RawTherapee --force --verbose -o runtime --timestamp --entitlements "${CMAKE_BUILD_TYPE}"/rt.entitlements "${frameworklibs}" - done - codesign --force -v -s "${CODESIGNID}" -i com.rawtherapee.RawTherapee -o runtime --entitlements "${CMAKE_BUILD_TYPE}"/rt-cli.entitlements "${LIB}"/rawtherapee-cli - codesign --deep --timestamp --strict -v -s "${CODESIGNID}" -i com.rawtherapee.RawTherapee -o runtime --entitlements "${CMAKE_BUILD_TYPE}"/rt.entitlements "${APP}" + codesign --force --deep --timestamp --strict -v -s "${CODESIGNID}" -i com.rawtherapee.RawTherapee -o runtime --entitlements "${CMAKE_BUILD_TYPE}"/rt.entitlements "${APP}" spctl -a -vvvv "${APP}" fi @@ -310,6 +302,7 @@ fi if [[ -n $NOTARY ]]; then msg "Notarizing the application:" ditto -c -k --sequesterRsrc --keepParent "${APP}" "${APP}.zip" + echo "Uploading..." uuid=`xcrun altool --notarize-app --primary-bundle-id "com.rawtherapee.RawTherapee" ${NOTARY} --file "${APP}.zip" 2>&1 | grep 'RequestUUID' | awk '{ print $3 }'` echo "Result= $uuid" # Display identifier string sleep 15 @@ -334,11 +327,11 @@ if [[ -n $NOTARY ]]; then fi function CreateDmg { - local srcDir="$(mktemp -dt $$)" + local srcDir="$(mktemp -dt $$.XXXXXXXXXXXX)" msg "Preparing disk image sources at ${srcDir}:" cp -R "${APP}" "${srcDir}" - cp "${RESOURCES}"/share/LICENSE.txt "${srcDir}" + cp "${RESOURCES}"/LICENSE.txt "${srcDir}" ln -s /Applications "${srcDir}" # Web bookmarks @@ -379,6 +372,7 @@ function CreateDmg { # Sign disk image if [[ -n $CODESIGNID ]]; then + msg "Signing disk image" codesign --deep --force -v -s "${CODESIGNID}" --timestamp "${dmg_name}.dmg" fi @@ -386,6 +380,7 @@ function CreateDmg { if ! test -z "$NOTARY"; then msg "Notarizing the dmg:" zip "${dmg_name}.dmg.zip" "${dmg_name}.dmg" + echo "Uploading..." uuid=`xcrun altool --notarize-app --primary-bundle-id "com.rawtherapee" ${NOTARY} --file "${dmg_name}.dmg.zip" 2>&1 | grep 'RequestUUID' | awk '{ print $3 }'` echo "dmg Result= $uuid" # Display identifier string sleep 15 @@ -415,12 +410,7 @@ function CreateDmg { mkdir "${PROJECT_NAME}_OSX_${MINIMUM_SYSTEM_VERSION}_${PROC_BIT_DEPTH}_${PROJECT_FULL_VERSION}_folder" ditto {"${PROJECT_NAME}_OSX_${MINIMUM_SYSTEM_VERSION}_${PROC_BIT_DEPTH}_${PROJECT_FULL_VERSION}.dmg","rawtherapee-cli","${PROJECT_SOURCE_DATA_DIR}/INSTALL.readme.rtf"} "${PROJECT_NAME}_OSX_${MINIMUM_SYSTEM_VERSION}_${PROC_BIT_DEPTH}_${PROJECT_FULL_VERSION}_folder" zip -r "${PROJECT_NAME}_OSX_${MINIMUM_SYSTEM_VERSION}_${PROC_BIT_DEPTH}_${PROJECT_FULL_VERSION}.zip" "${PROJECT_NAME}_OSX_${MINIMUM_SYSTEM_VERSION}_${PROC_BIT_DEPTH}_${PROJECT_FULL_VERSION}_folder/" - # rm "${dmg_name}.dmg" - # msg "Removing disk image caches:" - # rm -rf "${srcDir}" } CreateDmg msg "Finishing build:" echo "Script complete." -# -# TODO filter out the benign errors