Changeset 842


Ignore:
Timestamp:
Jun 10, 2003, 7:51:31 PM (18 years ago)
Author:
pooh
Message:
  • Reorganized samples and tests making process.
  • Added new make targets samples', tests' and `check'.
Location:
to-imperative/trunk
Files:
42 added
10 edited

Legend:

Unmodified
Added
Removed

  • to-imperative/trunk/Makefile

    r448 r842  
    11SUBDIRS = libstdc++-stub compiler libp++ runtime library samples
    22INSTALL_SUBDIRS = $(SUBDIRS)
     3all : override SUBDIRS = libstdc++-stub compiler libp++ runtime library
    34
    45include rules.mk
    … …  
    6566clean::
    6667        rm -f .rpmrc *.spec *.list
    67 #       rm -f *.tar.gz *.rpm

  • to-imperative/trunk/rules.mk

    r813 r842  
    5858dist::
    5959        if [ -f "$(DISTLIST)" ]; then rm $(DISTLIST); fi
    60         $(DO_SUBDIRS)
     60        $(DO_SUBDIRS_NODEPS)
    6161        echo $(foreach file, $(DISTFILES), $(CURRENTDIR)/$(file)) \
    6262          >>$(TOPDIR)/$(DISTLIST)
    … …  
    6464snapshot::
    6565        if [ -f "$(DISTLIST)" ]; then rm $(DISTLIST); fi
    66         $(DO_SUBDIRS)
     66        $(DO_SUBDIRS_NODPES)
    6767        echo $(foreach file, $(DISTFILES), $(CURRENTDIR)/$(file)) \
    6868          >>$(TOPDIR)/$(DISTLIST)
    6969
    70 check:: all
     70docs:: all
    7171        $(DO_SUBDIRS)
    7272
    73 docs:: all
     73samples:: all
     74        $(DO_SUBDIRS)
     75
     76tests:: all
     77        $(DO_SUBDIRS)
     78
     79check:: tests
    7480        $(DO_SUBDIRS)
    7581
    … …  
    8389        $(DO_SUBDIRS)
    8490
    85 .PHONY: all check install uninstall clean dist snapshot distclean
     91.PHONY: all install uninstall clean dist snapshot distclean
     92.PHONY: samples tests check

  • to-imperative/trunk/samples/Access/Makefile

    r695 r842  
    33include $(TOPDIR)/rules.mk
    44
    5 SAMPLES = \
     5TESTS = \
    66  l1 \
    77  l_inval1 \
    … …  
    1818include $(TOPDIR)/samples/samples.mk
    1919
     20tests:: $(TESTS)
     21
    2022-include $(DEPS)

  • to-imperative/trunk/samples/Arithm/Makefile

    r695 r842  
    33include $(TOPDIR)/rules.mk
    44
    5 SAMPLES = \
     5TESTS = \
    66  add \
    77  sub \
    … …  
    1414include $(TOPDIR)/samples/samples.mk
    1515
     16tests:: $(TESTS)
     17
    1618-include $(DEPS)

  • to-imperative/trunk/samples/Box/Makefile

    r745 r842  
    33include $(TOPDIR)/rules.mk
    44
    5 SAMPLES = \
     5TESTS = \
    66  box1
    77
    … …  
    1010include $(TOPDIR)/samples/samples.mk
    1111
     12tests:: $(TESTS)
     13
    1214%.hh: %.rfi
    1315        $(RFPC) $<

  • to-imperative/trunk/samples/Convert/Makefile

    r823 r842  
    33include $(TOPDIR)/rules.mk
    44
    5 SAMPLES = \
     5TESTS = \
    66  tochars \
    77  tolower \
    … …  
    2727include $(TOPDIR)/samples/samples.mk
    2828
     29tests:: $(TESTS)
     30
    2931-include $(DEPS)

  • to-imperative/trunk/samples/Makefile

    r838 r842  
    99  Convert \
    1010  Syntax
     11
     12samples : override SUBDIRS =
    1113
    1214SAMPLES = \
    … …  
    2123include $(TOPDIR)/samples/samples.mk
    2224
     25samples:: $(SAMPLES)
     26
     27ifeq (,$(filter tests check,$(MAKECMDGOALS)))
    2328-include $(DEPS)
     29endif

  • to-imperative/trunk/samples/Syntax/Makefile

    r770 r842  
    33include $(TOPDIR)/rules.mk
    44
    5 SAMPLES = \
     5TESTS = \
    66  assign2 \
    77  clash4 \
    … …  
    1010include $(TOPDIR)/samples/samples.mk
    1111
     12tests:: $(TESTS)
     13
    1214%.cc: %.rf
    1315        $(RFPC) -cc -no $<

  • to-imperative/trunk/samples/Syntax/const4.cc

    r800 r842  
    147147  {
    148148    {
    149       if (((1 + 1) != (1 + 1)))
    150       {
    151         goto block1__branch1;
    152       }
    153149      if (!A64.eq (A63, 0))
    154150      {
    … …  
    159155    }
    160156  block1__branch1: {}
    161     if (((1 + 1 + 1 + 1) != (1 + 1 + 1 + 1)))
    162     {
    163       error ("Unexpected fail");
    164     }
    165157    if (!_c_1.eq (_c_0, 0))
    166158    {

  • to-imperative/trunk/samples/samples.mk

    r838 r842  
    1010DISTFILES = Makefile
    1111DISTFILES += $(SAMPLES_SOURCES)
    12 
    13 all:: $(SAMPLES)
    1412
    1513RFPC = $(TOPDIR)/compiler/rfpc
    … …  
    3432        $(CXX) -o $@ $< $(LDFLAGS) $(LDLIBS)
    3533
     34$(TESTS): %: %.o $(LIBRF) $(LIBRFRT) $(LIBPXX)
     35        $(CXX) -o $@ $< $(LDFLAGS) $(LDLIBS)
     36
    3637clean::
    37         rm -f $(SAMPLES) *.o *.dep
     38        rm -f $(SAMPLES) $(TESTS) *.o *.dep
    3839
     40check:: $(TESTS)
     41        @$(foreach target,$(TESTS), \
     42          $(TOPDIR)/samples/check.sh $(target) ; \
     43        )
     44
     45DEPS = $(SAMPLES:=.dep)
     46DEPS += $(TESTS:=.dep)
Note: See TracChangeset for help on using the changeset viewer.