fixes macOS autobuild (#5674)

* update macOS autobuild yaml

* updates */CMakeLists* for macOS autobuild compatibility

* "" a dir for cmake

* Un empty an empty EXTRA_INCDIR

* use a cmake operator

* Use the . dir to un-empty a string

* fix minutes timer in macos yaml

* test & skip instead of load & include

* disregard fractional part of minutes in mac yaml

* add another cmake test

* fix typo in mac yaml

* fix other part of same typo

* correct a filename in mac yaml

* test all include dirs

* fix of mac yaml

* mac:fix a path in yaml

* mac:and its antecedent

* options.h include a dir

* test __has_include (gcc 5.* & up & clang)

* remove a printf() in mac yaml

* mac:change a "" and an elseif() to else()

* fix a whitespace error

* fix 2 whitespace errors

* ZULU>UTC

* add a "UTC

* on the other side of the "

* mac:properly set default LOCAL_PREFIX in CACHE

* use of zsh subshells in macos yaml

* mac:remove some &&

* mac:remove some "

* mac:floating point divisors

* mac:use double paren (())

* mac:add a dir

* mac:floatize with decimal point

* mac:zsh -c certain lines

* remove a marker

.github/workflows/main.yml

@@ -1,81 +1,96 @@
 name: macOS build
 on:
   push:
-    branches-ignore:
-      - '**'
+    branches:
+      - dev
+      - patch**
+      - newlocallab
+  pull_request:
+    branches:
+      - dev
+      - newlocallab
+  release:
+    types:
+      - created
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v1
       - name: Install dependencies
-        run: >
-          brew install gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme
-          libsigc++ little-cms2 libiptcdata fftw lensfun llvm expat pkgconfig
-          libomp shared-mime-info
-      - name: patch libiconv
         run: |
-          mkdir libiconv && cd libiconv
-          wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
-          tar xf libiconv-1.16.tar.gz
-          cd libiconv-1.16
-          patch -p1 < "${GITHUB_WORKSPACE}/tools/osx/libiconv_1.16_rt.patch"
-          mkdir build && cd build
-          destDir="$(pwd)"
-          ../configure --prefix=/opt/local --disable-static \
-            CFLAGS='-arch x86_64 -mmacosx-version-min=10.9' \
-            LDFLAGS='-arch x86_64 -mmacosx-version-min=10.9' \
-            CXXFLAGS='-arch x86_64 -mmacosx-version-min=10.9'
-          make --jobs
-          make DESTDIR="${destDir}" install
-          sudo mv opt/local /usr/local/opt/libiconv
-      - name: cmake
+           date -u
+           mkdir build
+           date +%s > build/stamp
+           brew uninstall --ignore-dependencies libtiff
+           brew install libtiff gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme libsigc++ little-cms2 libiptcdata fftw lensfun expat pkgconfig libomp shared-mime-info | tee -a depslog
+           date -u
+           echo "----====Pourage====----"
+           cat depslog | grep Pouring
+           zsh -c 'echo "Completed installation of dependencies in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"'
+      - name: Configure build system
         env:
           CMAKE_CXX_STANDARD: 11
-          PKG_CONFIG_PATH: /usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig
+          PKG_CONFIG_PATH: /usr/local/opt/libtiff/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig
           RAW_THERAPEE_MAJOR: '5'
           RAW_THERAPEE_MINOR: '8'
           C_FLAGS: >
-            -Xpreprocessor -fopenmp /usr/local/lib/libomp.dylib
-            -I/usr/local/include -I/usr/local/opt/gdk-pixbuf/include
-            -I/usr/local/opt/libiconv/include -I/usr/local/opt/libxml2/include
-            -I/usr/local/opt/expat/include -I/usr/local/opt/llvm/include
+            -arch x86_64 -mtune=generic -Xpreprocessor -fopenmp /usr/local/lib/libomp.dylib -I/usr/local/include -I/usr/local/opt/gdk-pixbuf/include -I/usr/local/opt/libiconv/include -I/usr/local/opt/libxml2/include -I/usr/local/opt/expat/include -I/usr/local/opt/libtiff/include
         run: |
           # GITHUB_REF is the ref that triggered the build, like
           # refs/heads/new-feature - the next line parses that to REF: the branch
           # name only (new-feature)
-          REF=${GITHUB_REF##*/}
-          mkdir build && cd build
+          export REF=${GITHUB_REF##*/}
+          export C_FLAGS=$(echo -e $C_FLAGS | tr -d '\n')
+          cd build && date -u && date +%s > configstamp
           cmake \
-            -DCMAKE_BUILD_TYPE="release" \
+            -DCMAKE_BUILD_TYPE="Release" \
             -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-            -DCMAKE_EXE_LINKER_FLAGS="-L/usr/local/lib -L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib -L/usr/local/opt/gdk-pixbuf/lib -L/usr/local/opt/libiconv/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/libxml2/lib -L/usr/local/opt/expat/lib" \
+            -DCMAKE_EXE_LINKER_FLAGS="-L. -L/usr/local/lib -Wl,-rpath -Wl,/usr/local/lib -L/usr/local/opt/gdk-pixbuf/lib -L/usr/local/opt/libiconv/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/libxml2/lib -L/usr/local/opt/expat/lib" \
             -DCACHE_NAME_SUFFIX="${RAW_THERAPEE_MAJOR}.${RAW_THERAPEE_MINOR}-${REF}" \
-            -DPROC_TARGET_NUMBER="2" \
+            -DPROC_TARGET_NUMBER="1" \
             -DPROC_LABEL="generic processor" \
             -DWITH_LTO="OFF" \
-            -DLENSFUNDBDIR="./share/lensfun" \
-            -DOpenMP_C_FLAGS=-fopenmp=libomp \
-            -DOpenMP_CXX_FLAGS=-fopenmp=libomp \
-            -DOpenMP_C_LIB_NAMES="libomp" \
-            -DOpenMP_CXX_LIB_NAMES="libomp" \
-            -DOpenMP_libomp_LIBRARY="/usr/local/lib/libomp.dylib" \
+            -DLENSFUNDBDIR="/Applications/RawTherapee.app/Contents/Resources/share/lensfun" \
+            -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang \
+            -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ \
+            -DCMAKE_C_FLAGS="-arch x86_64 -Wno-pass-failed -Wno-deprecated-register -Wno-unused-command-line-argument" \
+            -DCMAKE_CXX_FLAGS="-arch x86_64 -Wno-pass-failed -Wno-deprecated-register -Wno-unused-command-line-argument" \
             -DOpenMP_C_FLAGS="${C_FLAGS}" \
             -DOpenMP_CXX_FLAGS="${C_FLAGS}" \
-            -DCMAKE_AR="/usr/local/opt/llvm/bin/llvm-ar" \
-            -DCMAKE_RANLIB="/usr/local/opt/llvm/bin/llvm-ranlib" \
-            -DCMAKE_OSX_DEPLOYMENT_TARGET="10.11" \
+            -DOpenMP_C_LIB_NAMES=libomp \
+            -DOpenMP_CXX_LIB_NAMES=libomp \
+            -DOpenMP_libomp_LIBRARY=/usr/local/lib/libomp.dylib \
+            -DCMAKE_AR=/usr/bin/ar \
+            -DCMAKE_RANLIB=/usr/bin/ranlib \
+            -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
             ..
-          make --jobs
-          make install
-          sudo make macosx_bundle
-          ARTIFACT=(RawTherapee*.zip)
+            zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"'
+      - name: Compile RawTherapee
+        run: |
+          date -u && date +%s > build/compilestamp
+          cd build
+          export REF=${GITHUB_REF##*/}
+          make -j$(sysctl -a | grep machdep.cpu.thread_count | tail -c 2) install
+          zsh -c 'echo "Compiled in $(printf "%0.2f" $(($[$(date +%s)-$(cat compilestamp)]/$((60.))))) minutes"'
+      - name: Create application bundle
+        run: |
+          zsh
+          date +%s > build/bundlestamp && date -u && cd build
+          export REF=${GITHUB_REF##*/} && export LOCAL_PREFIX=/usr && sudo make macosx_bundle
+          export ARTIFACT=(RawTherapee*.zip)
           echo "=== artifact: ${ARTIFACT}"
           # defining environment variables for next step as per
           # https://github.com/actions/starter-workflows/issues/68
           echo "::set-env name=ARTIFACT_PATH::${GITHUB_WORKSPACE}/build/${ARTIFACT}"
           echo "::set-env name=ARTIFACT_FILE::${ARTIFACT}"
+          zsh -c 'echo "Bundled in $(printf "%0.2f" $(($[$(date +%s)-$(cat bundlestamp)]/$((60.))))) minutes"'
+          exit
       - uses: actions/upload-artifact@v1
         with:
           name: ${{env.ARTIFACT_FILE}}
           path: ${{env.ARTIFACT_PATH}}
+      - name: Finish build
+        run: |
+          date -u
+          zsh -c 'echo "Build completed in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"'