Changeset 08ce416

Timestamp:

Dec 7, 2020, 12:57:06 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

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:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (4 diffs)
• libcfa/configure.ac (modified) (1 diff)
• libcfa/src/Makefile.am (modified) (1 diff)
• src/AST/module.mk (modified) (1 diff)
• tests/Makefile.am (modified) (1 diff)

Makefile.am

@@ -21 +21 @@
 
 SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@
-DIST_SUBDIRS = driver src . libcfa benchmark longrun_tests tests tools tools/prettyprinter
+DIST_SUBDIRS = driver src . libcfa tests tools tools/prettyprinter
 
 @LIBCFA_TARGET_MAKEFILES@ : Makefile $(srcdir)/libcfa/configure

configure.ac

@@ -3 +3 @@
 
 AC_PREREQ([2.68])
-AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
+AC_INIT([cfa-cc],[1.0.0],[cforall@plg.uwaterloo.ca])
 AC_CONFIG_AUX_DIR([automake])
 AC_CONFIG_MACRO_DIRS([automake])
@@ -35 +35 @@
                 no)  newast=false; DEFAULT_NEW_AST="False" ;;
                 *) AC_MSG_ERROR([bad value ${enableval} for --enable-new-ast]) ;;
-        esac],[newast=false])
+        esac],[newast=true])
 AC_DEFINE_UNQUOTED([CFA_USE_NEW_AST], $newast)
 AC_SUBST(DEFAULT_NEW_AST)
@@ -139 +139 @@
                 \'--enable-gprofiler=*) ;;
                 \'--disable-gprofiler) ;;
+
+                # skip the target hosts
+                \'--enable-new-ast=*) ;;
+                \'--disable-new-ast) ;;
 
                 # skip this, it only causes problems
@@ -287 +291 @@
         libcfa/Makefile:libcfa/Makefile.dist.in
         tests/Makefile
-        longrun_tests/Makefile
-        benchmark/Makefile
-        benchmark/io/http/Makefile
         tools/Makefile
         tools/prettyprinter/Makefile
         ])
 
+# Some of our makefile don't need to be distributed
+AM_CONDITIONAL([CFORALL_DISTRIBUTE], [test -e $TOP_SRCDIR/autogen.sh])
+AM_COND_IF([CFORALL_DISTRIBUTE],
+        [AC_CONFIG_FILES([
+                longrun_tests/Makefile
+                benchmark/Makefile
+                benchmark/io/http/Makefile
+                ])])
+
 AC_CONFIG_LINKS([tests/test.py:tests/test.py])
 

libcfa/configure.ac

@@ -3 +3 @@
 
 AC_PREREQ([2.68])
-AC_INIT([cfa-cc],[1.0.0.0],[cforall@plg.uwaterloo.ca])
+AC_INIT([cfa-cc],[1.0.0],[cforall@plg.uwaterloo.ca])
 AC_CONFIG_AUX_DIR([automake])
 AC_CONFIG_MACRO_DIRS([automake])

libcfa/src/Makefile.am

@@ -87 +87 @@
 # not all platforms support concurrency, add option do disable it
 inst_thread_headers_nosrc = \
+        bits/collection.hfa \
         bits/random.hfa \
+        bits/sequence.hfa \
         concurrency/clib/cfathread.h \
         concurrency/invoke.h \

src/AST/module.mk

@@ -59 +59 @@
         AST/SymbolTable.cpp \
         AST/SymbolTable.hpp \
+        AST/TranslationUnit.hpp \
         AST/Type.cpp \
         AST/Type.hpp \

tests/Makefile.am

@@ -68 +68 @@
 .INTERMEDIATE: .validate .validate.cfa
 EXTRA_PROGRAMS = avl_test .dummy_hack # build but do not install
+EXTRA_DIST = pybin
 
 avl_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