Changeset 992c26d

Timestamp:

Jun 3, 2016, 11:07:36 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

29f4fe62

Parents:

a3e7d34

Message:

added support for specifiying compilers to use in jenkins file

File:

• Jenkinsfile (modified) (6 diffs)

Jenkinsfile

@@ -2 +2 @@
 def build() {
         build_stage 'Checkout'
-
+                def install_dir = pwd tmp: true
                 //checkout the source code and clean the repo
-                sh 'rm -rf *'
+                sh "rm -rf * ${install_dir}/*"
                 checkout scm
 
@@ -13 +13 @@
                 //escapes the sandbox
                 //Also specify the compiler by hand
-                def install_dir = pwd tmp: true
-                sh "CC=gcc-4.9 CXX=g++-4.9 ./configure --prefix=${install_dir} > /dev/null"
+                sh "./configure CXX=${currentCC.cpp-cc} --with-backend-compiler=${currentCC.cfa-backend-cc} --prefix=${install_dir} > /dev/null"
 
                 //Compile the project
@@ -32 +31 @@
 }
 
-def Compiler
+class CC_Desc {
+        String name
+        String cpp-cc
+        String cfa-backend-cc
+}
+
+def currentCC
 
 def build_stage(String name) {
-        def stage_name = "${Compiler} ${name}"
+        def stage_name = "${currentCC.name} ${name}".trim()
         stage stage_name
 
@@ -49 +54 @@
 
         try {
-                Compiler = 'gcc-4.9'
+                currentCC = ['gcc-4.9', 'g++-4.9', 'gcc-4.9'] as CC_Desc
                 build()
 
@@ -57 +62 @@
                 err = caughtError
                 log_needed = true
-                currentBuild.result = "${status_prefix} FAILURE"
+                currentBuild.result = "${status_prefix} FAILURE".trim()
         }
 
@@ -76 +81 @@
         def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
 
-        def email_subject = "[${project_name} git][BUILD - ${status}!]Build # ${env.BUILD_NUMBER} - ${env.BRANCH_NAME}"
+        def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${status}] - branch ${env.BRANCH_NAME}"
         def email_body = """This is an automated email from the Jenkins build machine. It was
 generated because of a git hooks/post-receive script following