Changeset 38bfe32a

Timestamp:

Jun 10, 2016, 3:48:44 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

a63ad80, d14d96a

Parents:

8abfdb4 (diff), afab6dc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Files:

• Jenkinsfile (modified) (8 diffs)
• doc/bibliography/cfa.bib (modified) (4 diffs)
• doc/papers/Baker82.pdf (added)
• doc/papers/Bilson.pdf (added)
• doc/papers/Bilson03.pdf (added)
• doc/papers/Cormack81.pdf (added)
• doc/papers/Ditchfield92.pdf (added)
• doc/papers/Grossman06.pdf (added)
• doc/papers/matrix.pdf (deleted)
• doc/papers/meta.pdf (deleted)
• src/libcfa/Makefile.am (modified) (2 diffs)
• src/libcfa/Makefile.in (modified) (2 diffs)

Jenkinsfile

@@ -35 +35 @@
 }
 
+def push_build() {
+        //Don't use the build_stage function which outputs the compiler
+        stage 'Push'
+
+                status_prefix = 'Push'
+
+                def out_dir = pwd tmp: true
+                sh "mkdir -p ${out_dir}"
+
+                //parse git logs to find what changed
+                sh "git remote > ${out_dir}/GIT_REMOTE"
+                git_remote = readFile("${out_dir}/GIT_REMOTE")
+                remoteDoLangExists = git_remote.contains("DoLang")
+
+                if( !remoteDoLangExists ) {
+                        sh 'git remote add DoLang git@gitlab.do-lang.org:internal/cfa-cc.git'
+                }
+
+                sh "git push DoLang ${gitRefNewValue}:master"
+}
+
 //===========================================================================================================
 // Helper classes/variables/routines to make the status and stage name easier to use
@@ -67 +88 @@
 def collect_git_info() {
 
+        //create the temporary output directory in case it doesn't already exist
         def out_dir = pwd tmp: true
+        sh "mkdir -p ${out_dir}"
+
+        //parse git logs to find what changed
         gitRefName = env.BRANCH_NAME
         dir("../${gitRefName}@script") {
@@ -82 +107 @@
 node ('master'){
 
+        boolean doPromoteBuild2DoLang
         def err = null
         def log_needed = false
@@ -96 +122 @@
                                 collect_git_info()
 
+                                properties ([                                                                   \
+                                        [$class: 'ParametersDefinitionProperty',                                \
+                                                parameterDefinitions: [                                         \
+                                                [$class: 'BooleanParameterDefinition',                          \
+                                                  defaultValue: false,                                          \
+                                                  description: 'If true, the build will be promoted to the do-lang git repository (on successful builds only)', \
+                                                  name: 'promoteBuild2DoLang'                           \
+                                                ]]                                                                      \
+                                        ]])
+
+                                doPromoteBuild2DoLang = promoteBuild2DoLang == 'true'
+
+                                echo "FULL BUILD = ${doPromoteBuild2DoLang}"
+
                                 //Compile using gcc-4.9
                                 currentCC = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
@@ -108 +148 @@
                                 cfa_build()
 
+                                if( doPromoteBuild2DoLang ) {
+                                        push_build()
+                                }
                         }
                 }
@@ -127 +170 @@
         finally {
                 //Send email with final results
-                email(currentBuild.result, log_needed)
+                notify_result(doPromoteBuild2DoLang, err, currentBuild.result, log_needed)
 
                 /* Must re-throw exception to propagate error */
@@ -139 +182 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
+def notify_result(boolean promote, Exception err, String status, boolean log) {
+        if(promote)     {
+                if( err ) {
+                        promote_email(status)
+                }
+        }
+        else {
+                email(status, log)
+        }
+}
+
+//Email notification on a full build failure
+def promote_email(String status) {
+        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
+        //Configurations for email format
+        def email_subject = "[cforall git][PROMOTE - FAILURE]"
+        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
+a ref change was pushed to the repository containing
+the project "UNNAMED PROJECT".
+
+Check console output at ${env.BUILD_URL} to view the results.
+
+- Status --------------------------------------------------------------
+
+PROMOTE FAILURE - ${status}
+"""
+
+        def email_to = "pabuhr@uwaterloo.ca, rschlunt@uwaterloo.ca, a3moss@uwaterloo.ca, tdelisle@uwaterloo.ca, brice.dobry@huawei.com"
+
+        //send email notification
+        emailext body: email_body, subject: email_subject, to: email_to, attachLog: true
+}
+
+//Standard build email notification
 def email(String status, boolean log) {
         //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
@@ -157 +235 @@
 
 The branch ${env.BRANCH_NAME} has been updated.
-         via  ${gitRefOldValue} (commit)
-        from  ${gitRefNewValue} (commit)
+   via  ${gitRefOldValue} (commit)
+  from  ${gitRefNewValue} (commit)
 
 Check console output at ${env.BUILD_URL} to view the results.

doc/bibliography/cfa.bib

@@ -356 +356 @@
 }
 
-@article{Cor:overload,
+@article{Cormack81,
     keywords    = {},
     contributer = {gjditchfield@plg},
@@ -2922 +2922 @@
     }
 }
+
+@unpublished{Bilson,
+        keywords = {generic programming, generics, polymorphism},
+        contributor  {a3moss@plg},
+        author = {Richard C. Bilson and Glen Ditchfield and Peter A. Buhr},
+        title = {Generic Programming with Inferred Models},
+}
+
 
 @article{Haskell,
@@ -4540 +4548 @@
 }
 
-@article{Bak:overload,
+@article{Baker82,
     keywords    = {compilation},
     contributer = {gjditchfield@plg},
@@ -5455 +5463 @@
 % Q
 
+@article{Grossman06,
+ keywords = {Cyclone, existential types, polymorphism, type variables},
+ contributer = {a3moss@plg},
+ author = {Grossman, Dan},
+ title = {Quantified Types in an Imperative Language},
+ journal = toplas,
+ issue_date = {May 2006},
+ volume = {28},
+ number = {3},
+ month = may,
+ year = {2006},
+ issn = {0164-0925},
+ pages = {429--475},
+ numpages = {47},
+ url = {http://doi.acm.org.proxy.lib.uwaterloo.ca/10.1145/1133651.1133653},
+ doi = {10.1145/1133651.1133653},
+ acmid = {1133653},
+ publisher = {ACM},
+ address = {New York, NY, USA},
+}
+
 @article{Hoare61,
     keywords    = {quick sort},

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue Jun  7 14:38:18 2016
-## Update Count     : 142
+## Last Modified On : Wed Jun  8 14:20:34 2016
+## Update Count     : 165
 ###############################################################################
 
@@ -54 +54 @@
 
 headers = limits stdlib math iostream fstream iterator rational
-.PRECIOUS : ${headers}                                          # stop implicit '.o' rules from removing extensionless headers
+libobjs = ${headers:=.o}
 
-#.SECONDARY : ${headers}                                        # stop implicit '.o' rules from removing extensionless headers
+# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
+% : %.c
+        @true
 
+${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp       # add dependency to cfa-cpp so all libraries are rebuilt with new translator
 
 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}

src/libcfa/Makefile.in

@@ -215 +215 @@
         ${addprefix ${libdir}/,${lib_LIBRARIES}} ${includedir}/*
 headers = limits stdlib math iostream fstream iterator rational
+libobjs = ${headers:=.o}
 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
 include_HEADERS = ${headers}
@@ -587 +588 @@
 libcfa-prelude.o : libcfa-prelude.c
         @BACKEND_CC@ -c -o $@ $<
-.SECONDARY : ${headers}                                 # stop implicit '.o' rules from removing extensionless headers
+
+# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
+% : %.c
+        @true
+
+${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp       # add dependency to cfa-cpp so all libraries are rebuilt with new translator
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.