Changes in / [65240bb:302d84c2]

Files:

• Jenkinsfile (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)

Jenkinsfile

@@ -106 +106 @@
 
 def build() {
-        build_stage('Build', true) {
+        // build_stage('Build', true) {
+        //      // Build outside of the src tree to ease cleaning
+        //      dir (BuildDir) {
+        //              //Configure the conpilation (Output is not relevant)
+        //              //Use the current directory as the installation target so nothing escapes the sandbox
+        //              //Also specify the compiler by hand
+        //              targets=""
+        //              if( Settings.RunAllTests || Settings.RunBenchmark ) {
+        //                      targets="--with-target-hosts='host:debug,host:nodebug'"
+        //              } else {
+        //                      targets="--with-target-hosts='host:debug'"
+        //              }
+
+        //              sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
+
+        //              //Compile the project
+        //              sh 'make -j 8 --no-print-directory'
+        //      }
+        // }
+
+        debug = true
+        release = Settings.RunAllTests || Settings.RunBenchmark
+        build_stage('Build : configure', true) {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -121 +143 @@
                         sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
 
-                        //Compile the project
-                        sh 'make -j 8 --no-print-directory'
+                        // Configure libcfa
+                        sh 'make -j 8 --no-print-directory configure-libcfa'
+                }
+        }
+
+        build_stage('Build : cfa-cpp', true) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        // Build driver
+                        sh 'make -j 8 --no-print-directory -C driver'
+
+                        // Build translator
+                        sh 'make -j 8 --no-print-directory -C src'
+                }
+        }
+
+        build_stage('Build : libcfa(debug)', debug) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        sh "make -j 8 --no-print-directory -C libcfa/${Settings.Architecture.name}-debug"
+                }
+        }
+
+        build_stage('Build : libcfa(nodebug)', release) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        sh "make -j 8 --no-print-directory -C libcfa/${Settings.Architecture.name}-nodebug"
                 }
         }

Makefile.am

@@ -40 +40 @@
         $(MAKE) -C tests all-tests installed=yes debug=${debug}
 
+configure-libcfa: @LIBCFA_TARGET_MAKEFILES@
+        @true
+
 status: @LIBCFA_TARGET_MAKEFILES@
         @echo -ne "translator\n\t"

Makefile.in

@@ -940 +940 @@
         $(MAKE) -C tests all-tests installed=yes debug=${debug}
 
+configure-libcfa: @LIBCFA_TARGET_MAKEFILES@
+        @true
+
 status: @LIBCFA_TARGET_MAKEFILES@
         @echo -ne "translator\n\t"