Changeset e01bfbc


Ignore:
Timestamp:
Jun 3, 2016, 1:12:02 PM (7 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:
10a7775
Parents:
2edd5502 (diff), aec9a67 (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' into ctor

Files:
12 edited

Legend:

Unmodified
Added
Removed

  • Jenkinsfile

    r2edd5502 re01bfbc  
    11
     2//===========================================================================================================
     3// Main compilation routine
     4//===========================================================================================================
     5//Compilation script is done here but environnement set-up and error handling is done in main loop
     6def cfa_build() {
     7        build_stage 'Checkout'
     8                def install_dir = pwd tmp: true
     9                //checkout the source code and clean the repo
     10                sh "rm -rf * ${install_dir}/*"
     11                checkout scm
    212
     13        build_stage 'Build'
     14
     15                //Configure the conpilation (Output is not relevant)
     16                //Use the current directory as the installation target so nothing
     17                //escapes the sandbox
     18                //Also specify the compiler by hand
     19                sh "./configure CXX=${currentCC.cpp_cc} --with-backend-compiler=${currentCC.cfa_backend_cc} --prefix=${install_dir} > /dev/null"
     20
     21                //Compile the project
     22                sh 'make -j 8 install'
     23
     24        build_stage 'Test'
     25
     26                //Run the tests from the example directory
     27                dir ('src/examples') {
     28                        sh './runTests.sh'
     29                }
     30
     31        build_stage 'Cleanup'
     32
     33                //Cleanup the install dir
     34                sh "rm -rf ${install_dir}/*"
     35}
     36
     37//===========================================================================================================
     38// Helper classes/variables/routines to make the status and stage name easier to use
     39//===========================================================================================================
     40//Description of a compiler (Must be serializable since pipelines are persistent)
     41class CC_Desc implements Serializable {
     42        public String cc_name
     43        public String cpp_cc
     44        public String cfa_backend_cc
     45
     46        CC_Desc(String cc_name, String cpp_cc, String cfa_backend_cc) {
     47                this.cc_name = cc_name
     48                this.cpp_cc = cpp_cc
     49                this.cfa_backend_cc = cfa_backend_cc
     50        }
     51}
     52
     53//Global Variables defining the compiler and at which point in the build we are
     54// These variables are used but can't be declared before hand because of wierd scripting rules
     55// @Field String currentCC
     56// @Field String status_prefix
     57
     58//Wrapper to sync stage name and status name
     59def build_stage(String name) {
     60        def stage_name = "${currentCC.cc_name} ${name}".trim()
     61        stage stage_name
     62
     63                status_prefix = stage_name
     64}
     65
     66//===========================================================================================================
     67// Main loop of the compilation
     68//===========================================================================================================
    369node ('master'){
    470
    571        def err = null
    6         def stage_name
    772        def log_needed = false
    873        currentBuild.result = "SUCCESS"
    974
    1075        try {
     76                // //Prevent the build from exceeding 30 minutes
     77                // timeout(30) {
     78                //
     79                //      //Wrap build to add timestamp to command line
     80                //      wrap([$class: 'TimestamperBuildWrapper']) {
    1181
    12                 stage 'Checkout'
     82                                //Compile using gcc-4.9
     83                                currentCC = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
     84                                cfa_build()
    1385
    14                         //checkout the source code and clean the repo
    15                         checkout scm
    16                         sh 'git clean -dfq'
     86                //      }
     87                // }
    1788
    18                 stage 'Build'
    19 
    20                         stage_name = 'Build'
    21 
    22                         //Clean the directory (Output is not relevant)
    23                         sh 'make clean > /dev/null'
    24 
    25                         //Configure the conpilation (Output is not relevant)
    26                         //Use the current directory as the installation target so nothing
    27                         //escapes the sandbox
    28                         //Also specify the compiler by hand
    29                         def install_dir = pwd tmp: true
    30                         sh "CC=gcc-4.9 CXX=g++-4.9 ./configure --prefix=${install_dir} > /dev/null"
    31 
    32                         //Compile the project
    33                         sh 'make -j 8 install'
    34 
    35                 stage 'Test'
    36 
    37                         stage_name = 'Test'
    38 
    39                         dir ('src/examples') {
    40                                 sh './runTests.sh'
    41                         }
    42 
    43                 stage 'Cleanup'
    44 
    45                         //install doesn't need to be cleaned since prefix uses temporary workspace
    4689        }
    4790
     91        //If an exception is caught we need to change the status and remember to
     92        //attach the build log to the email
    4893        catch (Exception caughtError) {
     94                //rethrow error later
    4995                err = caughtError
     96
     97                //An error has occured, the build log is relevent
    5098                log_needed = true
    51                 currentBuild.result = "FAILURE"
    5299
    53                 switch(stage_name) {
    54                         case 'Test' :
    55                                 currentBuild.result = "TEST FAILURE"
    56                                 break
    57                         default :
    58                                 break
    59                 }
     100                //Store the result of the build log
     101                currentBuild.result = "${status_prefix} FAILURE".trim()
    60102        }
    61103
    … …  
    71113}
    72114
     115//===========================================================================================================
     116//Routine responsible of sending the email notification once the build is completed
     117//===========================================================================================================
    73118def email(String status, boolean log) {
    74119        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
    … …  
    76121        def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
    77122
    78         def email_subject = "[${project_name} git] UNNAMED PROJECT branch ${env.BRANCH_NAME} - Build # ${env.BUILD_NUMBER} - ${status}!"
    79         def email_body = """    This is an automated email from the Jenkins build machine. It was
    80         generated because of a git hooks/post-receive script following
    81         a ref change was pushed to the repository containing
    82         the project "UNNAMED PROJECT".
     123        def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${status}] - branch ${env.BRANCH_NAME}"
     124        def email_body = """This is an automated email from the Jenkins build machine. It was
     125generated because of a git hooks/post-receive script following
     126a ref change was pushed to the repository containing
     127the project "UNNAMED PROJECT".
    83128
    84         The branch ${env.BRANCH_NAME} has been updated.
     129The branch ${env.BRANCH_NAME} has been updated.
    85130
    86         Check console output at ${env.BUILD_URL} to view the results."""
     131Check console output at ${env.BUILD_URL} to view the results."""
    87132
    88133        // def config = new File('/u/cforall/software/cfa/cfa-cc/config').text

  • Makefile.in

    r2edd5502 re01bfbc  
    118118CC = @CC@
    119119CCDEPMODE = @CCDEPMODE@
     120CFA_BACKEND_CC = @CFA_BACKEND_CC@
    120121CFA_BINDIR = @CFA_BINDIR@
    121122CFA_INCDIR = @CFA_INCDIR@
    … …  
    136137EGREP = @EGREP@
    137138EXEEXT = @EXEEXT@
    138 GCC_PATH = @GCC_PATH@
    139139GREP = @GREP@
    140140INSTALL = @INSTALL@

  • config.h.in

    r2edd5502 re01bfbc  
    11/* config.h.in.  Generated from configure.ac by autoheader.  */
     2
     3/* Location of include files. */
     4#undef CFA_BACKEND_CC
    25
    36/* Location of cfa command. */
    … …  
    2023/* Define to 1 if using `alloca.c'. */
    2124#undef C_ALLOCA
    22 
    23 /* Path/name of C compiler. */
    24 #undef GCC_PATH
    2525
    2626/* Define to 1 if you have `alloca', as a function or macro. */

  • configure

    r2edd5502 re01bfbc  
    643643CFA_INCDIR
    644644CFA_PREFIX
     645CFA_BACKEND_CC
    645646BACKEND_CC
    646 GCC_PATH
    647647MAINT
    648648MAINTAINER_MODE_FALSE
    … …  
    29222922# Check whether --with-backend-compiler was given.
    29232923if test "${with_backend_compiler+set}" = set; then :
    2924   withval=$with_backend_compiler; backcompiler=$withval
    2925 else
    2926   backcompiler=""
    2927 fi
    2928 
    2929   if test x$backcompiler != x; then
    2930         cat >>confdefs.h <<_ACEOF
    2931 #define GCC_PATH "${backcompiler}"
    2932 _ACEOF
    2933 
    2934         BACKEND_CC=${backcompiler}
    2935   else
     2924  withval=$with_backend_compiler; backendcompiler=$withval
     2925else
     2926  backendcompiler=""
     2927fi
     2928
     2929if test "x$backendcompiler" != x; then
     2930        BACKEND_CC=${backendcompiler}
     2931else
    29362932        # Extract the first word of "gcc", so it can be a program name with args.
    29372933set dummy gcc; ac_word=$2
    29382934{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    29392935$as_echo_n "checking for $ac_word... " >&6; }
    2940 if ${ac_cv_path_GCC_PATH+:} false; then :
     2936if ${ac_cv_path_BACKEND_CC+:} false; then :
    29412937  $as_echo_n "(cached) " >&6
    29422938else
    2943   case $GCC_PATH in
     2939  case $BACKEND_CC in
    29442940  [\\/]* | ?:[\\/]*)
    2945   ac_cv_path_GCC_PATH="$GCC_PATH" # Let the user override the test with a path.
     2941  ac_cv_path_BACKEND_CC="$BACKEND_CC" # Let the user override the test with a path.
    29462942  ;;
    29472943  *)
    … …  
    29532949    for ac_exec_ext in '' $ac_executable_extensions; do
    29542950  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2955     ac_cv_path_GCC_PATH="$as_dir/$ac_word$ac_exec_ext"
     2951    ac_cv_path_BACKEND_CC="$as_dir/$ac_word$ac_exec_ext"
    29562952    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    29572953    break 2
    … …  
    29612957IFS=$as_save_IFS
    29622958
    2963   test -z "$ac_cv_path_GCC_PATH" && ac_cv_path_GCC_PATH="N/A"
    29642959  ;;
    29652960esac
    29662961fi
    2967 GCC_PATH=$ac_cv_path_GCC_PATH
    2968 if test -n "$GCC_PATH"; then
    2969   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_PATH" >&5
    2970 $as_echo "$GCC_PATH" >&6; }
     2962BACKEND_CC=$ac_cv_path_BACKEND_CC
     2963if test -n "$BACKEND_CC"; then
     2964  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BACKEND_CC" >&5
     2965$as_echo "$BACKEND_CC" >&6; }
    29712966else
    29722967  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    … …  
    29752970
    29762971
    2977         if test "$GCC_PATH" = "N/A"; then
     2972        if test "x$BACKEND_CC" = "x"; then
    29782973                as_fn_error $? "some version of gcc is needed. Get it at ftp://ftp.gnu.org" "$LINENO" 5
    29792974                exit 1
    29802975        fi
     2976fi
    29812977
    29822978cat >>confdefs.h <<_ACEOF
    2983 #define GCC_PATH "${GCC_PATH}"
    2984 _ACEOF
    2985 
    2986         BACKEND_CC=${GCC_PATH}
    2987   fi
     2979#define CFA_BACKEND_CC "${BACKEND_CC}"
     2980_ACEOF
     2981
    29882982
    29892983

  • configure.ac

    r2edd5502 re01bfbc  
    2020
    2121AC_ARG_WITH(backend-compiler,
    22             [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
    23             backcompiler=$withval, backcompiler="")
    24   if test x$backcompiler != x; then
    25         AC_DEFINE_UNQUOTED(GCC_PATH, "${backcompiler}")
    26         BACKEND_CC=${backcompiler}
    27   else
    28         AC_PATH_PROG(GCC_PATH, gcc, N/A)
    29         if test "$GCC_PATH" = "N/A"; then
     22        [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
     23        backendcompiler=$withval, backendcompiler="")
     24if test "x$backendcompiler" != x; then
     25        BACKEND_CC=${backendcompiler}
     26else
     27        AC_PATH_PROG(BACKEND_CC, gcc, [])
     28        if test "x$BACKEND_CC" = "x"; then
    3029                AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
    3130                exit 1
    3231        fi
    33         AC_DEFINE_UNQUOTED(GCC_PATH, "${GCC_PATH}", [Path/name of C compiler.])
    34         BACKEND_CC=${GCC_PATH}
    35   fi
    36 AC_SUBST(BACKEND_CC)
     32fi
     33AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
     34AC_SUBST(CFA_BACKEND_CC)
    3735
    3836if test "x$prefix" = "xNONE"; then

  • src/Makefile.in

    r2edd5502 re01bfbc  
    240240CC = @CC@
    241241CCDEPMODE = @CCDEPMODE@
     242CFA_BACKEND_CC = @CFA_BACKEND_CC@
    242243CFA_BINDIR = @CFA_BINDIR@
    243244CFA_INCDIR = @CFA_INCDIR@
    … …  
    258259EGREP = @EGREP@
    259260EXEEXT = @EXEEXT@
    260 GCC_PATH = @GCC_PATH@
    261261GREP = @GREP@
    262262INSTALL = @INSTALL@

  • src/driver/Makefile.in

    r2edd5502 re01bfbc  
    8080CC = @CC@
    8181CCDEPMODE = @CCDEPMODE@
     82CFA_BACKEND_CC = @CFA_BACKEND_CC@
    8283CFA_BINDIR = @CFA_BINDIR@
    8384CFA_INCDIR = @CFA_INCDIR@
    … …  
    9899EGREP = @EGREP@
    99100EXEEXT = @EXEEXT@
    100 GCC_PATH = @GCC_PATH@
    101101GREP = @GREP@
    102102INSTALL = @INSTALL@

  • src/driver/cc1.cc

    r2edd5502 re01bfbc  
    1010// Created On       : Fri Aug 26 14:23:51 2005
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu May  5 16:04:30 2016
    13 // Update Count     : 77
     12// Last Modified On : Thu Jun  2 17:24:26 2016
     13// Update Count     : 79
    1414//
    1515
    … …  
    3030
    3131
    32 string compiler_name( GCC_PATH );                                               // path/name of C compiler
     32string compiler_name( CFA_BACKEND_CC );                                 // path/name of C compiler
    3333
    3434string D__GCC_BPREFIX__( "-D__GCC_BPREFIX__=" );

  • src/driver/cfa.cc

    r2edd5502 re01bfbc  
    1010// Created On       : Tue Aug 20 13:44:49 2002
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Apr 20 18:31:28 2016
    13 // Update Count     : 133
     12// Last Modified On : Thu Jun  2 17:24:25 2016
     13// Update Count     : 137
    1414//
    1515
    … …  
    7575        string langstd;                                                                         // language standard
    7676
    77         string compiler_path( GCC_PATH );                                       // path/name of C compiler
     77        string compiler_path( CFA_BACKEND_CC );                         // path/name of C compiler
    7878        string compiler_name;                                                           // name of C compiler
    7979
    … …  
    317317                nargs += 1;
    318318        } else {
    319                 cerr << argv[0] << " error, compiler " << compiler_name << " not supported." << endl;
     319                cerr << argv[0] << " error, compiler \"" << compiler_name << "\" unsupported." << endl;
    320320                exit( EXIT_FAILURE );
    321321        } // if

  • src/examples/Makefile.in

    r2edd5502 re01bfbc  
    8686CC = @CFA_BINDIR@/cfa
    8787CCDEPMODE = @CCDEPMODE@
     88CFA_BACKEND_CC = @CFA_BACKEND_CC@
    8889CFA_BINDIR = @CFA_BINDIR@
    8990CFA_INCDIR = @CFA_INCDIR@
    … …  
    106107EGREP = @EGREP@
    107108EXEEXT = @EXEEXT@
    108 GCC_PATH = @GCC_PATH@
    109109GREP = @GREP@
    110110INSTALL = @INSTALL@

  • src/libcfa/Makefile.in

    r2edd5502 re01bfbc  
    113113CC = ${abs_top_srcdir}/src/driver/cfa
    114114CCDEPMODE = @CCDEPMODE@
     115CFA_BACKEND_CC = @CFA_BACKEND_CC@
    115116CFA_BINDIR = @CFA_BINDIR@
    116117CFA_INCDIR = @CFA_INCDIR@
    … …  
    131132EGREP = @EGREP@
    132133EXEEXT = @EXEEXT@
    133 GCC_PATH = @GCC_PATH@
    134134GREP = @GREP@
    135135INSTALL = @INSTALL@

  • src/libcfa/iostream.c

    r2edd5502 re01bfbc  
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed May 27 17:56:53 2015
    11 // Last Modified By : Rob Schluntz
    12 // Last Modified On : Mon May 02 15:13:55 2016
    13 // Update Count     : 302
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Thu May 26 10:08:31 2016
     13// Update Count     : 305
    1414//
    1515
    … …  
    2121#include <float.h>                                                                              // DBL_DIG, LDBL_DIG
    2222#include <complex.h>                                                                    // creal, cimag
    23 #include <ctype.h>                                                                              // isspace, ispunct
    2423}
    2524
    … …  
    336335} // ?|?
    337336
    338 _Istream_cstrUC cstr( char * str ) { _Istream_cstrUC s = { str }; return s; }
     337_Istream_cstrUC cstr( char * str ) { return (_Istream_cstrUC){ str }; }
    339338forall( dtype istype | istream( istype ) )
    340339istype * ?|?( istype * is, _Istream_cstrUC cstr ) {
    … …  
    343342} // cstr
    344343
    345 _Istream_cstrC cstr( char * str, int size ) { _Istream_cstrC s = { str, size }; return s; }
     344_Istream_cstrC cstr( char * str, int size ) { return (_Istream_cstrC){ str, size }; }
    346345forall( dtype istype | istream( istype ) )
    347346istype * ?|?( istype * is, _Istream_cstrC cstr ) {
Note: See TracChangeset for help on using the changeset viewer.