Merge topic 'ci-orangec'

552e1688f3 ci: Add OrangeC 7.0.7 nightly CI job
0e71175e6a Tests/ExternalProjectLocal: Fix example project compilation with OrangeC 7
d3c05d3037 Tests/RunCMake/CMP0119: Update for OrangeC 7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11870

.gitlab-ci.yml

@@ -1534,6 +1534,18 @@ t:windows-orangec6.73.8:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
+t:windows-orangec7.0.7:
+    extends:
+        - .windows_orangec7.0.7
+        - .cmake_test_windows_external
+        - .windows_x86_64_tags_concurrent
+        - .cmake_junit_artifacts
+        - .rules
+    needs:
+        - t:windows-vs2026-x64-ninja
+    variables:
+        CMAKE_CI_JOB_NIGHTLY: "true"
+
 # Windows arm64 jobs
 
 b:windows-arm64-vs2026-ninja:

.gitlab/ci/configure_windows_orangec7.0.7.cmake

@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_orangec_common.cmake")

.gitlab/ci/ctest_exclusions.cmake

@@ -49,6 +49,13 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "^macos_x86_64_")
     )
 endif()
 
+if ("$ENV{CMAKE_CONFIGURATION}" MATCHES [[windows_orangec7\.0\.7]])
+  list(APPEND test_exclusions
+    # FIXME(OrangeC#1136): OrangeC 7 no longer fails when linking a missing library
+    "^RunCMake.CheckModules$"
+    )
+endif()
+
 if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows_clang_fastbuild")
   list(APPEND test_exclusions
     # FIXME(#27697): These fail with clang-cl and FASTBuild.

.gitlab/ci/env_windows_orangec7.0.7.ps1

@@ -0,0 +1,2 @@
+. .gitlab/ci/ninja-env.ps1
+. .gitlab/ci/orangec-env.ps1

.gitlab/ci/orangec.ps1

@@ -1,6 +1,11 @@
 $erroractionpreference = "stop"
 
-if ("$env:CMAKE_CONFIGURATION".Contains("orangec6.73.8")) {
+if ("$env:CMAKE_CONFIGURATION".Contains("orangec7.0.7")) {
+    # OrangeC 7.0.7
+    $archive = "ZippedBinaries707.zip"
+    $release = "v7.0.7"
+    $sha256sum = "853DDE0F4819E65E3EC8F94F67C88C07062F3736BF534D2834FDEFCCE3A0B598"
+} elseif ("$env:CMAKE_CONFIGURATION".Contains("orangec6.73.8")) {
     # OrangeC 6.73.8
     $archive = "ZippedBinaries6738.zip"
     $release = "Orange-C-v6.73.1" # release numbering seems mismatched

.gitlab/os-windows.yml

@@ -319,6 +319,12 @@
     variables:
         CMAKE_CONFIGURATION: windows_orangec6.73.8
 
+.windows_orangec7.0.7:
+    extends: .windows_orangec
+
+    variables:
+        CMAKE_CONFIGURATION: windows_orangec7.0.7
+
 .windows_arm64_vs2026:
     extends: .windows
 

Tests/ExternalProjectLocal/Step5/MathFunctions/MakeTable.cxx

@@ -22,11 +22,12 @@ int main(int argc, char* argv[])
   fprintf(fout, "double sqrtTable[] = {\n");
   for (i = 0; i < 10; ++i) {
     result = sqrt(static_cast<double>(i));
-    fprintf(fout, "%g,\n", result);
+    // FIXME(OrangeC#1138): OrangeC 7 no longer accepts plain '0' as a double
+    fprintf(fout, "%.5f,\n", result);
   }
 
   // close the table with a zero
-  fprintf(fout, "0};\n");
+  fprintf(fout, "0.0};\n");
   fclose(fout);
   return 0;
 }

Tests/RunCMake/CMP0119/RunCMakeTest.cmake

@@ -12,6 +12,8 @@ if(NOT RunCMake_GENERATOR MATCHES "Visual Studio|Xcode" AND
   run_CMP0119(WARN)
   run_CMP0119(OLD)
 endif()
-if((CMAKE_C_COMPILER_ID MATCHES "(GNU|LCC|Clang|MSVC|Borland|Embarcadero|Intel|TI|OrangeC)"))
+if((CMAKE_C_COMPILER_ID MATCHES "(GNU|LCC|Clang|MSVC|Borland|Embarcadero|Intel|TI)")
+  # FIXME(OrangeC#1137): OrangeC 7 no longer accepts custom file extensions with -x
+  OR (CMAKE_C_COMPILER_ID STREQUAL "OrangeC" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 7))
   run_CMP0119(NEW)
 endif()

Tests/RunCMake/CMakeLists.txt

@@ -139,7 +139,8 @@ if(CMAKE_GENERATOR MATCHES "Ninja")
   add_RunCMake_test(CMP0116)
 endif()
 add_RunCMake_test(CMP0118)
-add_RunCMake_test(CMP0119 -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID})
+add_RunCMake_test(CMP0119 -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}
+                          -DCMAKE_C_COMPILER_VERSION=${CMAKE_C_COMPILER_VERSION})
 add_RunCMake_test(CMP0121)
 if (CMAKE_SYSTEM_NAME MATCHES "(Linux|Darwin)")
   add_RunCMake_test(CMP0125 -DCMAKE_SHARED_LIBRARY_PREFIX=${CMAKE_SHARED_LIBRARY_PREFIX}