Changes in Jenkinsfile [3b6a87c:6ebc13f]

File:

• Jenkinsfile (modified) (8 diffs)

Jenkinsfile

@@ -4 +4 @@
 // Main loop of the compilation
 //===========================================================================================================
-
-node('master') {
+node ('master'){
+
         // Globals
-        BuildDir  = null
-        SrcDir    = null
+        BuildDir  = pwd tmp: true
+        SrcDir    = pwd tmp: false
         Settings  = null
         StageName = ''
@@ -26 +26 @@
                         Settings = prepare_build()
 
-                        node(Settings.Architecture.node) {
-                                BuildDir  = pwd tmp: true
-                                SrcDir    = pwd tmp: false
-
-                                clean()
-
-                                checkout()
-
-                                notify_server(0)
-
-                                build()
-
-                                test()
-
-                                benchmark()
-
-                                build_doc()
-
-                                publish()
-                        }
+                        clean()
+
+                        checkout()
+
+                        notify_server(0)
+
+                        build()
+
+                        test()
+
+                        benchmark()
+
+                        build_doc()
+
+                        publish()
 
                         notify_server(45)
@@ -80 +75 @@
         }
 }
+
 //===========================================================================================================
 // Main compilation routines
@@ -118 +114 @@
                         }
 
-                        sh "${SrcDir}/configure CXX=${Settings.Compiler.cpp_cc} ${Settings.Architecture.flags} ${targets} --with-backend-compiler=${Settings.Compiler.cfa_cc} --quiet"
+                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
 
                         //Compile the project
@@ -239 +235 @@
 //Description of a compiler (Must be serializable since pipelines are persistent)
 class CC_Desc implements Serializable {
-        public String cc_name
-        public String cpp_cc
-        public String cfa_cc
-
-        CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
-                this.cc_name = cc_name
-                this.cpp_cc = cpp_cc
-                this.cfa_cc = cfa_cc
+        public String name
+        public String CXX
+        public String CC
+
+        CC_Desc(String name, String CXX, String CC) {
+                this.name = name
+                this.CXX = CXX
+                this.CC = CC
         }
 }
@@ -254 +250 @@
         public String name
         public String flags
-        public String node
-
-        Arch_Desc(String name, String flags, String node) {
+
+        Arch_Desc(String name, String flags) {
                 this.name  = name
                 this.flags = flags
-                this.node  = node
         }
 }
@@ -298 +292 @@
                 switch( param.Architecture ) {
                         case 'x64':
-                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
+                                this.Architecture = new Arch_Desc('x64', '--host=x86_64')
                         break
                         case 'x86':
-                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
+                                this.Architecture = new Arch_Desc('x86', '--host=i386')
                         break
                         default :
@@ -315 +309 @@
 
                 def full = param.RunAllTests ? " (Full)" : ""
-                this.DescShort = "${ this.Compiler.cc_name }:${ this.Architecture.name }${full}"
-
-                this.DescLong = """Compiler              : ${ this.Compiler.cc_name } (${ this.Compiler.cpp_cc }/${ this.Compiler.cfa_cc })
+                this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
+
+                this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
 Architecture            : ${ this.Architecture.name }
 Arc Flags               : ${ this.Architecture.flags }