From 7631c6ccd1692d56d3d1e997dfd809347dd8b1aa Mon Sep 17 00:00:00 2001 From: Willard Date: Sun, 21 Sep 2025 18:43:24 +0200 Subject: [PATCH 01/38] add ci --- .github/workflows/build.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..b60191b --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,24 @@ +name: Build + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +env: + BUILD_TYPE: Release + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Configure CMake + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + From 68f0332f8d6100697df3cc05dbb06fdaeab0938a Mon Sep 17 00:00:00 2001 From: Willard Date: Sun, 21 Sep 2025 18:45:57 +0200 Subject: [PATCH 02/38] add libgimp-3.0-dev --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b60191b..33b5cd6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,9 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Install packages + run: sudo apt install -y libgimp-3.0-dev + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} From 943c5469b9218d604f32e37f9bc0fee99ba18ef8 Mon Sep 17 00:00:00 2001 From: Willard Date: Sun, 21 Sep 2025 18:47:48 +0200 Subject: [PATCH 03/38] update? --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33b5cd6..4ee0b82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,9 @@ jobs: - uses: actions/checkout@v4 - name: Install packages - run: sudo apt install -y libgimp-3.0-dev + run: | + sudo apt-get update + sudo apt install -y libgimp-3.0-dev - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} From abbe9d9606e9f494945c9226898e5f5b6d7b5e31 Mon Sep 17 00:00:00 2001 From: Willard Date: Sun, 21 Sep 2025 18:47:54 +0200 Subject: [PATCH 04/38] update2? --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ee0b82..292461e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,8 +18,8 @@ jobs: - name: Install packages run: | - sudo apt-get update - sudo apt install -y libgimp-3.0-dev + sudo apt-get update + sudo apt install -y libgimp-3.0-dev - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} From 829c96b2889b68e1a36481caa2c42982513f8695 Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 18:47:06 +0200 Subject: [PATCH 05/38] ppa + cmake --- .github/workflows/build.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 292461e..bcef12d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,14 +15,25 @@ jobs: steps: - uses: actions/checkout@v4 + with: + submodules: recursive - name: Install packages run: | sudo apt-get update - sudo apt install -y libgimp-3.0-dev + sudo apt install -y pkg-config cmake + sudo apt install -y software-properties-common + sudo add-apt-repository -y ppa:ubuntuhandbook1/gimp-3 + sudo apt install -y gimp libgimp-3.0-0 libgimp-3.0-dev - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + run: > + cmake + -DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}} + -DCMAKE_C_COMPILER:FILEPATH=clang + -DCMAKE_CXX_COMPILER:FILEPATH=clang++ + -S "${{ github.workspace }}" + -B "${{ github.workspace }}/build/" - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} From e96077bf16a349315c4f9ac934393d07afe34791 Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 18:52:11 +0200 Subject: [PATCH 06/38] libgexiv2-dev & upload --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bcef12d..b1a8659 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: sudo apt install -y pkg-config cmake sudo apt install -y software-properties-common sudo add-apt-repository -y ppa:ubuntuhandbook1/gimp-3 - sudo apt install -y gimp libgimp-3.0-0 libgimp-3.0-dev + sudo apt install -y gimp libgimp-3.0-0 libgimp-3.0-dev libgexiv2-dev - name: Configure CMake run: > @@ -38,3 +38,9 @@ jobs: - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + - name: Upload plugin + uses: actions/upload-artifact@v4 + with: + name: arma-gimp-plugin + path: "${{ github.workspace }}/build/arma-gimp-plugin" + From 2efce775ee91e008d8607f2e21395b4fbcd9985d Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 19:07:00 +0200 Subject: [PATCH 07/38] win clang? --- .github/workflows/build.yml | 42 ++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1a8659..28fd538 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,9 +8,10 @@ on: env: BUILD_TYPE: Release + MINGW_TRIPLET: mingw-w64-clang-x86_64- jobs: - build: + build-ubuntu: runs-on: ubuntu-latest steps: @@ -44,3 +45,42 @@ jobs: name: arma-gimp-plugin path: "${{ github.workspace }}/build/arma-gimp-plugin" + build-windows: + runs-on: windows-latest + + defaults: + run: + shell: msys2 {0} + + steps: + - uses: msys2/setup-msys2@v2 + with: + update: true + install: >- + ${{env.MINGW_TRIPLET}}clang + ${{env.MINGW_TRIPLET}}glib2 + ${{env.MINGW_TRIPLET}}cmake + ${{env.MINGW_TRIPLET}}pkgconf + ${{env.MINGW_TRIPLET}}gimp + + - uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Configure CMake + run: > + cmake + -DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}} + -DCMAKE_C_COMPILER:FILEPATH=clang + -DCMAKE_CXX_COMPILER:FILEPATH=clang++ + -S "${{ github.workspace }}" + -B "${{ github.workspace }}/build/" + + - name: Build + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + + - name: Upload plugin + uses: actions/upload-artifact@v4 + with: + name: arma-gimp-plugin + path: "${{ github.workspace }}/build/arma-gimp-plugin.exe" \ No newline at end of file From 5364018e6ee95eb3c1b935a7a3c0d950ef499d6c Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 19:07:38 +0200 Subject: [PATCH 08/38] . --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28fd538..ae20483 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,7 +65,7 @@ jobs: - uses: actions/checkout@v4 with: - submodules: recursive + submodules: recursive - name: Configure CMake run: > From 51f7d491e3484dcfd8d9a21bb558d2f67bdbfb07 Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 19:22:40 +0200 Subject: [PATCH 09/38] s --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae20483..8f3f013 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,11 +55,12 @@ jobs: steps: - uses: msys2/setup-msys2@v2 with: + msys2: CLANG64 update: true install: >- + ${{env.MINGW_TRIPLET}}cmake ${{env.MINGW_TRIPLET}}clang ${{env.MINGW_TRIPLET}}glib2 - ${{env.MINGW_TRIPLET}}cmake ${{env.MINGW_TRIPLET}}pkgconf ${{env.MINGW_TRIPLET}}gimp @@ -68,6 +69,7 @@ jobs: submodules: recursive - name: Configure CMake + shell: msys2 {0} run: > cmake -DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}} From 316d1cbbe953c3f9ae9383aabdb6eda43f663159 Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 19:25:44 +0200 Subject: [PATCH 10/38] ninja --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f3f013..d9370a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,6 +59,7 @@ jobs: update: true install: >- ${{env.MINGW_TRIPLET}}cmake + ${{env.MINGW_TRIPLET}}ninja ${{env.MINGW_TRIPLET}}clang ${{env.MINGW_TRIPLET}}glib2 ${{env.MINGW_TRIPLET}}pkgconf From c72122731028699bd26422d13a772be02be10bfa Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 19:34:50 +0200 Subject: [PATCH 11/38] pacboy? --- .github/workflows/build.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9370a9..1dc6920 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,13 +57,19 @@ jobs: with: msys2: CLANG64 update: true - install: >- - ${{env.MINGW_TRIPLET}}cmake - ${{env.MINGW_TRIPLET}}ninja - ${{env.MINGW_TRIPLET}}clang - ${{env.MINGW_TRIPLET}}glib2 - ${{env.MINGW_TRIPLET}}pkgconf - ${{env.MINGW_TRIPLET}}gimp + pacboy: >- + toolchain:p + cmake:p + ninja:p + pkgconf:p + glib2:p + gimp:p + +# ${{env.MINGW_TRIPLET}}ninja +# ${{env.MINGW_TRIPLET}}clang +# ${{env.MINGW_TRIPLET}}glib2 +# ${{env.MINGW_TRIPLET}}pkgconf +# ${{env.MINGW_TRIPLET}}gimp - uses: actions/checkout@v4 with: From 1ef2aa581b5682286e2609f23932918df2057b1f Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 19:38:41 +0200 Subject: [PATCH 12/38] remove clang? --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1dc6920..937921c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: steps: - uses: msys2/setup-msys2@v2 with: - msys2: CLANG64 + msys2: clang64 update: true pacboy: >- toolchain:p @@ -80,8 +80,6 @@ jobs: run: > cmake -DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}} - -DCMAKE_C_COMPILER:FILEPATH=clang - -DCMAKE_CXX_COMPILER:FILEPATH=clang++ -S "${{ github.workspace }}" -B "${{ github.workspace }}/build/" From 1cf777b87c4c60a9324a73205e0f738fa5826c7e Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 19:46:04 +0200 Subject: [PATCH 13/38] rust --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 937921c..4dfc894 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,6 +61,7 @@ jobs: toolchain:p cmake:p ninja:p + rust:p pkgconf:p glib2:p gimp:p From 3810de21e93ef9b217ca807eb6859b401fa02b69 Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 19:50:43 +0200 Subject: [PATCH 14/38] windoofs --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dfc894..e302b08 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,10 +82,10 @@ jobs: cmake -DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}} -S "${{ github.workspace }}" - -B "${{ github.workspace }}/build/" + -B "${{ github.workspace }}\build\" - name: Build - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} - name: Upload plugin uses: actions/upload-artifact@v4 From ce1a6524609ed22c36df7baee00ab90ebb04c18f Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 19:54:09 +0200 Subject: [PATCH 15/38] ? --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e302b08..dd3a9e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: cmake -DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}} -S "${{ github.workspace }}" - -B "${{ github.workspace }}\build\" + -B "${{ github.workspace }}/build/" - name: Build run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} From 648592c93f78e41e03300593bf24a7927c76e449 Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 21:25:30 +0200 Subject: [PATCH 16/38] path? --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd3a9e1..26d74df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,7 @@ jobs: -B "${{ github.workspace }}/build/" - name: Build - run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} + run: cmake --build "${{github.workspace}}\build"--config ${{env.BUILD_TYPE}} - name: Upload plugin uses: actions/upload-artifact@v4 From 421827a1cf1d851620c07082aedf560a937dee07 Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 22:37:49 +0200 Subject: [PATCH 17/38] a --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26d74df..dd3a9e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,7 @@ jobs: -B "${{ github.workspace }}/build/" - name: Build - run: cmake --build "${{github.workspace}}\build"--config ${{env.BUILD_TYPE}} + run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} - name: Upload plugin uses: actions/upload-artifact@v4 From b65bf0991dff16704c23ec1250f73d7bd7d6550e Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 22:43:08 +0200 Subject: [PATCH 18/38] a --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd3a9e1..4aca154 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: cmake -DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}} -S "${{ github.workspace }}" - -B "${{ github.workspace }}/build/" + -B "${{ github.workspace }}\build" - name: Build run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} From de9a9c117a5440440922a216311ac4724549d99f Mon Sep 17 00:00:00 2001 From: Willard Date: Mon, 22 Sep 2025 22:59:09 +0200 Subject: [PATCH 19/38] a --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4aca154..b24f763 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,10 +82,10 @@ jobs: cmake -DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}} -S "${{ github.workspace }}" - -B "${{ github.workspace }}\build" + -B "${{ github.workspace }}/build" - name: Build - run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} + run: cmake --build "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}} - name: Upload plugin uses: actions/upload-artifact@v4 From bc6629eada35563e8bad5bfa09ebd67474b06efc Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 18:35:39 +0200 Subject: [PATCH 20/38] add glib --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12d8413..5277420 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ add_subdirectory(arma-file-formats-cxx) find_package(PkgConfig REQUIRED) -pkg_check_modules(GIMP REQUIRED gimp-3.0 gimpui-3.0) +pkg_check_modules(GIMP REQUIRED gimp-3.0 gimpui-3.0 glib-2.0) add_executable(arma-gimp-plugin main.cpp) From e8b9beb29467c73196e348e96fa4f78c5137eee2 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 19:07:11 +0200 Subject: [PATCH 21/38] maybe --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5277420..08a6acb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,7 @@ include_directories(arma-gimp-plugin ${GIMP_INCLUDE_DIRS}) target_link_libraries(arma-gimp-plugin ${GIMP_LIBRARIES}) target_link_libraries(arma-gimp-plugin aff_cxx_rust) +target_link_libraries(aff_cxx_rust PUBLIC ${GIMP_LIBRARIES}) target_include_directories(arma-gimp-plugin PRIVATE aff_cxx_rust) From c4f1af9430cf8f140174d62fcb4556ca2cc332c7 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 19:32:24 +0200 Subject: [PATCH 22/38] icant --- .github/workflows/build.yml | 8 +------- CMakeLists.txt | 9 ++++----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b24f763..ae42c62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: steps: - uses: msys2/setup-msys2@v2 with: - msys2: clang64 + msystem: clang64 update: true pacboy: >- toolchain:p @@ -66,12 +66,6 @@ jobs: glib2:p gimp:p -# ${{env.MINGW_TRIPLET}}ninja -# ${{env.MINGW_TRIPLET}}clang -# ${{env.MINGW_TRIPLET}}glib2 -# ${{env.MINGW_TRIPLET}}pkgconf -# ${{env.MINGW_TRIPLET}}gimp - - uses: actions/checkout@v4 with: submodules: recursive diff --git a/CMakeLists.txt b/CMakeLists.txt index 08a6acb..557cf11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,11 +18,10 @@ target_link_libraries(arma-gimp-plugin ${GIMP_LIBRARIES}) target_link_libraries(arma-gimp-plugin aff_cxx_rust) target_link_libraries(aff_cxx_rust PUBLIC ${GIMP_LIBRARIES}) -target_include_directories(arma-gimp-plugin PRIVATE aff_cxx_rust) - -if(WIN32 AND (NOT "$ENV{appdata}" STREQUAL "")) - file(TO_CMAKE_PATH "$ENV{appdata}/GIMP/2.10/plug-ins/arma-gimp-plugin.exe" GIMP_PLUGIN_DIR) - +if(WIN32) + if(NOT "$ENV{appdata}" STREQUAL "") + file(TO_CMAKE_PATH "$ENV{appdata}/GIMP/2.10/plug-ins/arma-gimp-plugin.exe" GIMP_PLUGIN_DIR) + endif() else() file(TO_CMAKE_PATH "$ENV{HOME}/.config/GIMP/3.0/plug-ins/arma-gimp-plugin/arma-gimp-plugin" GIMP_PLUGIN_DIR) endif() From 015b3ec40db5cd21a57e6b294aa1c30df0793477 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 19:41:11 +0200 Subject: [PATCH 23/38] a --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae42c62..dea0d11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,6 +75,7 @@ jobs: run: > cmake -DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}} + -Rust_CARGO_TARGET:STRING=x86_64-pc-windows-gnu -S "${{ github.workspace }}" -B "${{ github.workspace }}/build" From 4edce0660bcce13072d192f4d99ebf3ec17c4407 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 19:44:34 +0200 Subject: [PATCH 24/38] a --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dea0d11..6a1d2a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: run: > cmake -DCMAKE_BUILD_TYPE:STRING=${{env.BUILD_TYPE}} - -Rust_CARGO_TARGET:STRING=x86_64-pc-windows-gnu + -DRust_CARGO_TARGET:STRING=x86_64-pc-windows-gnu -S "${{ github.workspace }}" -B "${{ github.workspace }}/build" From 1217af532856ef7798b2305ee3d3dacc5b7cc751 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 19:50:05 +0200 Subject: [PATCH 25/38] target --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a1d2a9..07ccfb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,6 +66,10 @@ jobs: glib2:p gimp:p + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + target: x86_64-pc-windows-gnu + - uses: actions/checkout@v4 with: submodules: recursive From ac42ad2854ecaeecd9a9076e556b1c4f72381ed6 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 20:03:03 +0200 Subject: [PATCH 26/38] x86_64-pc-windows-gnu --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07ccfb6..4569989 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,9 +66,8 @@ jobs: glib2:p gimp:p - - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - target: x86_64-pc-windows-gnu + - name: Install x86_64-pc-windows-gnu + run: rustup target add x86_64-pc-windows-gnu - uses: actions/checkout@v4 with: From a550691b06275be9067a26776d1bca47de7d5da1 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 20:05:48 +0200 Subject: [PATCH 27/38] a --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4569989..7ea21bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: toolchain:p cmake:p ninja:p - rust:p + rustup:p pkgconf:p glib2:p gimp:p From cb78b572ecc778f8ccfc604a6c73dd88a2242de7 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 20:18:18 +0200 Subject: [PATCH 28/38] clang env pkgconfig --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ea21bc..7d10758 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,6 +66,9 @@ jobs: glib2:p gimp:p + - env: + PKG_CONFIG_SYSROOT_DIR: ${{ steps.msys2.outputs.msys2-location }}/clang64 + - name: Install x86_64-pc-windows-gnu run: rustup target add x86_64-pc-windows-gnu From 054da66a18eb22d129941a6caba532ae0f99e7b7 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 20:19:33 +0200 Subject: [PATCH 29/38] a --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d10758..0046005 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,7 +67,7 @@ jobs: gimp:p - env: - PKG_CONFIG_SYSROOT_DIR: ${{ steps.msys2.outputs.msys2-location }}/clang64 + PKG_CONFIG_SYSROOT_DIR: ${{ steps.msys2.outputs.msys2-location }}/clang64 - name: Install x86_64-pc-windows-gnu run: rustup target add x86_64-pc-windows-gnu From 00c79cf30dd1b508da0ddbe40239ed43b366cd2d Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 20:23:44 +0200 Subject: [PATCH 30/38] a --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0046005..52a2566 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,8 +66,11 @@ jobs: glib2:p gimp:p - - env: - PKG_CONFIG_SYSROOT_DIR: ${{ steps.msys2.outputs.msys2-location }}/clang64 + - name: Set pkg-config sysroot + run: echo "PKG_CONFIG_SYSROOT_DIR=${{ steps.msys2.outputs.msys2-location }}/clang64" + + - name: Check PKG_CONFIG_SYSROOT_DIR + run: echo $PKG_CONFIG_SYSROOT_DIR - name: Install x86_64-pc-windows-gnu run: rustup target add x86_64-pc-windows-gnu From 4f1f22344e9d4a70f4bbf353ec61459cd9432095 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 20:30:11 +0200 Subject: [PATCH 31/38] a --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52a2566..92507ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,7 +67,7 @@ jobs: gimp:p - name: Set pkg-config sysroot - run: echo "PKG_CONFIG_SYSROOT_DIR=${{ steps.msys2.outputs.msys2-location }}/clang64" + run: echo "PKG_CONFIG_SYSROOT_DIR=${{ steps.msys2.outputs.msys2-location }}/clang64" >> $GITHUB_ENV - name: Check PKG_CONFIG_SYSROOT_DIR run: echo $PKG_CONFIG_SYSROOT_DIR From 0f54b4974f779796098800d885fcf18d43f0c94b Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 20:34:25 +0200 Subject: [PATCH 32/38] a --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92507ae..fc549f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,6 +54,7 @@ jobs: steps: - uses: msys2/setup-msys2@v2 + id: msys2 with: msystem: clang64 update: true From 41fc46237a8b3e20ccd7d0e8eec44a1c6b191829 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 20:42:47 +0200 Subject: [PATCH 33/38] links --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 557cf11..0bcbc60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,10 @@ target_link_libraries(arma-gimp-plugin ${GIMP_LIBRARIES}) target_link_libraries(arma-gimp-plugin aff_cxx_rust) target_link_libraries(aff_cxx_rust PUBLIC ${GIMP_LIBRARIES}) +if(WIN32) + target_link_libraries(arma-gimp-plugin Bcrypt.lib Ntdll.lib Userenv.lib Ws2_32.lib Opengl32.lib Propsys.lib RuntimeObject.lib) +endif() + if(WIN32) if(NOT "$ENV{appdata}" STREQUAL "") file(TO_CMAKE_PATH "$ENV{appdata}/GIMP/2.10/plug-ins/arma-gimp-plugin.exe" GIMP_PLUGIN_DIR) From 2e2c71bcf5ddc46f49e7d3ad759ca099bf2f313e Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 20:43:00 +0200 Subject: [PATCH 34/38] a --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bcbc60..058b6a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries(arma-gimp-plugin aff_cxx_rust) target_link_libraries(aff_cxx_rust PUBLIC ${GIMP_LIBRARIES}) if(WIN32) - target_link_libraries(arma-gimp-plugin Bcrypt.lib Ntdll.lib Userenv.lib Ws2_32.lib Opengl32.lib Propsys.lib RuntimeObject.lib) + target_link_libraries(arma-gimp-plugin Bcrypt.lib)# Ntdll.lib Userenv.lib Ws2_32.lib Opengl32.lib Propsys.lib RuntimeObject.lib) endif() if(WIN32) From cf5c03e1e2576ce7bd94c9b6ecaea139fb41b445 Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 20:51:44 +0200 Subject: [PATCH 35/38] ci final? --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc549f9..0dd49d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,5 +95,5 @@ jobs: - name: Upload plugin uses: actions/upload-artifact@v4 with: - name: arma-gimp-plugin + name: arma-gimp-plugin.exe path: "${{ github.workspace }}/build/arma-gimp-plugin.exe" \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 058b6a8..7f3b5bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,12 +19,12 @@ target_link_libraries(arma-gimp-plugin aff_cxx_rust) target_link_libraries(aff_cxx_rust PUBLIC ${GIMP_LIBRARIES}) if(WIN32) - target_link_libraries(arma-gimp-plugin Bcrypt.lib)# Ntdll.lib Userenv.lib Ws2_32.lib Opengl32.lib Propsys.lib RuntimeObject.lib) + target_link_libraries(arma-gimp-plugin Bcrypt.lib) endif() if(WIN32) if(NOT "$ENV{appdata}" STREQUAL "") - file(TO_CMAKE_PATH "$ENV{appdata}/GIMP/2.10/plug-ins/arma-gimp-plugin.exe" GIMP_PLUGIN_DIR) + file(TO_CMAKE_PATH "$ENV{appdata}/GIMP/2.10/plug-ins/arma-gimp-plugin/arma-gimp-plugin.exe" GIMP_PLUGIN_DIR) endif() else() file(TO_CMAKE_PATH "$ENV{HOME}/.config/GIMP/3.0/plug-ins/arma-gimp-plugin/arma-gimp-plugin" GIMP_PLUGIN_DIR) From 4f36545d76daeb8fc3d0adc135cf88de8a9c95fe Mon Sep 17 00:00:00 2001 From: Willard Date: Tue, 23 Sep 2025 21:13:39 +0200 Subject: [PATCH 36/38] subsystem --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f3b5bd..30035bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries(arma-gimp-plugin aff_cxx_rust) target_link_libraries(aff_cxx_rust PUBLIC ${GIMP_LIBRARIES}) if(WIN32) - target_link_libraries(arma-gimp-plugin Bcrypt.lib) + target_link_libraries(arma-gimp-plugin Bcrypt.lib "-Wl,-subsystem,windows") endif() if(WIN32) From a23959ec0cd4c5a93dadeb950c14791c8f38a56d Mon Sep 17 00:00:00 2001 From: Willard Date: Thu, 25 Sep 2025 18:49:22 +0200 Subject: [PATCH 37/38] remove gimp link aff --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30035bd..42e0b00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,6 @@ include_directories(arma-gimp-plugin ${GIMP_INCLUDE_DIRS}) target_link_libraries(arma-gimp-plugin ${GIMP_LIBRARIES}) target_link_libraries(arma-gimp-plugin aff_cxx_rust) -target_link_libraries(aff_cxx_rust PUBLIC ${GIMP_LIBRARIES}) if(WIN32) target_link_libraries(arma-gimp-plugin Bcrypt.lib "-Wl,-subsystem,windows") From 03ed23524dbeb4de69071222a9de9a2278bea03f Mon Sep 17 00:00:00 2001 From: Willard Date: Thu, 25 Sep 2025 19:02:39 +0200 Subject: [PATCH 38/38] unused env --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0dd49d2..1cab594 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,6 @@ on: env: BUILD_TYPE: Release - MINGW_TRIPLET: mingw-w64-clang-x86_64- jobs: build-ubuntu: