Changeset d93d980


Ignore:
Timestamp:
Oct 27, 2016, 4:15:45 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
62e5546
Parents:
25f49f4 (diff), 24eb51ed (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    r25f49f4 rd93d980  
    132132CFA_PREFIX = @CFA_PREFIX@
    133133CFLAGS = @CFLAGS@
     134CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    134135CPP = @CPP@
    135136CPPFLAGS = @CPPFLAGS@
  • config.h.in

    r25f49f4 rd93d980  
    1919#undef CFA_PREFIX
    2020
     21/* Major.Minor */
     22#undef CFA_VERSION
     23
     24/* Build version number. */
     25#undef CFA_VERSION_BUILD
     26
     27/* Major.Minor.Patch.Build */
     28#undef CFA_VERSION_FULL
     29
     30/* Major.Minor.Patch */
     31#undef CFA_VERSION_LONG
     32
    2133/* Major version number. */
    2234#undef CFA_VERSION_MAJOR
     
    2739/* Patch version number. */
    2840#undef CFA_VERSION_PATCH
     41
     42/* Major */
     43#undef CFA_VERSION_SHORT
    2944
    3045/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
  • configure

    r25f49f4 rd93d980  
    646646CFA_BACKEND_CC
    647647BACKEND_CC
     648CONFIG_STATUS_DEPENDENCIES
    648649MAINT
    649650MAINTAINER_MODE_FALSE
     
    29642965                        # may require auto* software to be installed
    29652966
    2966 
    2967 $as_echo "#define CFA_VERSION_MAJOR \"1\"" >>confdefs.h
    2968 
    2969 
    2970 $as_echo "#define CFA_VERSION_MINOR \"0\"" >>confdefs.h
    2971 
    2972 
    2973 $as_echo "#define CFA_VERSION_PATCH \"0\"" >>confdefs.h
     2967ver_major=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
     2968ver_minor=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\2/'`
     2969ver_patch=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\3/'`
     2970ver_build=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\4/'`
     2971ver_short="\"${ver_major}\""
     2972ver__long="\"${ver_major}.${ver_minor}\""
     2973ver__norm="\"${ver_major}.${ver_minor}.${ver_patch}\""
     2974ver__full="\"${ver_major}.${ver_minor}.${ver_patch}.${ver_build}\""
     2975
     2976CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/version'
     2977
     2978
     2979cat >>confdefs.h <<_ACEOF
     2980#define CFA_VERSION_MAJOR ${ver_major}
     2981_ACEOF
     2982
     2983
     2984cat >>confdefs.h <<_ACEOF
     2985#define CFA_VERSION_MINOR ${ver_minor}
     2986_ACEOF
     2987
     2988
     2989cat >>confdefs.h <<_ACEOF
     2990#define CFA_VERSION_PATCH ${ver_patch}
     2991_ACEOF
     2992
     2993
     2994cat >>confdefs.h <<_ACEOF
     2995#define CFA_VERSION_BUILD ${ver_build}
     2996_ACEOF
     2997
     2998
     2999cat >>confdefs.h <<_ACEOF
     3000#define CFA_VERSION_SHORT ${ver_short}
     3001_ACEOF
     3002
     3003
     3004cat >>confdefs.h <<_ACEOF
     3005#define CFA_VERSION ${ver__long}
     3006_ACEOF
     3007
     3008
     3009cat >>confdefs.h <<_ACEOF
     3010#define CFA_VERSION_LONG ${ver__norm}
     3011_ACEOF
     3012
     3013
     3014cat >>confdefs.h <<_ACEOF
     3015#define CFA_VERSION_FULL ${ver__full}
     3016_ACEOF
    29743017
    29753018
  • configure.ac

    r25f49f4 rd93d980  
    1818AM_MAINTAINER_MODE(enable)                      # may require auto* software to be installed
    1919
    20 AC_DEFINE(CFA_VERSION_MAJOR, "1", [Major version number.])
    21 AC_DEFINE(CFA_VERSION_MINOR, "0", [Minor version number.])
    22 AC_DEFINE(CFA_VERSION_PATCH, "0", [Patch version number.])
     20ver_major=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\1/'`
     21ver_minor=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\2/'`
     22ver_patch=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\3/'`
     23ver_build=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\4/'`
     24ver_short="\"${ver_major}\""
     25ver__long="\"${ver_major}.${ver_minor}\""
     26ver__norm="\"${ver_major}.${ver_minor}.${ver_patch}\""
     27ver__full="\"${ver_major}.${ver_minor}.${ver_patch}.${ver_build}\""
     28
     29AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/version'])
     30AC_DEFINE_UNQUOTED(CFA_VERSION_MAJOR, ${ver_major}, [Major version number.])
     31AC_DEFINE_UNQUOTED(CFA_VERSION_MINOR, ${ver_minor}, [Minor version number.])
     32AC_DEFINE_UNQUOTED(CFA_VERSION_PATCH, ${ver_patch}, [Patch version number.])
     33AC_DEFINE_UNQUOTED(CFA_VERSION_BUILD, ${ver_build}, [Build version number.])
     34AC_DEFINE_UNQUOTED(CFA_VERSION_SHORT, ${ver_short}, [Major])
     35AC_DEFINE_UNQUOTED(CFA_VERSION, ${ver__long}, [Major.Minor])
     36AC_DEFINE_UNQUOTED(CFA_VERSION_LONG, ${ver__norm}, [Major.Minor.Patch])
     37AC_DEFINE_UNQUOTED(CFA_VERSION_FULL, ${ver__full}, [Major.Minor.Patch.Build])
    2338
    2439# Installation paths
  • src/Makefile.am

    r25f49f4 rd93d980  
    4141driver_cfa_cpp_SOURCES = ${SRC}
    4242driver_cfa_cpp_LDADD = ${LEXLIB} -ldl                   # yywrap
    43 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -rdynamic -I${abs_top_srcdir}/src/include
     43driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -Xlinker -export-dynamic -I${abs_top_srcdir}/src/include
    4444
    4545MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
  • src/Makefile.in

    r25f49f4 rd93d980  
    266266CFA_PREFIX = @CFA_PREFIX@
    267267CFLAGS = @CFLAGS@
     268CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    268269CPP = @CPP@
    269270CPPFLAGS = @CPPFLAGS@
     
    417418driver_cfa_cpp_SOURCES = ${SRC}
    418419driver_cfa_cpp_LDADD = ${LEXLIB} -ldl                   # yywrap
    419 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -rdynamic -I${abs_top_srcdir}/src/include
     420driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -Xlinker -export-dynamic -I${abs_top_srcdir}/src/include
    420421all: $(BUILT_SOURCES)
    421422        $(MAKE) $(AM_MAKEFLAGS) all-am
  • src/driver/Makefile.am

    r25f49f4 rd93d980  
    66## file "LICENCE" distributed with Cforall.
    77##
    8 ## Makefile.am -- 
     8## Makefile.am --
    99##
    1010## Author           : Peter A. Buhr
     
    2626cc1_SOURCES = cc1.cc
    2727
     28cfa.cc : ${abs_top_srcdir}/version
     29        @true
     30
    2831MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
  • src/driver/Makefile.in

    r25f49f4 rd93d980  
    100100CFA_PREFIX = @CFA_PREFIX@
    101101CFLAGS = @CFLAGS@
     102CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    102103CPP = @CPP@
    103104CPPFLAGS = @CPPFLAGS@
     
    542543
    543544
     545cfa.cc : ${abs_top_srcdir}/version
     546        @true
     547
    544548# Tell versions [3.59,3.63) of GNU make to not export all variables.
    545549# Otherwise a system limit (for SysV at least) may be exceeded.
  • src/driver/cfa.cc

    r25f49f4 rd93d980  
    2525using std::endl;
    2626using std::string;
     27using std::to_string;
    2728
    2829
     
    5051
    5152int main( int argc, char *argv[] ) {
    52         string Version( VERSION );                                                      // current version number from CONFIG
    53         string Major( CFA_VERSION_MAJOR ), Minor( CFA_VERSION_MINOR ), Patch( CFA_VERSION_MINOR );
     53        string Version( CFA_VERSION_LONG );                                                     // current version number from CONFIG
     54        string Major( to_string( CFA_VERSION_MAJOR ) ), Minor( to_string( CFA_VERSION_MINOR ) ), Patch( to_string( CFA_VERSION_PATCH ) );
    5455
    5556        string installincdir( CFA_INCDIR );                                     // fixed location of include files
  • src/examples/Makefile.in

    r25f49f4 rd93d980  
    111111# applies to both programs
    112112CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
     113CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    113114CPP = @CPP@
    114115CPPFLAGS = @CPPFLAGS@
  • src/libcfa/Makefile.in

    r25f49f4 rd93d980  
    137137CFA_PREFIX = @CFA_PREFIX@
    138138CFLAGS = -quiet -no-include-stdhdr -g -Wall -Wno-unused-function @CFA_FLAGS@ -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2
     139CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    139140CPP = @CPP@
    140141CPPFLAGS = @CPPFLAGS@
  • src/tests/Makefile.in

    r25f49f4 rd93d980  
    121121# applies to both programs
    122122CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
     123CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    123124CPP = @CPP@
    124125CPPFLAGS = @CPPFLAGS@
Note: See TracChangeset for help on using the changeset viewer.