Changeset 97144e2

Timestamp:

Aug 17, 2018, 2:03:31 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

5c45fec

Parents:

94c9b810

Message:

Screw functions let's just inline the code

File:

• Jenkinsfile (modified) (1 diff)

Jenkinsfile

@@ -123 +123 @@
         public final String DescShort
 
-        def compiler_from_params(cc) {
-                switch( cc ) {
+        BuildSettings(java.util.Collections$UnmodifiableMap param, java.util.TreeMap scmVars) {
+                switch( param.Compiler ) {
                         case 'gcc-6':
-                                return new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+                                this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
                         break
                         case 'gcc-5':
-                                return new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+                                this.Compiler = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
                         break
                         case 'gcc-4.9':
-                                return new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
+                                this.Compiler = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
                         break
                         case 'clang':
-                                return new CC_Desc('clang', 'clang++', 'gcc-6')
+                                this.Compiler = new CC_Desc('clang', 'clang++', 'gcc-6')
                         break
                         default :
                                 error "Unhandled compiler : ${cc}"
                 }
-        }
-
-        def architecture_from_params( arch ) {
-                switch( arch ) {
+
+                switch( param.Architecture ) {
                         case 'x64':
-                                return new Arch_Desc('x64', '--host=x86_64')
+                                this.Architecture = new Arch_Desc('x64', '--host=x86_64')
                         break
                         case 'x86':
-                                return new Arch_Desc('x86', '--host=i386')
+                                this.Architecture = new Arch_Desc('x86', '--host=i386')
                         break
                         default :
                                 error "Unhandled architecture : ${arch}"
                 }
-        }
-
-        BuildSettings(java.util.Collections$UnmodifiableMap param, java.util.TreeMap scmVars) {
-                this.Compiler         = compiler_from_params( param.Compiler )
-                this.Architecture       = architecture_from_params( param.Architecture )
+
                 this.RunAllTests        = param.RunAllTests
                 this.RunBenchmark       = param.RunBenchmark