Changeset 94c9b81


Ignore:
Timestamp:
Aug 17, 2018, 2:01:19 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
97144e2
Parents:
3ad40e2
Message:

I though classes where like java...

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r3ad40e2 r94c9b81  
    8383// Helper classes/variables/routines
    8484//===========================================================================================================
     85//Description of a compiler (Must be serializable since pipelines are persistent)
     86class CC_Desc implements Serializable {
     87        public String cc_name
     88        public String cpp_cc
     89        public String cfa_cc
     90
     91        CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
     92                this.cc_name = cc_name
     93                this.cpp_cc = cpp_cc
     94                this.cfa_cc = cfa_cc
     95        }
     96}
     97
     98//Description of an architecture (Must be serializable since pipelines are persistent)
     99class Arch_Desc implements Serializable {
     100        public String name
     101        public String flags
     102
     103        Arch_Desc(String name, String flags) {
     104                this.name  = name
     105                this.flags = flags
     106        }
     107}
     108
    85109class BuildSettings implements Serializable {
    86110        public final CC_Desc Compiler
     
    99123        public final String DescShort
    100124
    101 
    102         //Description of a compiler (Must be serializable since pipelines are persistent)
    103         private class CC_Desc implements Serializable {
    104                 public String cc_name
    105                 public String cpp_cc
    106                 public String cfa_cc
    107 
    108                 CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
    109                         this.cc_name = cc_name
    110                         this.cpp_cc = cpp_cc
    111                         this.cfa_cc = cfa_cc
    112                 }
    113         }
    114 
    115         private static CC_Desc compiler_from_params(String cc) {
     125        def compiler_from_params(cc) {
    116126                switch( cc ) {
    117127                        case 'gcc-6':
     
    132142        }
    133143
    134         //Description of an architecture (Must be serializable since pipelines are persistent)
    135         private class Arch_Desc implements Serializable {
    136                 public String name
    137                 public String flags
    138 
    139                 Arch_Desc(String name, String flags) {
    140                         this.name  = name
    141                         this.flags = flags
    142                 }
    143         }
    144 
    145         private static Arch_Desc architecture_from_params( String arch ) {
     144        def architecture_from_params( arch ) {
    146145                switch( arch ) {
    147146                        case 'x64':
     
    157156
    158157        BuildSettings(java.util.Collections$UnmodifiableMap param, java.util.TreeMap scmVars) {
    159                 this.Compiler         = BuildSettings.compiler_from_params( param.Compiler )
    160                 this.Architecture       = BuildSettings.architecture_from_params( param.Architecture )
     158                this.Compiler         = compiler_from_params( param.Compiler )
     159                this.Architecture       = architecture_from_params( param.Architecture )
    161160                this.RunAllTests        = param.RunAllTests
    162161                this.RunBenchmark       = param.RunBenchmark
Note: See TracChangeset for help on using the changeset viewer.