Changes in / [a2f146ee:fde66c2]


Ignore:
Files:
1 added
23 edited

Legend:

Unmodified
Added
Removed

  • Jenkins/FullBuild

    ra2f146ee rfde66c2  
    8787
    8888        if(result.result != 'SUCCESS') {
    89                 sh("wget -q -O - ${result.absoluteUrl}/consoleText")
     89                sh("wget -q -O - http://localhost:8084/jenkins/job/Cforall/job/master/${result.number}/consoleText")
    9090                error(result.result)
    9191        }

  • Jenkinsfile

    ra2f146ee rfde66c2  
    2222        do_sendemail    = true
    2323
     24        builddir = pwd tmp: true
     25        srcdir   = pwd tmp: false
     26
    2427        currentBuild.result = "SUCCESS"
    2528
    … …  
    3235                        prepare_build()
    3336
     37                        clean()
     38
    3439                        checkout()
    3540
    … …  
    4146
    4247                        benchmark()
    43 
    44                         clean()
    4548
    4649                        build_doc()
    … …  
    6770        finally {
    6871                //Send email with final results if this is not a full build
    69                 if( do_sendemail && !bIsSandbox ) {
     72                if( do_sendemail ) {
    7073                        echo 'Notifying users of result'
    71                         email(currentBuild.result, log_needed)
     74                        email(currentBuild.result, log_needed, bIsSandbox)
    7275                }
    7376
    … …  
    155158        do_sendemail    = ! (pSilent == 'true')
    156159
     160        collect_git_info()
     161
     162        def full = do_alltests ? " (Full)" : ""
     163        currentBuild.description = "${compiler.cc_name}:${arch_name}${full}"
     164
    157165        echo """Compiler              : ${compiler.cc_name} (${compiler.cpp_cc}/${compiler.cfa_cc})
    158166Architecture            : ${arch_name}
    … …  
    164172Silent                  : ${ pSilent.toString() }
    165173"""
    166 
    167         collect_git_info()
    168174}
    169175
    … …  
    241247// Main compilation routines
    242248//===========================================================================================================
     249def clean() {
     250        build_stage('Cleanup') {
     251                // clean the build by wipping the build directory
     252                dir(builddir) {
     253                        deleteDir()
     254                }
     255
     256                //Clean all temporary files to make sure no artifacts of the previous build remain
     257                sh 'git clean -fdqx'
     258
     259                //Reset the git repo so no local changes persist
     260                sh 'git reset --hard'
     261        }
     262}
     263
    243264//Compilation script is done here but environnement set-up and error handling is done in main loop
    244265def checkout() {
    … …  
    246267                //checkout the source code and clean the repo
    247268                checkout scm
    248 
    249                 //Clean all temporary files to make sure no artifacts of the previous build remain
    250                 sh 'git clean -fdqx'
    251 
    252                 //Reset the git repo so no local changes persist
    253                 sh 'git reset --hard'
    254269        }
    255270}
    … …  
    257272def build() {
    258273        build_stage('Build') {
    259 
    260                 def install_dir = pwd tmp: true
    261 
    262274                // Build outside of the src tree to ease cleaning
    263                 sh "mkdir -p build"
    264                 dir ('build') {
     275                dir (builddir) {
    265276                        //Configure the conpilation (Output is not relevant)
    266277                        //Use the current directory as the installation target so nothing escapes the sandbox
    267278                        //Also specify the compiler by hand
    268                         sh "../configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
     279                        sh "${srcdir}/configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --enable-silent-rules --quiet"
    269280
    270281                        //Compile the project
    … …  
    277288        build_stage('Test') {
    278289
    279                 //Run the tests from the tests directory
    280                 if ( do_alltests ) {
    281                         sh 'make -C build/src/tests all-tests debug=yes --no-print-directory'
    282                         sh 'make -C build/src/tests all-tests debug=no --no-print-directory'
    283                 }
    284                 else {
    285                         sh 'make -C build/src/tests --no-print-directory'
     290                dir (builddir) {
     291                        //Run the tests from the tests directory
     292                        if ( do_alltests ) {
     293                                sh 'make --no-print-directory -C src/tests all-tests debug=yes'
     294                                sh 'make --no-print-directory -C src/tests all-tests debug=no '
     295                        }
     296                        else {
     297                                sh 'make --no-print-directory -C src/tests'
     298                        }
    286299                }
    287300        }
    … …  
    293306                if( !do_benchmark ) return
    294307
    295                 //Append bench results
    296                 sh 'make -C build/src/benchmark --no-print-directory jenkins githash=' + gitRefNewValue + ' arch=' + arch_name + ' | tee bench.json'
    297         }
    298 }
    299 
    300 def clean() {
    301         build_stage('Cleanup') {
    302                 // clean the build by wipping the build directory
    303                 sh 'rm -rf build'
     308                dir (builddir) {
     309                        //Append bench results
     310                        sh "make --no-print-directory -C src/benchmark jenkins githash=${gitRefNewValue} arch=${arch_name} | tee ${srcdir}/bench.json"
     311                }
    304312        }
    305313}
    … …  
    334342//===========================================================================================================
    335343//Standard build email notification
    336 def email(String status, boolean log) {
     344def email(String status, boolean log, boolean bIsSandbox) {
    337345        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
    338346        //Configurations for email format
    … …  
    377385        def email_to = "cforall@lists.uwaterloo.ca"
    378386
    379         //send email notification
    380         emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
    381 }
     387        if( !bIsSandbox ) {
     388                //send email notification
     389                emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
     390        } else {
     391                echo "Would send email to: ${email_to}"
     392                echo "With title: ${email_subject}"
     393                echo "Content: \n${email_body}"
     394        }
     395}

  • Makefile.in

    ra2f146ee rfde66c2  
    250250AWK = @AWK@
    251251BACKEND_CC = @BACKEND_CC@               # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
     252BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     253BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    252254CC = @CC@
    253255CCAS = @CCAS@
    … …  
    255257CCASFLAGS = @CCASFLAGS@
    256258CCDEPMODE = @CCDEPMODE@
     259CFACC = @CFACC@
     260CFACPP = @CFACPP@
    257261CFA_BACKEND_CC = @CFA_BACKEND_CC@
    258262CFA_BINDIR = @CFA_BINDIR@
    … …  
    271275DEFS = @DEFS@
    272276DEPDIR = @DEPDIR@
     277DRIVER_DIR = @DRIVER_DIR@
    273278ECHO_C = @ECHO_C@
    274279ECHO_N = @ECHO_N@

  • configure

    ra2f146ee rfde66c2  
    674674build_cpu
    675675build
     676BUILD_IN_TREE_FLAGS
     677BUILD_IN_TREE_FLAGS_NOLIB
     678CFACPP
     679CFACC
     680DRIVER_DIR
    676681CFA_LIBDIR
    677682CFA_BINDIR
    … …  
    33753380
    33763381
     3382# Create variables for commonly used targets
     3383DRIVER_DIR='$(top_builddir)/src/driver'
     3384CFACC=${DRIVER_DIR}/cfa
     3385CFACPP=${DRIVER_DIR}/cfa-cpp
     3386
     3387
     3388
     3389
     3390# Flag variables needed to build in tree
     3391LIBCFA_SRC='$(top_srcdir)/src/libcfa'
     3392LIBCFA_BUILD='$(top_builddir)/src/libcfa'
     3393BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
     3394BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
     3395
     3396
     3397
    33773398# Make sure we can run config.sub.
    33783399$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||

  • configure.ac

    ra2f146ee rfde66c2  
    170170AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
    171171AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
     172
     173# Create variables for commonly used targets
     174DRIVER_DIR='$(top_builddir)/src/driver'
     175CFACC=${DRIVER_DIR}/cfa
     176CFACPP=${DRIVER_DIR}/cfa-cpp
     177AC_SUBST(DRIVER_DIR)
     178AC_SUBST(CFACC)
     179AC_SUBST(CFACPP)
     180
     181# Flag variables needed to build in tree
     182LIBCFA_SRC='$(top_srcdir)/src/libcfa'
     183LIBCFA_BUILD='$(top_builddir)/src/libcfa'
     184BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
     185BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
     186AC_SUBST(BUILD_IN_TREE_FLAGS_NOLIB)
     187AC_SUBST(BUILD_IN_TREE_FLAGS)
    172188
    173189AC_CANONICAL_BUILD

  • src/Makefile.am

    ra2f146ee rfde66c2  
    4040
    4141# put into lib for now
    42 cfa_cpplibdir = ${CFA_LIBDIR}
     42cfa_cpplibdir = $(CFA_LIBDIR)
    4343cfa_cpplib_PROGRAMS = driver/cfa-cpp
    44 driver_cfa_cpp_SOURCES = ${SRC}
     44driver_cfa_cpp_SOURCES = $(SRC)
    4545driver_cfa_cpp_LDADD = -ldl                     # yywrap
    46 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I${abs_top_srcdir}/src/Parser -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
     46driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
    4747driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
    4848

  • src/Makefile.in

    ra2f146ee rfde66c2  
    365365AWK = @AWK@
    366366BACKEND_CC = @BACKEND_CC@
     367BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     368BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    367369CC = @CC@
    368370CCAS = @CCAS@
    … …  
    370372CCASFLAGS = @CCASFLAGS@
    371373CCDEPMODE = @CCDEPMODE@
     374CFACC = @CFACC@
     375CFACPP = @CFACPP@
    372376CFA_BACKEND_CC = @CFA_BACKEND_CC@
    373377CFA_BINDIR = @CFA_BINDIR@
    … …  
    386390DEFS = @DEFS@
    387391DEPDIR = @DEPDIR@
     392DRIVER_DIR = @DRIVER_DIR@
    388393ECHO_C = @ECHO_C@
    389394ECHO_N = @ECHO_N@
    … …  
    536541
    537542# put into lib for now
    538 cfa_cpplibdir = ${CFA_LIBDIR}
    539 driver_cfa_cpp_SOURCES = ${SRC}
     543cfa_cpplibdir = $(CFA_LIBDIR)
     544driver_cfa_cpp_SOURCES = $(SRC)
    540545driver_cfa_cpp_LDADD = -ldl                     # yywrap
    541 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I${abs_top_srcdir}/src/Parser -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
     546driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
    542547driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
    543548all: $(BUILT_SOURCES)

  • src/benchmark/Makefile.am

    ra2f146ee rfde66c2  
    1818CFLAGS =
    1919AM_CFLAGS = \
    20         -XCFA \
    21         -t \
    22         -B${abs_top_builddir}/src/driver \
    2320        -g \
    2421        -O2 \
    … …  
    2724        -quiet \
    2825        -I$(srcdir) \
    29         -L${abs_top_builddir}/src/libcfa \
    30         -I${abs_top_srcdir}/src/libcfa \
    31         -I${abs_top_srcdir}/src/libcfa/containers \
    32         -I${abs_top_srcdir}/src/libcfa/concurrency \
    33         -I${abs_top_srcdir}/src/libcfa/stdhdr
    34 
    35 CC = ${top_builddir}/src/driver/cfa
     26        @BUILD_IN_TREE_FLAGS@
     27
     28CC = @CFACC@
    3629TOOLSDIR = ${abs_top_srcdir}/tools/
    3730REPEAT   = ${TOOLSDIR}repeat

  • src/benchmark/Makefile.in

    ra2f146ee rfde66c2  
    135135AWK = @AWK@
    136136BACKEND_CC = @BACKEND_CC@
    137 CC = ${top_builddir}/src/driver/cfa
     137BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     138BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
     139CC = @CFACC@
    138140CCAS = @CCAS@
    139141CCASDEPMODE = @CCASDEPMODE@
    140142CCASFLAGS = @CCASFLAGS@
    141143CCDEPMODE = @CCDEPMODE@
     144CFACC = @CFACC@
     145CFACPP = @CFACPP@
    142146CFA_BACKEND_CC = @CFA_BACKEND_CC@
    143147CFA_BINDIR = @CFA_BINDIR@
    … …  
    158162DEFS = @DEFS@
    159163DEPDIR = @DEPDIR@
     164DRIVER_DIR = @DRIVER_DIR@
    160165ECHO_C = @ECHO_C@
    161166ECHO_N = @ECHO_N@
    … …  
    248253top_srcdir = @top_srcdir@
    249254AM_CFLAGS = \
    250         -XCFA \
    251         -t \
    252         -B${abs_top_builddir}/src/driver \
    253255        -g \
    254256        -O2 \
    … …  
    257259        -quiet \
    258260        -I$(srcdir) \
    259         -L${abs_top_builddir}/src/libcfa \
    260         -I${abs_top_srcdir}/src/libcfa \
    261         -I${abs_top_srcdir}/src/libcfa/containers \
    262         -I${abs_top_srcdir}/src/libcfa/concurrency \
    263         -I${abs_top_srcdir}/src/libcfa/stdhdr
     261        @BUILD_IN_TREE_FLAGS@
    264262
    265263TOOLSDIR = ${abs_top_srcdir}/tools/

  • src/driver/Makefile.in

    ra2f146ee rfde66c2  
    185185AWK = @AWK@
    186186BACKEND_CC = @BACKEND_CC@
     187BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     188BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    187189CC = @CC@
    188190CCAS = @CCAS@
    … …  
    190192CCASFLAGS = @CCASFLAGS@
    191193CCDEPMODE = @CCDEPMODE@
     194CFACC = @CFACC@
     195CFACPP = @CFACPP@
    192196CFA_BACKEND_CC = @CFA_BACKEND_CC@
    193197CFA_BINDIR = @CFA_BINDIR@
    … …  
    206210DEFS = @DEFS@
    207211DEPDIR = @DEPDIR@
     212DRIVER_DIR = @DRIVER_DIR@
    208213ECHO_C = @ECHO_C@
    209214ECHO_N = @ECHO_N@

  • src/examples/Makefile.am

    ra2f146ee rfde66c2  
    2525avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
    2626
    27 Bench : Bench.c
     27Bench$(EXEEXT) : Bench.c
    2828        @for ccflags in "-debug" "-nodebug"; do \
    2929                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt Bench.c;\

  • src/examples/Makefile.in

    ra2f146ee rfde66c2  
    189189AWK = @AWK@
    190190BACKEND_CC = @BACKEND_CC@
     191BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     192BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    191193CC = @CFA_BINDIR@/@CFA_NAME@
    192194CCAS = @CCAS@
    … …  
    194196CCASFLAGS = @CCASFLAGS@
    195197CCDEPMODE = @CCDEPMODE@
     198CFACC = @CFACC@
     199CFACPP = @CFACPP@
    196200CFA_BACKEND_CC = @CFA_BACKEND_CC@
    197201CFA_BINDIR = @CFA_BINDIR@
    … …  
    212216DEFS = @DEFS@
    213217DEPDIR = @DEPDIR@
     218DRIVER_DIR = @DRIVER_DIR@
    214219ECHO_C = @ECHO_C@
    215220ECHO_N = @ECHO_N@
    … …  
    615620
    616621
    617 Bench : Bench.c
     622Bench$(EXEEXT) : Bench.c
    618623        @for ccflags in "-debug" "-nodebug"; do \
    619624                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt Bench.c;\

  • src/libcfa/Makefile.am

    ra2f146ee rfde66c2  
    4343#use -no-include-stdhdr to prevent rebuild cycles
    4444#The built sources must not depend on the installed headers
    45 CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_builddir}/src/driver ${EXTRA_FLAGS}
    46 CC = ${abs_top_builddir}/src/driver/cfa
     45CFLAGS = -quiet -no-include-stdhdr @BUILD_IN_TREE_FLAGS@ ${EXTRA_FLAGS}
     46CC = @CFACC@
    4747
    4848headers = fstream iostream iterator limits rational time stdlib common \
    … …  
    9292        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    9393
    94 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
     94${libobjs} : @CFACPP@ ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    9595
    9696libcfa_a_SOURCES = ${libsrc}

  • src/libcfa/Makefile.in

    ra2f146ee rfde66c2  
    303303AWK = @AWK@
    304304BACKEND_CC = @BACKEND_CC@
    305 CC = ${abs_top_builddir}/src/driver/cfa
     305BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     306BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
     307CC = @CFACC@
    306308CCAS = @CCAS@
    307309CCASDEPMODE = @CCASDEPMODE@
    308310CCASFLAGS = @CCASFLAGS@
    309311CCDEPMODE = @CCDEPMODE@
     312CFACC = @CFACC@
     313CFACPP = @CFACPP@
    310314CFA_BACKEND_CC = @CFA_BACKEND_CC@
    311315CFA_BINDIR = @CFA_BINDIR@
    … …  
    319323#use -no-include-stdhdr to prevent rebuild cycles
    320324#The built sources must not depend on the installed headers
    321 CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_builddir}/src/driver ${EXTRA_FLAGS}
     325CFLAGS = -quiet -no-include-stdhdr @BUILD_IN_TREE_FLAGS@ ${EXTRA_FLAGS}
    322326CPP = @CPP@
    323327CPPFLAGS = @CPPFLAGS@
    … …  
    328332DEFS = @DEFS@
    329333DEPDIR = @DEPDIR@
     334DRIVER_DIR = @DRIVER_DIR@
    330335ECHO_C = @ECHO_C@
    331336ECHO_N = @ECHO_N@
    … …  
    17041709        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    17051710
    1706 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
     1711${libobjs} : @CFACPP@ ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    17071712
    17081713maintainer-clean-local:

  • src/prelude/Makefile.am

    ra2f146ee rfde66c2  
    2323noinst_DATA = ../libcfa/libcfa-prelude.c
    2424
    25 CC = ${abs_top_builddir}/src/driver/cfa
     25CC = @CFACC@
    2626
    2727$(DEPDIR) :
    … …  
    5858include $(DEPDIR)/builtins.Po
    5959
    60 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
    61         ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
     60../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     61        ${AM_V_GEN}@CFACPP@ -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    6262
    63 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
    64         ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     63bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     64        ${AM_V_GEN}@CFACPP@ -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6565
    6666maintainer-clean-local :

  • src/prelude/Makefile.in

    ra2f146ee rfde66c2  
    162162AWK = @AWK@
    163163BACKEND_CC = @BACKEND_CC@
    164 CC = ${abs_top_builddir}/src/driver/cfa
     164BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     165BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
     166CC = @CFACC@
    165167CCAS = @CCAS@
    166168CCASDEPMODE = @CCASDEPMODE@
    167169CCASFLAGS = @CCASFLAGS@
    168170CCDEPMODE = @CCDEPMODE@
     171CFACC = @CFACC@
     172CFACPP = @CFACPP@
    169173CFA_BACKEND_CC = @CFA_BACKEND_CC@
    170174CFA_BINDIR = @CFA_BINDIR@
    … …  
    183187DEFS = @DEFS@
    184188DEPDIR = @DEPDIR@
     189DRIVER_DIR = @DRIVER_DIR@
    185190ECHO_C = @ECHO_C@
    186191ECHO_N = @ECHO_N@
    … …  
    526531include $(DEPDIR)/builtins.Po
    527532
    528 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
    529         ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    530 
    531 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
    532         ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     533../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     534        ${AM_V_GEN}@CFACPP@ -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
     535
     536bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     537        ${AM_V_GEN}@CFACPP@ -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    533538
    534539maintainer-clean-local :

  • src/tests/Makefile.am

    ra2f146ee rfde66c2  
    3030# applies to both programs
    3131AM_CFLAGS = $(if $(test), 2> $(test), ) \
    32         -XCFA \
    33         -t \
    34         -B${abs_top_builddir}/src/driver \
    3532        -g \
    3633        -Wall \
    3734        -Wno-unused-function \
    3835        -quiet @CFA_FLAGS@ \
    39         -I. \
    4036        -DIN_DIR="${srcdir}/.in/" \
    41         -L${abs_top_builddir}/src/libcfa \
    42         -I${abs_top_srcdir}/src/libcfa \
    43         -I${abs_top_srcdir}/src/libcfa/containers \
    44         -I${abs_top_srcdir}/src/libcfa/concurrency \
    45         -I${abs_top_srcdir}/src/libcfa/stdhdr
     37        @BUILD_IN_TREE_FLAGS@
    4638
    4739if !BUILD_DEBUG
    … …  
    5547endif
    5648
    57 CC = ${abs_top_builddir}/src/driver/cfa
     49CC = @CFACC@
    5850
    5951.PHONY : list
    … …  
    9385# implicit rule so not all test require a rule
    9486% : %.c $(CC)
    95         echo $(headers_deps)
    9687        $(COMPILE) $(abspath ${<}) -o ${@}
    9788

  • src/tests/Makefile.in

    ra2f146ee rfde66c2  
    181181AWK = @AWK@
    182182BACKEND_CC = @BACKEND_CC@
    183 CC = ${abs_top_builddir}/src/driver/cfa
     183BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     184BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
     185CC = @CFACC@
    184186CCAS = @CCAS@
    185187CCASDEPMODE = @CCASDEPMODE@
    186188CCASFLAGS = @CCASFLAGS@
    187189CCDEPMODE = @CCDEPMODE@
     190CFACC = @CFACC@
     191CFACPP = @CFACPP@
    188192CFA_BACKEND_CC = @CFA_BACKEND_CC@
    189193CFA_BINDIR = @CFA_BINDIR@
    … …  
    202206DEFS = @DEFS@
    203207DEPDIR = @DEPDIR@
     208DRIVER_DIR = @DRIVER_DIR@
    204209ECHO_C = @ECHO_C@
    205210ECHO_N = @ECHO_N@
    … …  
    298303
    299304# applies to both programs
    300 AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t \
    301         -B${abs_top_builddir}/src/driver -g -Wall -Wno-unused-function \
    302         -quiet @CFA_FLAGS@ -I. -DIN_DIR="${srcdir}/.in/" \
    303         -L${abs_top_builddir}/src/libcfa \
    304         -I${abs_top_srcdir}/src/libcfa \
    305         -I${abs_top_srcdir}/src/libcfa/containers \
    306         -I${abs_top_srcdir}/src/libcfa/concurrency \
    307         -I${abs_top_srcdir}/src/libcfa/stdhdr $(am__append_1) \
    308         $(am__append_2) $(am__append_3)
     305AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
     306        -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" \
     307        @BUILD_IN_TREE_FLAGS@ $(am__append_1) $(am__append_2) \
     308        $(am__append_3)
    309309fstream_test_SOURCES = fstream_test.c
    310310avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
    311311
    312312# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
    313 # however, here it is more complicated because it must match the dependencies exactly
    314 # depencies seem to have the absolute path to the build directory and relative path
    315 # to the headers from there
     313# however, here it is more complicated because it must match the dependencies based on how
     314# they are generated by gcc
    316315headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
    317316headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
    … …  
    642641# implicit rule so not all test require a rule
    643642% : %.c $(CC)
    644         echo $(headers_deps)
    645643        $(COMPILE) $(abspath ${<}) -o ${@}
    646644

  • src/tests/preempt_longrun/Makefile.am

    ra2f146ee rfde66c2  
    3232BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I.. -I. -DTEST_$(shell cat .type | tr a-z A-Z)
    3333CFLAGS = ${BUILD_FLAGS}
    34 CC = ${top_builddir}/src/driver/cfa
     34CC = @CFACC@
    3535
    3636TESTS = block coroutine create disjoint enter enter3 processor stack wait yield

  • src/tests/preempt_longrun/Makefile.in

    ra2f146ee rfde66c2  
    337337AWK = @AWK@
    338338BACKEND_CC = @BACKEND_CC@
    339 CC = ${top_builddir}/src/driver/cfa
     339BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     340BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
     341CC = @CFACC@
    340342CCAS = @CCAS@
    341343CCASDEPMODE = @CCASDEPMODE@
    342344CCASFLAGS = @CCASFLAGS@
    343345CCDEPMODE = @CCDEPMODE@
     346CFACC = @CFACC@
     347CFACPP = @CFACPP@
    344348CFA_BACKEND_CC = @CFA_BACKEND_CC@
    345349CFA_BINDIR = @CFA_BINDIR@
    … …  
    358362DEFS = @DEFS@
    359363DEPDIR = @DEPDIR@
     364DRIVER_DIR = @DRIVER_DIR@
    360365ECHO_C = @ECHO_C@
    361366ECHO_N = @ECHO_N@

  • src/tests/pybin/tools.py

    ra2f146ee rfde66c2  
    4848                return False
    4949
    50         return match.group(1) == "ASCII text"
     50        return match.group(1).startswith("ASCII text")
    5151
    5252# Remove 1 or more files silently

  • tools/Makefile.in

    ra2f146ee rfde66c2  
    186186AWK = @AWK@
    187187BACKEND_CC = @BACKEND_CC@
     188BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     189BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    188190CC = @BACKEND_CC@
    189191CCAS = @CCAS@
    … …  
    191193CCASFLAGS = @CCASFLAGS@
    192194CCDEPMODE = @CCDEPMODE@
     195CFACC = @CFACC@
     196CFACPP = @CFACPP@
    193197CFA_BACKEND_CC = @CFA_BACKEND_CC@
    194198CFA_BINDIR = @CFA_BINDIR@
    … …  
    207211DEFS = @DEFS@
    208212DEPDIR = @DEPDIR@
     213DRIVER_DIR = @DRIVER_DIR@
    209214ECHO_C = @ECHO_C@
    210215ECHO_N = @ECHO_N@

  • tools/prettyprinter/Makefile.in

    ra2f146ee rfde66c2  
    210210AWK = @AWK@
    211211BACKEND_CC = @BACKEND_CC@
     212BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     213BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    212214CC = @CC@
    213215CCAS = @CCAS@
    … …  
    215217CCASFLAGS = @CCASFLAGS@
    216218CCDEPMODE = @CCDEPMODE@
     219CFACC = @CFACC@
     220CFACPP = @CFACPP@
    217221CFA_BACKEND_CC = @CFA_BACKEND_CC@
    218222CFA_BINDIR = @CFA_BINDIR@
    … …  
    231235DEFS = @DEFS@
    232236DEPDIR = @DEPDIR@
     237DRIVER_DIR = @DRIVER_DIR@
    233238ECHO_C = @ECHO_C@
    234239ECHO_N = @ECHO_N@
Note: See TracChangeset for help on using the changeset viewer.