Introducing windows building recipe branch

.github/workflows/bak/cpythonlinuxIOnonregression.yml

@@ -21,7 +21,9 @@ jobs:
         python-version: [3.7]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
@@ -41,12 +43,10 @@ jobs:
     - name: Build gmic-cli if needed
       run: |
         sudo apt-get install -y libfftw3-dev libcurl4-openssl-dev libpng-dev zlib1g-dev libomp5 libomp-dev
-        bash build_tools.bash 1b_clean_and_regrab_gmic_src_and_make_cli
       if: steps.cache-gmic-cli.outputs.cache-hit != 'true'
     - name: Build gmic-py if needed
       run: |
         sudo apt-get install -y libfftw3-dev libcurl4-openssl-dev libpng-dev zlib1g-dev libomp5 libomp-dev
-        bash build_tools.bash 1_clean_and_regrab_gmic_src
         bash build_tools.bash 2_compile
       if: steps.cache-gmic-py.outputs.cache-hit != 'true'
     - name: run IO non regression tests using compiled gmic-py and gmic-cli

.github/workflows/bak/cpythonmacosbuild_nosendpypi.yml

@@ -11,7 +11,10 @@ jobs:
       matrix:
         python-version: [3.7]
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
       # Prevent running this job on tag-based releases
       - name: Check if Git tag exists
         run: echo "HEAD_TAG=$(git tag --points-at HEAD)" >> $GITHUB_ENV
@@ -46,7 +49,6 @@ jobs:
           # llvm 9 (latest) might cause issue with c++20 pre-support, see https://trac.macports.org/ticket/59575 and https://github.com/dtschump/gmic-py/commit/618d9d317d55aa7af3f85e92bfd07f06efea491f/checks?check_suite_id=368364476
           # using llvm v6 instead
           brew install pkg-config fftw libpng libomp llvm@6 coreutils
-          bash build_tools.bash 1_clean_and_regrab_gmic_src
           MACOSX_DEPLOYMENT_TARGET=10.10 pip install git+https://github.com/mayeut/cibuildwheel.git
           MACOSX_DEPLOYMENT_TARGET=10.10 python -m cibuildwheel --output-dir wheelhouse
           echo "Mac OS wheelhouse after cibuildwheel looks like:"

.github/workflows/bak/cpythonmacosbuildandreleaseontag.yml

@@ -15,7 +15,10 @@ jobs:
       matrix:
         python-version: [3.7]
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
@@ -42,7 +45,6 @@ jobs:
           # llvm 9 (latest) might cause issue with c++20 pre-support, see https://trac.macports.org/ticket/59575 and https://github.com/dtschump/gmic-py/commit/618d9d317d55aa7af3f85e92bfd07f06efea491f/checks?check_suite_id=368364476
           # using llvm v6 instead
           brew install pkg-config fftw libpng libomp llvm@6 coreutils
-          bash build_tools.bash 1_clean_and_regrab_gmic_src
           MACOSX_DEPLOYMENT_TARGET=10.10 pip install git+https://github.com/mayeut/cibuildwheel.git
           MACOSX_DEPLOYMENT_TARGET=10.10 python -m cibuildwheel --output-dir wheelhouse && bash build_tools.bash 11_send_to_pypi
           echo "Mac OS wheelhouse after cibuildwheel and sending to pypi.org looks like:"

.github/workflows/bak/cpythonmanylinuxbuild_nosendpypi.yml

@@ -21,7 +21,10 @@ jobs:
             docker_image: 'quay.io/pypa/manylinux2014_x86_64:latest'
             pre_cmd:
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
       # Prevent running this job on tag-based releases
       - name: Check if Git tag exists
         run: echo "HEAD_TAG::$(git tag --points-at HEAD)" >> $GITHUB_ENV

.github/workflows/bak/cpythonmanylinuxbuildandreleaseontag.yml

@@ -23,7 +23,10 @@ jobs:
             docker_image: 'quay.io/pypa/manylinux2014_x86_64:latest'
             pre_cmd:
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
       # Detect G'MIC target version from VERSION file
       - name: Detect G'MIC target version
         run: echo "GHA_GMIC_VERSION=$(GHA_QUIET=1 bash build_tools.bash __get_py_package_version)" >> $GITHUB_ENV

.github/workflows/bak/cpythonpythonpackageoptimized.yml

@@ -43,7 +43,6 @@ jobs:
         bash build_tools.bash 21_check_c_style # should stop this script on style error
         bash build_tools.bash 23_check_python_style # should stop this script on style error
 
-        bash build_tools.bash 1_clean_and_regrab_gmic_src
         bash build_tools.bash 2_compile #2b_compile_debug
         bash build_tools.bash 3_test_compiled_so
         # && bash build_tools.bash 11_send_to_pypi #Note that most probably nothing will be sent to PyPI because of too modern linked libraries 

.github/workflows/bak/cpythonwindowsbuild.yml

@@ -7,31 +7,62 @@ on: [push]
 jobs:
   build-windows:
     runs-on: windows-latest
-    strategy:
-      matrix:
-        python-version: ['3.7']
+    defaults:
+      run:
+        shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v2
         with:
-          python-version: ${{ matrix.python-version }}
-      - name: build on macos
+          submodules: true
+
+      # Using https://github.com/marketplace/actions/setup-msys2
+      - name: Using "Setup MSYS2" contrib
+        uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: make git
+      - run: git describe --dirty
+      - name: build on windows
         working-directory: ./
         env:
           TWINE_PASSWORD_GITHUB_SECRET: ${{ secrets.TWINE_PASSWORD_GITHUB_SECRET }} # For build_tools.bash 11_send_to_pypi
-          PYTHON3: python
-          PIP3: pip
-          CIBW_BUILD: cp3*-*win*
-          # CIBW_ENVIRONMENT: "CC='/usr/local/opt/llvm@6/bin/clang' CXX='/usr/local/opt/llvm@6/bin/clang++' COMPILER_INDEX_STORE_ENABLE='NO'"
-          CIBW_BEFORE_BUILD: pip install -r dev-requirements.txt
-          CIBW_TEST_REQUIRES: pytest
-          CIBW_TEST_COMMAND: python -W default -m pytest {project}/tests/test_gmic_py.py -vvv -rxXs
-          CIBW_BUILD_VERBOSITY: 3
         run: |
-          # brew install pkg-config fftw libpng libomp llvm@6
-          bash build_tools.bash 1_clean_and_regrab_gmic_src
-          pip install git+https://github.com/joerick/cibuildwheel.git
-          python -m cibuildwheel --output-dir wheelhouse
-          #echo "Mac OS wheelhouse after cibuildwheel looks like:"
-          #bash build_tools.bash 11_send_to_pypi
+          pacman --noconfirm -S unzip wget mingw-w64-x86_64-curl mingw-w64-x86_64-python-pip mingw-w64-x86_64-python python-devel mingw-w64-x86_64-gcc mingw-w64-x86_64-zlib mingw-w64-x86_64-libjpeg-turbo mingw64/mingw-w64-x86_64-pkgconf mingw-w64-x86_64-libpng mingw-w64-x86_64-libtiff mingw64/mingw-w64-x86_64-fftw
+          pacman --noconfirm -S mingw-w64-x86_64-python-numpy # used by unit tests, safer to install so than through pip on-the-fly source compilation
+          # Add complementary pkg-config .pc lookup path
+          export PKG_CONFIG_PATH=/usr/lib/pkgconfig/:$PKG_CONFIG_PATH
+          pkg-config --list-all
+          pkg-config libjpeg --libs --cflags
+          pkg-config libpng --libs --cflags
+          pkg-config libtiff-4 --libs --cflags
+          pkg-config zlib --libs --cflags
+          pkg-config libcurl --libs --cflags
+          pkg-config libcurl --libs --cflags
+          which python
+          python --version
+          gcc --version
+          g++ --version
+          which pip
+          pip --version
+          pip install -r dev-requirements.txt
+          bash build_tools.bash 2b_compile_debug
+          ldd $(find -name *.dll)
+          bash build_tools.bash 3_test_compiled_so format
+          bash build_tools.bash 4b_build_windows_portable_wheel
+          bash build_tools.bash 5_test_wheel format
+          bash build_tools.bash 5b_test_wheel_dlls_repaired
+      - name: upload .whl debug build dir as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: gmic-py-windows-debug-dist-dir
+          path: dist/
+      - name: upload .whl repaired build dir as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: gmic-py-windows-repaired-dist-dir
+          path: wheelhouse/
+      - name: upload .dll debug build dir as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: gmic-py-windows-debug-build-dir
+          path: build/

.github/workflows/build.yml

@@ -0,0 +1,100 @@
+# Automatically build binary wheels and source packages.
+# Adapted from https://github.com/vinayak-mehta/pdftopng/blob/main/.github/workflows/build.yml
+name: cibuildwheel
+
+on: [push]
+
+env:
+  CIBW_BUILD: "cp3?-manylinux_x86_64 cp3?-macosx_x86_64"
+  CIBW_SKIP: "cp35-*"
+  CIBW_BEFORE_BUILD_LINUX: "sh scripts/build_linux.sh"
+  CIBW_REPAIR_WHEEL_COMMAND_LINUX: "LD_LIBRARY_PATH=$(pwd)/lib/poppler/build/:$LD_LIBRARY_PATH auditwheel repair -w {dest_dir} {wheel}"
+  CIBW_BEFORE_BUILD_MACOS: "sh scripts/build_macos.sh"
+  CIBW_REPAIR_WHEEL_COMMAND_MACOS: "DYLD_LIBRARY_PATH=$(pwd)/lib/poppler/build:$DYLD_LIBRARY_PATH delocate-listdeps {wheel} && delocate-wheel -w {dest_dir} -v {wheel}"
+  CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "call scripts/wheel_repair.bat {wheel} {dest_dir}"
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest]
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - uses: actions/setup-python@v2
+        name: Install Python
+        with:
+          python-version: 3.8
+
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x86
+
+      - name: Build dependencies & wheels (Windows / x86)
+        if: runner.os == 'Windows'
+        shell: cmd
+        run: |
+          REM call scripts\build_win_x86.bat
+          cd gmic
+          git fetch --all --tags
+          git checkout v.2.9.1
+          cd ..
+          C:\msys64\usr\bin\wget.exe -P gmic\src https://gmic.eu/gmic_stdlib.h
+          C:\msys64\usr\bin\wget.exe -P gmic\src https://github.com/dtschump/CImg/raw/v.2.9.1/CImg.h
+          vcpkg install libpng:x64-windows libjpeg-turbo:x64-windows zlib:x64-windows curl:x64-windows tiff:x64-windows fftw3:x64-windows
+          vcpkg list
+          python -m pip --disable-pip-version-check install cibuildwheel==1.6.1 wheel
+          python setup.py bdist_wheel 
+          REM python -m cibuildwheel --output-dir wheelhouse
+        env:
+          CIBW_BUILD: "cp3?-win32"
+          CIBW_SKIP: "cp35-*"
+          DISTUTILS_USE_SDK: 1
+          MSSdk: 1
+
+#      - uses: ilammy/msvc-dev-cmd@v1
+#        with:
+#          arch: amd64
+#
+#      - name: Build dependencies & wheels (Windows / amd64)
+#        if: runner.os == 'Windows'
+#        shell: cmd
+#        run: |
+#          call scripts\build_win_x64.bat
+#          python -m pip --disable-pip-version-check install cibuildwheel==1.6.1
+#          python -m cibuildwheel --output-dir wheelhouse
+#        env:
+#          CIBW_BUILD: "cp3?-win_amd64"
+#          CIBW_SKIP: "cp35-*"
+#          DISTUTILS_USE_SDK: 1
+#          MSSdk: 1
+#
+#      - name: Install cibuildwheel & build wheels (Linux & MacOS)
+#        if: runner.os != 'Windows'
+#        run: |
+#          python -m pip --disable-pip-version-check install cibuildwheel==1.6.1
+#          python -m cibuildwheel --output-dir wheelhouse
+#
+#      - uses: actions/upload-artifact@v2
+#        with:
+#          path: ./wheelhouse/*.whl
+#
+#  upload_pypi:
+#    needs: [build_wheels]
+#    runs-on: ubuntu-latest
+#    # upload to PyPI on every tag starting with 'v'
+#    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
+#    steps:
+#      - uses: actions/download-artifact@v2
+#        with:
+#          name: artifact
+#          path: dist
+#
+#      - uses: pypa/gh-action-pypi-publish@master
+#        with:
+#          user: __token__
+#          password: ${{ secrets.pypi_password }}

.github/workflows/cpythonpythonpackage.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+
 
     # Prevent running this job on tag-based releases
     - name: Check if Git tag exists
@@ -28,20 +28,29 @@ jobs:
       with:
         python-version: 3.7
 
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
     - name: Compile and run tests on .so, .whl and source distribution of gmic-py ${{ env.GHA_GMIC_VERSION }}
       working-directory: ./
       env:
         # TWINE_PASSWORD_GITHUB_SECRET: ${{ secrets.TWINE_PASSWORD_GITHUB_SECRET }} # For build_tools.bash 11_send_to_pypi
         PYTHON3: python3
         PIP3: pip3
       run: |
+        cd gmic
+        git fetch --all --tags
+        git checkout v.2.9.1
+        cd ..
         for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
         sudo apt-get update; sudo apt-get install -y libfftw3-dev libcurl4-openssl-dev libpng-dev zlib1g-dev libomp5 libomp-dev
         sudo apt-get install clang-format
         bash build_tools.bash 21_check_c_style # should stop this script on style error
         bash build_tools.bash 23_check_python_style # should stop this script on style error
+        wget -P gmic/src https://gmic.eu/gmic_stdlib.h
+        wget -P gmic/src https://github.com/dtschump/CImg/raw/v.2.9.1/CImg.h
 
-        bash build_tools.bash 1_clean_and_regrab_gmic_src
         bash build_tools.bash 2b_compile_debug
         ldd build/lib.linux-x86_64-3.*/gmic.cpython-3*-x86_64-linux-gnu.so
         # bash build_tools.bash 3_test_compiled_so # TODO tests exceptionnally disabled for remote testing

.gitignore

@@ -3,7 +3,6 @@ src/
 out.json
 build/
 dist/
-gmic
 docs/_build/
 wheelhouse/*
 *.egg-info*

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "gmic"]
+	path = gmic
+	url = https://github.com/dtschump/gmic
+	branch = tags/2.9.1