Changeset 93fe3154 for Jenkinsfile

Timestamp:

Dec 13, 2018, 4:29:37 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

ca0f5e34

Parents:

95d0a5db

Message:

Update jenkins to no longer use CC

File:

• Jenkinsfile (modified) (3 diffs)

Jenkinsfile

@@ -114 +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
@@ -235 +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 CC
+        public String CXX
+
+        CC_Desc(String name, String CC, String CXX) {
+                this.name = name
+                this.CC = CC
+                this.CXX = CXX
         }
 }
@@ -309 +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 }