Changeset 08ce416


Ignore:
Timestamp:
Dec 7, 2020, 12:57:06 PM (10 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
a468e1e9
Parents:
ad915e0
Message:

Changed configure to use new-ast by default.
Ast options no longer pushed to libcfa (that didn't make sense).
Long Run tests and benchmark no longer distributed.
Added missing source to distribution.
Added pybin to distribution.

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    rad915e0 r08ce416  
    2121
    2222SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@
    23 DIST_SUBDIRS = driver src . libcfa benchmark longrun_tests tests tools tools/prettyprinter
     23DIST_SUBDIRS = driver src . libcfa tests tools tools/prettyprinter
    2424
    2525@LIBCFA_TARGET_MAKEFILES@ : Makefile $(srcdir)/libcfa/configure
  • configure.ac

    rad915e0 r08ce416  
    33
    44AC_PREREQ([2.68])
    5 AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
     5AC_INIT([cfa-cc],[1.0.0],[cforall@plg.uwaterloo.ca])
    66AC_CONFIG_AUX_DIR([automake])
    77AC_CONFIG_MACRO_DIRS([automake])
     
    3535                no)  newast=false; DEFAULT_NEW_AST="False" ;;
    3636                *) AC_MSG_ERROR([bad value ${enableval} for --enable-new-ast]) ;;
    37         esac],[newast=false])
     37        esac],[newast=true])
    3838AC_DEFINE_UNQUOTED([CFA_USE_NEW_AST], $newast)
    3939AC_SUBST(DEFAULT_NEW_AST)
     
    139139                \'--enable-gprofiler=*) ;;
    140140                \'--disable-gprofiler) ;;
     141
     142                # skip the target hosts
     143                \'--enable-new-ast=*) ;;
     144                \'--disable-new-ast) ;;
    141145
    142146                # skip this, it only causes problems
     
    287291        libcfa/Makefile:libcfa/Makefile.dist.in
    288292        tests/Makefile
    289         longrun_tests/Makefile
    290         benchmark/Makefile
    291         benchmark/io/http/Makefile
    292293        tools/Makefile
    293294        tools/prettyprinter/Makefile
    294295        ])
    295296
     297# Some of our makefile don't need to be distributed
     298AM_CONDITIONAL([CFORALL_DISTRIBUTE], [test -e $TOP_SRCDIR/autogen.sh])
     299AM_COND_IF([CFORALL_DISTRIBUTE],
     300        [AC_CONFIG_FILES([
     301                longrun_tests/Makefile
     302                benchmark/Makefile
     303                benchmark/io/http/Makefile
     304                ])])
     305
    296306AC_CONFIG_LINKS([tests/test.py:tests/test.py])
    297307
  • libcfa/configure.ac

    rad915e0 r08ce416  
    33
    44AC_PREREQ([2.68])
    5 AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
     5AC_INIT([cfa-cc],[1.0.0],[cforall@plg.uwaterloo.ca])
    66AC_CONFIG_AUX_DIR([automake])
    77AC_CONFIG_MACRO_DIRS([automake])
  • libcfa/src/Makefile.am

    rad915e0 r08ce416  
    8787# not all platforms support concurrency, add option do disable it
    8888inst_thread_headers_nosrc = \
     89        bits/collection.hfa \
    8990        bits/random.hfa \
     91        bits/sequence.hfa \
    9092        concurrency/clib/cfathread.h \
    9193        concurrency/invoke.h \
  • src/AST/module.mk

    rad915e0 r08ce416  
    5959        AST/SymbolTable.cpp \
    6060        AST/SymbolTable.hpp \
     61        AST/TranslationUnit.hpp \
    6162        AST/Type.cpp \
    6263        AST/Type.hpp \
  • tests/Makefile.am

    rad915e0 r08ce416  
    6868.INTERMEDIATE: .validate .validate.cfa
    6969EXTRA_PROGRAMS = avl_test .dummy_hack # build but do not install
     70EXTRA_DIST = pybin
    7071
    7172avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
Note: See TracChangeset for help on using the changeset viewer.