diff --git a/.gitlab/ci/configure_fedora39_java.cmake b/.gitlab/ci/configure_fedora39_java.cmake index 9e655296018c06adca318b8e5610b924b507b80e..14a835351ad4d1ac21c04b07e9e530838c196344 100644 --- a/.gitlab/ci/configure_fedora39_java.cmake +++ b/.gitlab/ci/configure_fedora39_java.cmake @@ -3,7 +3,7 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE) include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39.cmake") -set(MAVEN_LOCAL_NATIVE_NAME "Linux-amd64" CACHE STRING "" FORCE) +set(MAVEN_LOCAL_NATIVE_NAME "amd64-linux" CACHE STRING "" FORCE) set(VTK_GENERATE_SPDX OFF CACHE BOOL "" FORCE) set(VTK_MODULE_ENABLE_VTK_fides NO CACHE STRING "") diff --git a/.gitlab/ci/configure_macos_arm64_java.cmake b/.gitlab/ci/configure_macos_arm64_java.cmake index dea88772585e2c66a5d1101200ce9116702a065b..1d3b76f0d7e6d76a491a84f9ea527ebeab49aad2 100644 --- a/.gitlab/ci/configure_macos_arm64_java.cmake +++ b/.gitlab/ci/configure_macos_arm64_java.cmake @@ -3,7 +3,7 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE) include("${CMAKE_CURRENT_LIST_DIR}/configure_macos.cmake") -set(MAVEN_LOCAL_NATIVE_NAME "Darwin-arm64" CACHE STRING "" FORCE) +set(MAVEN_LOCAL_NATIVE_NAME "arm64-darwin" CACHE STRING "" FORCE) set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "") diff --git a/.gitlab/ci/configure_macos_x86_64_java.cmake b/.gitlab/ci/configure_macos_x86_64_java.cmake index 2f37aede563c8f182ea6295da58e994ac86fa1b7..8ded23a22f69fea3883ae8a880f13b96cbe07d61 100644 --- a/.gitlab/ci/configure_macos_x86_64_java.cmake +++ b/.gitlab/ci/configure_macos_x86_64_java.cmake @@ -3,7 +3,7 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE) include("${CMAKE_CURRENT_LIST_DIR}/configure_macos.cmake") -set(MAVEN_LOCAL_NATIVE_NAME "Darwin-amd64" CACHE STRING "" FORCE) +set(MAVEN_LOCAL_NATIVE_NAME "amd64-darwin" CACHE STRING "" FORCE) # Ensure that we're targeting 11.0. set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "") diff --git a/.gitlab/ci/configure_options.cmake b/.gitlab/ci/configure_options.cmake index af362cb2dc1f8c5710cd5e4cf9ad851c2929f868..e3f63f5d379ffb2ebd7f51e83a997087ace762f2 100644 --- a/.gitlab/ci/configure_options.cmake +++ b/.gitlab/ci/configure_options.cmake @@ -50,22 +50,30 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "java") set(BUILD_TESTING OFF CACHE BOOL "" FORCE) set(CMAKE_INSTALL_JNILIBDIR "" CACHE STRING "") set(JOGL_VERSION "2.3.2" CACHE STRING "") + # Naming is <arch-platform> since some maven versions fail to properly parse + # the artifact name when numbers are trailing in the classifer name. + set(MAVEN_NATIVE_ARTIFACTS "amd64-darwin;arm64-darwin;amd64-linux;amd64-windows" CACHE STRING "" FORCE) set(MAVEN_VTK_ARTIFACT_SUFFIX "-java${VTK_JAVA_TARGET_VERSION}" CACHE STRING "") - set(MAVEN_VTK_SNAPSHOT "-SNAPSHOT" CACHE STRING "") + # Disable snapshots for tag releases and also when the env variable + # VTK_JAVA_FORCE_RELEASE is defined through the Gitlab schedule pipeline UI. + # Note that VTK_JAVA_FORCE_RELEASE is used to create/override VTK java + # releases. + if (NOT DEFINED ENV{CI_COMMIT_TAG} AND NOT DEFINED ENV{VTK_JAVA_FORCE_RELEASE}) + set(MAVEN_VTK_SNAPSHOT "-SNAPSHOT" CACHE STRING "") + endif() set(VTK_BUILD_TESTING OFF CACHE BOOL "" FORCE) - set(VTK_DEBUG_LEAKS OFF CACHE BOOL "" FORCE) set(VTK_CUSTOM_LIBRARY_SOVERSION "" CACHE STRING "") set(VTK_CUSTOM_LIBRARY_VERSION "" CACHE STRING "") + set(VTK_DEBUG_LEAKS OFF CACHE BOOL "" FORCE) set(VTK_GROUP_ENABLE_Rendering "YES" CACHE STRING "") set(VTK_JAVA_JOGL_COMPONENT "YES" CACHE STRING "") + set(VTK_MODULE_ENABLE_VTK_RenderingOpenXR NO CACHE STRING "" FORCE) set(VTK_MODULE_ENABLE_VTK_TestingCore NO CACHE STRING "") set(VTK_MODULE_ENABLE_VTK_TestingDataModel NO CACHE STRING "") set(VTK_MODULE_ENABLE_VTK_TestingGenericBridge NO STRING STRING "") set(VTK_MODULE_ENABLE_VTK_TestingIOSQL NO CACHE STRING "") set(VTK_MODULE_ENABLE_VTK_TestingRendering NO CACHE STRING "") - set(VTK_MODULE_ENABLE_VTK_RenderingOpenXR NO CACHE STRING "" FORCE) set(VTK_VERSIONED_INSTALL "OFF" CACHE BOOL "" FORCE) - set(MAVEN_NATIVE_ARTIFACTS "Darwin-amd64;Darwin-arm64;Linux-amd64;Windows-amd64" CACHE STRING "" FORCE) endif() # qt diff --git a/.gitlab/ci/configure_windows_vs2022_java.cmake b/.gitlab/ci/configure_windows_vs2022_java.cmake index 96c3055d0b8877989e25543ce544728438cb8b3c..8405ec3c6548c9e128d101652802fafb1a5b8109 100644 --- a/.gitlab/ci/configure_windows_vs2022_java.cmake +++ b/.gitlab/ci/configure_windows_vs2022_java.cmake @@ -5,6 +5,6 @@ set(VTK_MODULE_ENABLE_VTK_vtkvtkm NO CACHE STRING "") # Java Wrap errors in wind include("${CMAKE_CURRENT_LIST_DIR}/configure_windows.cmake") -set(MAVEN_LOCAL_NATIVE_NAME "Windows-amd64" CACHE STRING "" FORCE) +set(MAVEN_LOCAL_NATIVE_NAME "amd64-windows" CACHE STRING "" FORCE) set(JOGL_GLUE "$ENV{GIT_CLONE_PATH}/.gitlab/m2/org/jogamp/gluegen/gluegen-rt/2.3.2/gluegen-rt-2.3.2.jar" CACHE FILEPATH "") set(JOGL_LIB "$ENV{GIT_CLONE_PATH}/.gitlab/m2/org/jogamp/jogl/jogl-all/2.3.2/jogl-all-2.3.2.jar" CACHE FILEPATH "")