From ba9dd9fbd2348f32b927afd8f0a26cd48fa51425 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Mon, 12 Aug 2024 20:04:43 +0200 Subject: [PATCH 01/12] disable man --- projects/f3d.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/f3d.cmake b/projects/f3d.cmake index bfa54000..c9493602 100644 --- a/projects/f3d.cmake +++ b/projects/f3d.cmake @@ -26,7 +26,7 @@ superbuild_add_project(f3d -Werror=deprecated --warn-uninitialized -DCMAKE_INSTALL_NAME_DIR:PATH=/lib - -DF3D_LINUX_GENERATE_MAN:BOOL=${f3d_build_for_linux} + -DF3D_LINUX_GENERATE_MAN:BOOL=OFF -DF3D_LINUX_INSTALL_DEFAULT_CONFIGURATION_FILE_IN_PREFIX:BOOL=${f3d_build_for_linux} -DF3D_MACOS_BUNDLE:BOOL=${f3d_build_for_macos} -DF3D_MODULE_EXR:BOOL=${openexr_enabled} From 682f45e7a46daa954447831323f964954b1007e7 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Mon, 12 Aug 2024 21:44:52 +0200 Subject: [PATCH 02/12] no man --- projects/unix/f3d.bundle.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/unix/f3d.bundle.cmake b/projects/unix/f3d.bundle.cmake index 183c12da..ae3e0cd8 100644 --- a/projects/unix/f3d.bundle.cmake +++ b/projects/unix/f3d.bundle.cmake @@ -68,9 +68,9 @@ foreach (f3d_resource_dir IN LISTS f3d_resource_dirs) endforeach () # Individual files to package -install( - FILES "${superbuild_install_location}/share/man/man1/f3d.1.gz" - DESTINATION "share/man/man1") +#install( +# FILES "${superbuild_install_location}/share/man/man1/f3d.1.gz" +# DESTINATION "share/man/man1") ## Package libf3d SDK From bbcf999daf5750b20701d90a145ce4dddbd66f71 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Aug 2024 07:59:50 +0200 Subject: [PATCH 03/12] updating superbuild --- superbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superbuild b/superbuild index 8ade4b65..a166a037 160000 --- a/superbuild +++ b/superbuild @@ -1 +1 @@ -Subproject commit 8ade4b6511fe0f5a294676630f02c149d1467064 +Subproject commit a166a03701c0bff98414f74d0c39a9fd0484f2f8 From a093e303e72cdc0d595e37ab5176aa051ba3905c Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Aug 2024 08:04:54 +0200 Subject: [PATCH 04/12] new cache --- .github/actions/f3d-superbuild/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/f3d-superbuild/action.yml b/.github/actions/f3d-superbuild/action.yml index 6ab0630b..9aa94cef 100644 --- a/.github/actions/f3d-superbuild/action.yml +++ b/.github/actions/f3d-superbuild/action.yml @@ -46,8 +46,8 @@ runs: uses: actions/cache@v4 with: path: ${{env.SCCACHE_CACHE}} - key: sccache-cache-${{inputs.raytracing_label}}-${{runner.os}}-${{inputs.cpu}}-0-${{env.DATE_STRING}} - restore-keys: sccache-cache-${{inputs.raytracing_label}}-${{runner.os}}-${{inputs.cpu}}-0 + key: sccache-cache-${{inputs.raytracing_label}}-${{runner.os}}-${{inputs.cpu}}-1-${{env.DATE_STRING}} + restore-keys: sccache-cache-${{inputs.raytracing_label}}-${{runner.os}}-${{inputs.cpu}}-1 - name: Start sccache shell: bash From 327b660dda6b00cbae2fa9eebfb95a9c903222b7 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Aug 2024 08:08:05 +0200 Subject: [PATCH 05/12] cache too --- .github/actions/wheels/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/wheels/action.yml b/.github/actions/wheels/action.yml index f404aeb1..1412c0e6 100644 --- a/.github/actions/wheels/action.yml +++ b/.github/actions/wheels/action.yml @@ -41,7 +41,7 @@ runs: uses: actions/cache@v4 with: path: fsbb/install - key: fsbb-${{runner.os}}-${{env.VTK_COMMIT_SHA}}-0 + key: fsbb-${{runner.os}}-${{env.VTK_COMMIT_SHA}}-1 - name: Setup Ninja Windows if: runner.os == 'Windows' From 687a333f11676d49a87714a0bfb04d5ab31b730a Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Aug 2024 11:48:44 +0200 Subject: [PATCH 06/12] older vtk version --- .github/actions/f3d-superbuild/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/f3d-superbuild/action.yml b/.github/actions/f3d-superbuild/action.yml index 9aa94cef..2a5234e2 100644 --- a/.github/actions/f3d-superbuild/action.yml +++ b/.github/actions/f3d-superbuild/action.yml @@ -76,7 +76,7 @@ runs: shell: bash run: | curl -L --output vtk_commit_sha https://raw.githubusercontent.com/f3d-app/f3d/master/.github/actions/vtk_commit_sha - echo VTK_COMMIT_SHA=`cat ./vtk_commit_sha` >> $GITHUB_ENV + echo VTK_COMMIT_SHA=99d37deecc7daa8ea3602415a0aae5d166229599 >> $GITHUB_ENV # OCCT coloring is disabled on macOS because of f3d-app/f3d#792 - name: Configure From e894d5244499d2d7e53ae3b0919087c1ea26d9f2 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Aug 2024 16:17:02 +0200 Subject: [PATCH 07/12] 7b6fc60fef640d069c4d999e0c23b1d3c00ed791 --- .github/actions/f3d-superbuild/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/f3d-superbuild/action.yml b/.github/actions/f3d-superbuild/action.yml index 2a5234e2..d5d02999 100644 --- a/.github/actions/f3d-superbuild/action.yml +++ b/.github/actions/f3d-superbuild/action.yml @@ -46,8 +46,8 @@ runs: uses: actions/cache@v4 with: path: ${{env.SCCACHE_CACHE}} - key: sccache-cache-${{inputs.raytracing_label}}-${{runner.os}}-${{inputs.cpu}}-1-${{env.DATE_STRING}} - restore-keys: sccache-cache-${{inputs.raytracing_label}}-${{runner.os}}-${{inputs.cpu}}-1 + key: sccache-cache-${{inputs.raytracing_label}}-${{runner.os}}-${{inputs.cpu}}-0-${{env.DATE_STRING}} + restore-keys: sccache-cache-${{inputs.raytracing_label}}-${{runner.os}}-${{inputs.cpu}}-0 - name: Start sccache shell: bash @@ -76,7 +76,7 @@ runs: shell: bash run: | curl -L --output vtk_commit_sha https://raw.githubusercontent.com/f3d-app/f3d/master/.github/actions/vtk_commit_sha - echo VTK_COMMIT_SHA=99d37deecc7daa8ea3602415a0aae5d166229599 >> $GITHUB_ENV + echo VTK_COMMIT_SHA=7b6fc60fef640d069c4d999e0c23b1d3c00ed791 >> $GITHUB_ENV # OCCT coloring is disabled on macOS because of f3d-app/f3d#792 - name: Configure From aaacb31d1e94dac67ddec9c08875fb0dcc758f97 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Aug 2024 16:42:18 +0200 Subject: [PATCH 08/12] 090fee41018cc78706319173ad0346f068c71d5a --- .github/actions/f3d-superbuild/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/f3d-superbuild/action.yml b/.github/actions/f3d-superbuild/action.yml index d5d02999..09deefe4 100644 --- a/.github/actions/f3d-superbuild/action.yml +++ b/.github/actions/f3d-superbuild/action.yml @@ -76,7 +76,7 @@ runs: shell: bash run: | curl -L --output vtk_commit_sha https://raw.githubusercontent.com/f3d-app/f3d/master/.github/actions/vtk_commit_sha - echo VTK_COMMIT_SHA=7b6fc60fef640d069c4d999e0c23b1d3c00ed791 >> $GITHUB_ENV + echo VTK_COMMIT_SHA=090fee41018cc78706319173ad0346f068c71d5a >> $GITHUB_ENV # OCCT coloring is disabled on macOS because of f3d-app/f3d#792 - name: Configure From 3b8ee1f284bd39ff50b7b2c7f3566527a6002252 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Aug 2024 17:16:39 +0200 Subject: [PATCH 09/12] d06894bdeb457e9e4a2c826c5b242eabf842e602 --- .github/actions/f3d-superbuild/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/f3d-superbuild/action.yml b/.github/actions/f3d-superbuild/action.yml index 09deefe4..da841978 100644 --- a/.github/actions/f3d-superbuild/action.yml +++ b/.github/actions/f3d-superbuild/action.yml @@ -76,7 +76,7 @@ runs: shell: bash run: | curl -L --output vtk_commit_sha https://raw.githubusercontent.com/f3d-app/f3d/master/.github/actions/vtk_commit_sha - echo VTK_COMMIT_SHA=090fee41018cc78706319173ad0346f068c71d5a >> $GITHUB_ENV + echo VTK_COMMIT_SHA=d06894bdeb457e9e4a2c826c5b242eabf842e602 >> $GITHUB_ENV # OCCT coloring is disabled on macOS because of f3d-app/f3d#792 - name: Configure From c1c3011df2484a902528a83a763e3b68b336885a Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Aug 2024 17:51:39 +0200 Subject: [PATCH 10/12] 4df0f81205e14a0ef9190a70605fde2b26297b06 --- .github/actions/f3d-superbuild/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/f3d-superbuild/action.yml b/.github/actions/f3d-superbuild/action.yml index da841978..c0c2f430 100644 --- a/.github/actions/f3d-superbuild/action.yml +++ b/.github/actions/f3d-superbuild/action.yml @@ -76,7 +76,7 @@ runs: shell: bash run: | curl -L --output vtk_commit_sha https://raw.githubusercontent.com/f3d-app/f3d/master/.github/actions/vtk_commit_sha - echo VTK_COMMIT_SHA=d06894bdeb457e9e4a2c826c5b242eabf842e602 >> $GITHUB_ENV + echo VTK_COMMIT_SHA=4df0f81205e14a0ef9190a70605fde2b26297b06 >> $GITHUB_ENV # OCCT coloring is disabled on macOS because of f3d-app/f3d#792 - name: Configure From ef1acbd18f811a4ac277e1982bcd3540ec1b025a Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Aug 2024 18:21:09 +0200 Subject: [PATCH 11/12] d8a009f7472d82c5e62248c75cc9a99ad13ec72d --- .github/actions/f3d-superbuild/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/f3d-superbuild/action.yml b/.github/actions/f3d-superbuild/action.yml index c0c2f430..4923876b 100644 --- a/.github/actions/f3d-superbuild/action.yml +++ b/.github/actions/f3d-superbuild/action.yml @@ -76,7 +76,7 @@ runs: shell: bash run: | curl -L --output vtk_commit_sha https://raw.githubusercontent.com/f3d-app/f3d/master/.github/actions/vtk_commit_sha - echo VTK_COMMIT_SHA=4df0f81205e14a0ef9190a70605fde2b26297b06 >> $GITHUB_ENV + echo VTK_COMMIT_SHA=d8a009f7472d82c5e62248c75cc9a99ad13ec72d >> $GITHUB_ENV # OCCT coloring is disabled on macOS because of f3d-app/f3d#792 - name: Configure From 4b19398603f8bcb17736dd269432d8e8845dab47 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Aug 2024 18:54:22 +0200 Subject: [PATCH 12/12] 48677f5358519ca59d6269613e0c57e75da77020 --- .github/actions/f3d-superbuild/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/f3d-superbuild/action.yml b/.github/actions/f3d-superbuild/action.yml index 4923876b..2e3f6954 100644 --- a/.github/actions/f3d-superbuild/action.yml +++ b/.github/actions/f3d-superbuild/action.yml @@ -76,7 +76,7 @@ runs: shell: bash run: | curl -L --output vtk_commit_sha https://raw.githubusercontent.com/f3d-app/f3d/master/.github/actions/vtk_commit_sha - echo VTK_COMMIT_SHA=d8a009f7472d82c5e62248c75cc9a99ad13ec72d >> $GITHUB_ENV + echo VTK_COMMIT_SHA=48677f5358519ca59d6269613e0c57e75da77020 >> $GITHUB_ENV # OCCT coloring is disabled on macOS because of f3d-app/f3d#792 - name: Configure