Changeset d6a8aef


Ignore:
Timestamp:
Jun 27, 2019, 10:09:52 AM (2 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
ee6dbae
Parents:
b0ab7853 (diff), e70e54e (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 'jenkins-sandbox'

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    rb0ab7853 rd6a8aef  
    106106
    107107def build() {
    108         build_stage('Build', true) {
     108        // build_stage('Build', true) {
     109        //      // Build outside of the src tree to ease cleaning
     110        //      dir (BuildDir) {
     111        //              //Configure the conpilation (Output is not relevant)
     112        //              //Use the current directory as the installation target so nothing escapes the sandbox
     113        //              //Also specify the compiler by hand
     114        //              targets=""
     115        //              if( Settings.RunAllTests || Settings.RunBenchmark ) {
     116        //                      targets="--with-target-hosts='host:debug,host:nodebug'"
     117        //              } else {
     118        //                      targets="--with-target-hosts='host:debug'"
     119        //              }
     120
     121        //              sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
     122
     123        //              //Compile the project
     124        //              sh 'make -j 8 --no-print-directory'
     125        //      }
     126        // }
     127
     128        debug = true
     129        release = Settings.RunAllTests || Settings.RunBenchmark
     130        build_stage('Build : configure', true) {
    109131                // Build outside of the src tree to ease cleaning
    110132                dir (BuildDir) {
     
    121143                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
    122144
    123                         //Compile the project
    124                         sh 'make -j 8 --no-print-directory'
     145                        // Configure libcfa
     146                        sh 'make -j 8 --no-print-directory configure-libcfa'
     147                }
     148        }
     149
     150        build_stage('Build : cfa-cpp', true) {
     151                // Build outside of the src tree to ease cleaning
     152                dir (BuildDir) {
     153                        // Build driver
     154                        sh 'make -j 8 --no-print-directory -C driver'
     155
     156                        // Build translator
     157                        sh 'make -j 8 --no-print-directory -C src'
     158                }
     159        }
     160
     161        build_stage('Build : libcfa(debug)', debug) {
     162                // Build outside of the src tree to ease cleaning
     163                dir (BuildDir) {
     164                        sh "make -j 8 --no-print-directory -C libcfa/${Settings.Architecture.name}-debug"
     165                }
     166        }
     167
     168        build_stage('Build : libcfa(nodebug)', release) {
     169                // Build outside of the src tree to ease cleaning
     170                dir (BuildDir) {
     171                        sh "make -j 8 --no-print-directory -C libcfa/${Settings.Architecture.name}-nodebug"
    125172                }
    126173        }
  • Makefile.am

    rb0ab7853 rd6a8aef  
    4040        $(MAKE) -C tests all-tests installed=yes debug=${debug}
    4141
     42configure-libcfa: @LIBCFA_TARGET_MAKEFILES@
     43        @true
     44
    4245status: @LIBCFA_TARGET_MAKEFILES@
    4346        @echo -ne "translator\n\t"
  • Makefile.in

    rb0ab7853 rd6a8aef  
    940940        $(MAKE) -C tests all-tests installed=yes debug=${debug}
    941941
     942configure-libcfa: @LIBCFA_TARGET_MAKEFILES@
     943        @true
     944
    942945status: @LIBCFA_TARGET_MAKEFILES@
    943946        @echo -ne "translator\n\t"
Note: See TracChangeset for help on using the changeset viewer.