Merge pull request #2373 from bilke/win-logs

[Jenkins] Update library to fix log redirection on Windows.

Jenkinsfile

@@ -321,6 +321,7 @@ pipeline {
           }
           steps {
             script {
+              def num_threads = env.NUM_THREADS
               bat 'git submodule sync'
               bat 'conan remove --locks'
               // CLI + GUI
@@ -332,12 +333,13 @@ pipeline {
                   '-DOGS_BUILD_UTILS=ON ' +
                   '-DOGS_BUILD_SWMM=ON '
               }
-              build { target="tests" }
-              build { target="ctest" }
               build {
                 target="package"
                 log="build.log"
+                cmd_args="-l ${num_threads}"
               }
+              build { target="tests" }
+              build { target="ctest" }
             }
           }
           post {
@@ -350,7 +352,7 @@ pipeline {
                 excludeFile('.*\\.conan.*'), excludeFile('.*ThirdParty.*'),
                 excludeFile('.*thread.hpp')],
                 tools: [msBuild(name: 'MSVC', pattern: 'build/build.log')],
-                unstableTotalAll: 1
+                qualityGates: [[threshold: 10, type: 'TOTAL', unstable: true]]
             }
             success {
               archiveArtifacts 'build/*.zip,build/conaninfo.txt'

ProcessLib/SmallDeformation/Tests.cmake

@@ -27,7 +27,7 @@ endif()
 
 if (OGS_USE_PYTHON)
     OgsTest(PROJECTFILE Mechanics/Linear/PythonPiston/piston.prj)
-    OgsTest(PROJECTFILE Mechanics/Linear/PythonHertzContact/hertz_contact.prj)
+    OgsTest(PROJECTFILE Mechanics/Linear/PythonHertzContact/hertz_contact.prj RUNTIME 45)
 endif()
 
 if (OGS_USE_MPI)

ProcessLib/SmallDeformationNonlocal/Tests.cmake

@@ -9,7 +9,7 @@ if (NOT OGS_USE_MPI)
     OgsTest(PROJECTFILE "Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj")
     OgsTest(PROJECTFILE "Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj")
     OgsTest(PROJECTFILE "Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj" RUNTIME 14)
-    OgsTest(PROJECTFILE "Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj")
+    OgsTest(PROJECTFILE "Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj" RUNTIME 35)
     OgsTest(PROJECTFILE "Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj")
     OgsTest(PROJECTFILE "Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj" RUNTIME 38)
     OgsTest(PROJECTFILE "Mechanics/EhlersDamageNonLocal/beam/fine/beam.prj" LARGE)

scripts/cmake/CompilerSetup.cmake

@@ -3,13 +3,18 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-if(MSVC_VERSION LESS 1910 OR APPLE) # < VS 15.0; macOS: https://github.com/sakra/cotire/issues/139
+# < VS 15.0; macOS: https://github.com/sakra/cotire/issues/139
+if(MSVC_VERSION LESS 1910 OR APPLE OR ${CMAKE_CXX_COMPILER} MATCHES "clcache")
     set(OGS_USE_PCH OFF CACHE INTERNAL "")
 endif()
 if(OGS_USE_PCH)
     include(cotire) # compile time reducer
 endif()
 
+if(${CMAKE_CXX_COMPILER} MATCHES "clcache" AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+    message(WARNING "clcache does not cache in Debug config!")
+endif()
+
 # Set compiler helper variables
 if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
     set(COMPILER_IS_CLANG TRUE CACHE INTERNAL "")

scripts/cmake/ConanSetup.cmake

@@ -78,12 +78,6 @@ if(OGS_BUILD_GUI)
 endif()
 
 conan_check(VERSION 1.3.0)
-conan_add_remote(NAME ogs INDEX 0
-    URL https://ogs.jfrog.io/ogs/api/conan/conan)
-conan_add_remote(NAME conan-community INDEX 1
-    URL https://api.bintray.com/conan/conan-community/conan)
-conan_add_remote(NAME bincrafters INDEX 2
-    URL https://api.bintray.com/conan/bincrafters/public-conan)
 
 message(STATUS "Third-party libraries:")
 foreach(LIB ${OGS_LIBS})
@@ -112,6 +106,12 @@ string(TIMESTAMP timestamp "%Y.%m.%d")
 if("${file_timestamp}" VERSION_LESS ${timestamp} OR IS_CI)
     file(WRITE ${PROJECT_BINARY_DIR}/conan_install_timestamp.txt "${timestamp}\n")
     set(CONAN_UPDATE UPDATE)
+    conan_add_remote(NAME ogs INDEX 0
+        URL https://ogs.jfrog.io/ogs/api/conan/conan)
+    conan_add_remote(NAME conan-community INDEX 1
+        URL https://api.bintray.com/conan/conan-community/conan)
+    conan_add_remote(NAME bincrafters INDEX 2
+        URL https://api.bintray.com/conan/bincrafters/public-conan)
 else()
     message(STATUS "Conan: Skipping update step.")
 endif()

scripts/cmake/DocumentationSetup.cmake

@@ -49,7 +49,7 @@ doxygen_add_docs(doc
     ${PROJECT_SOURCE_DIR}/
     ${PROJECT_BINARY_DIR}/DocAux/dox)
 
-if (BASH_TOOL_PATH AND PYTHON_EXECUTABLE)
+if (BASH_TOOL_PATH AND Python_EXECUTABLE)
     set(doc_use_external_tools TRUE)
 else()
     set(doc_use_external_tools FALSE)

scripts/doc/append-xml-tags.py

-#!/usr/bin/python
+#!/usr/bin/env python3
 
 # This script augments the parameter documentation pages by information
 # such as if they are required/optional, their data typ and in which

scripts/doc/check-project-params.py

-#!/usr/bin/python
+#!/usr/bin/env python3
 
 # This script actually generates the QA page.
 # For its usage see generate-project-file-doc-qa.sh

scripts/doc/linked-xml-file.py

-#!/usr/bin/python
+#!/usr/bin/env python3
 
 # This script traverses the DATADIR (where the ctest input data is) and creates
 # out of every prj file found a file in a subdirectory of DOCAUXDIR.

scripts/doc/normalize-param-cache.py

-#!/usr/bin/python
+#!/usr/bin/env python3
 
 # This script takes the output of get-project-params.sh on stdin
 # and transforms it into a tabular representation for further

scripts/doc/print23.py

-#!/usr/bin/python
+#!/usr/bin/env python3
 
 # Print statement that behaves the same for python 2 and 3.
 # E,g, print_(1.0, 2, "5") will always print the string "1.0 2 5".