Merge branch 'master' into grt_via_res

Author: eder-matheus

Jenkinsfile

@@ -127,9 +127,10 @@ def getParallelTests(String image) {
                     stage('no-test Build') {
                         timeout(time: 20, unit: 'MINUTES') {
                             catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                                sh label: 'no-test Build', script: 'cmake -B build_no_tests -D ENABLE_TESTS=OFF 2>&1 | tee no_test.log';
+                                sh label: 'no-test Build', script: './etc/Build.sh -no-warnings -no-tests';
                             }
                         }
+                        sh 'mv build/openroad_build.log no_test.log'
                         archiveArtifacts artifacts: 'no_test.log';
                     }
                 }
@@ -176,11 +177,8 @@ def getParallelTests(String image) {
                         sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
                         checkout scm;
                     }
-                    stage('C++ Unit Tests Setup') {
-                        sh label: 'C++ Unit Tests Setup', script: 'cmake -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -GNinja -B build .';
-                    }
-                    stage('C++ Unit Tests') {
-                        sh label: 'C++ Unit Tests', script: 'cd build && CLICOLOR_FORCE=1 ninja build_and_test';
+                    stage('C++ Build and Unit Tests') {
+                        sh label: 'C++ Build with Ninja', script: './etc/Build.sh -no-warnings -ninja';
                     }
                 }
             }
@@ -203,7 +201,7 @@ def getParallelTests(String image) {
                         checkout scm;
                     }
                     stage('Compile with C++20') {
-                        sh label: 'Compile C++20', script: "./etc/Build.sh -no-warnings -compiler='clang-16' -cmake='-DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=20'";
+                        sh label: 'Compile C++20', script: "./etc/Build.sh -cpp20"
                     }
                 }
             }

debian/control

@@ -19,6 +19,7 @@ EOF
   numThreads=2
 fi
 cmakeOptions=""
+isNinja=no
 cleanBefore=no
 depsPrefixesFile=""
 keepLog=no
@@ -45,6 +46,9 @@ OPTIONS:
   -coverage                                     Enable cmake coverage options
   -clean                                        Remove build dir before compile
   -no-gui                                       Disable GUI support
+  -no-tests                                     Disable GTest
+  -ninja                                        Use Ninja build system
+  -cpp20                                        Use C++20 standard
   -build-man                                    Build Man Pages (optional)
   -threads=NUM_THREADS                          Number of threads to use during
                                                   compile. Default: \`nproc\` on linux
@@ -80,6 +84,16 @@ while [ "$#" -gt 0 ]; do
         -no-gui)
             cmakeOptions+=" -DBUILD_GUI=OFF"
             ;;
+        -no-tests)
+            cmakeOptions+=" -DENABLE_TESTS=OFF"
+            ;;
+        -ninja)
+            cmakeOptions+=" -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -GNinja"
+            isNinja=yes
+            ;;
+        -cpp20)
+            cmakeOptions+=" -DCMAKE_CXX_STANDARD=20"
+            ;;
         -build-man)
             cmakeOptions+=" -DBUILD_MAN=ON"
             ;;
@@ -194,5 +208,11 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 fi
 
 echo "[INFO] Using ${numThreads} threads."
+if [[ "$isNinja" == "yes" ]]; then
+    eval cmake "${cmakeOptions}" -B "${buildDir}" .
+    cd "${buildDir}"
+    CLICOLOR_FORCE=1 ninja build_and_test
+    exit 0
+fi
 eval cmake "${cmakeOptions}" -B "${buildDir}" .
 eval time cmake --build "${buildDir}" -j "${numThreads}"

debian/copyright

@@ -910,14 +910,14 @@ esac
 case "${os}" in
     "Ubuntu" )
         ubuntuVersion=$(awk -F= '/^VERSION_ID/{print $2}' /etc/os-release | sed 's/"//g')
-        if [[ ${CI} == "yes" ]]; then
-            _installCI "${ubuntuVersion}"
-        fi
         if [[ "${option}" == "base" || "${option}" == "all" ]]; then
             _checkIsLocal
             _installUbuntuPackages "${ubuntuVersion}"
             _installUbuntuCleanUp
         fi
+        if [[ ${CI} == "yes" ]]; then
+            _installCI "${ubuntuVersion}"
+        fi
         if [[ "${option}" == "common" || "${option}" == "all" ]]; then
             _installCommonDev
             # set version for non LTS