Changeset 1525 for trunk


Ignore:
Timestamp:
Oct 1, 2012, 8:31:07 AM (9 years ago)
Author:
Peter Johansson
Message:

replace recursive Makefile with one single Makefile. Keeping multiple Makefile.ams which are included into main Makefile.am.

Location:
trunk
Files:
29 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r1495 r1525  
    2525ACLOCAL_AMFLAGS = -I m4
    2626
    27 SUBDIRS = yat lib bin man test
    28 
    29 
    30 lazycheck recheck: all
    31   cd test && $(MAKE) $(AM_MAKEFLAGS) $@
    32 
    33 clean-local:
    34   rm -rf svndigest *~
    35 
    36 .PHONY: recheck
    37 
    3827## need to declare these variables here so they can be appended below
    3928BUILT_SOURCES =
     
    4231DISTCLEANFILES =
    4332EXTRA_DIST =
     33MAINTAINERCLEANFILES =
     34
     35AM_CPPFLAGS = $(SVNDIGEST_CPPFLAGS)
     36AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
     37AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
     38
     39noinst_HEADERS =
     40noinst_LIBRARIES =
     41
     42clean-local:; rm -rf test/testSubDir Fetchdir
     43
     44include bin/Makefile.am
     45include lib/Makefile.am
     46include man/Makefile.am
     47include test/Makefile.am
     48include yat/Makefile.am
    4449
    4550include $(top_srcdir)/svn_revision.am
  • trunk/bin/Makefile.am

    r1308 r1525  
    2121# along with svndigest. If not, see <http://www.gnu.org/licenses/>.
    2222
    23 bin_PROGRAMS = svndigest svndigest-copy-cache svncopyright
     23bin_PROGRAMS = bin/svndigest bin/svndigest-copy-cache bin/svncopyright
    2424
    25 svndigest_SOURCES = AbstractParameter.cc Parameter.cc \
    26   svndigestParameter.cc svndigest.cc
    27 svndigest_copy_cache_SOURCES = AbstractParameter.cc \
    28   svndigest_copy_cacheParameter.cc svndigest-copy-cache.cc
    29 svncopyright_SOURCES = AbstractParameter.cc Parameter.cc \
    30   svncopyrightParameter.cc svncopyright.cc
     25bin_svndigest_SOURCES = bin/AbstractParameter.cc bin/Parameter.cc \
     26  bin/svndigestParameter.cc bin/svndigest.cc
     27bin_svndigest_copy_cache_SOURCES = bin/AbstractParameter.cc \
     28  bin/svndigest_copy_cacheParameter.cc bin/svndigest-copy-cache.cc
     29bin_svncopyright_SOURCES = bin/AbstractParameter.cc bin/Parameter.cc \
     30  bin/svncopyrightParameter.cc bin/svncopyright.cc
    3131
    32 noinst_HEADERS =
    33 noinst_HEADERS += AbstractParameter.h
    34 noinst_HEADERS += Parameter.h
    35 noinst_HEADERS += svncopyrightParameter.h
    36 noinst_HEADERS += svndigestParameter.h
    37 noinst_HEADERS += svndigest_copy_cacheParameter.h
     32noinst_HEADERS += bin/AbstractParameter.h
     33noinst_HEADERS += bin/Parameter.h
     34noinst_HEADERS += bin/svncopyrightParameter.h
     35noinst_HEADERS += bin/svndigestParameter.h
     36noinst_HEADERS += bin/svndigest_copy_cacheParameter.h
    3837
    39 LDADD = $(top_builddir)/lib/libsvndigest_core.a \
     38
     39core_LDADD = $(top_builddir)/lib/libsvndigest_core.a \
    4040  $(top_builddir)/yat/libyat.a $(SVN_LIBS) $(APR_LIBS)
    41 AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
    4241
    43 AM_CPPFLAGS  = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
    44 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    4542
    46 svndigest_LDADD = $(top_builddir)/lib/libsvndigest.a $(LDADD) $(PLPLOT_LIBS)
     43bin_svncopyright_LDADD = $(core_LDADD)
    4744
    48 clean-local:
    49   rm -rf *~
     45bin_svndigest_copy_cache_LDADD = $(core_LDADD)
     46
     47bin_svndigest_LDADD = $(top_builddir)/lib/libsvndigest.a $(core_LDADD) \
     48  $(PLPLOT_LIBS)
     49
  • trunk/configure.ac

    r1514 r1525  
    5050MY_VERSION
    5151AC_CONFIG_HEADERS([config.h])
    52 AM_INIT_AUTOMAKE([1.11 color-tests std-options parallel-tests silent-rules])
     52AM_INIT_AUTOMAKE([1.11 color-tests std-options parallel-tests
     53                  silent-rules subdir-objects])
    5354
    5455# Set default programming language
     
    326327APR_RESTORE_THE_ENVIRONMENT([LDFLAGS], [SVNDIGEST_])
    327328
    328 AC_CONFIG_FILES([Makefile
    329                 bin/Makefile
    330                 lib/Makefile
    331                 yat/Makefile
    332                 man/Makefile
    333                 test/environment.h
    334                 test/Makefile])
     329AC_CONFIG_FILES([Makefile test/environment.h])
    335330
    336331AC_CONFIG_FILES([build_support/tag_and_release.sh],
  • trunk/lib/Makefile.am

    r1423 r1525  
    2222# along with svndigest. If not, see <http://www.gnu.org/licenses/>.
    2323
    24 AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
    25 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
     24noinst_LIBRARIES += lib/libsvndigest.a lib/libsvndigest_core.a
    2625
    27 noinst_LIBRARIES = libsvndigest.a libsvndigest_core.a
     26noinst_HEADERS += lib/AddStats.h lib/Alias.h lib/BlameStats.h \
     27  lib/CacheCopyer.h \
     28  lib/CacheRemover.h lib/ClassicStats.h \
     29  lib/Colors.h lib/Commitment.h lib/Configuration.h \
     30  lib/CopyrightStats.h lib/CopyrightVisitor.h lib/css.h \
     31  lib/Date.h lib/Directory.h lib/DirectoryPrinter.h lib/DirectoryUtil.h \
     32  lib/File.h lib/FilePrinter.h \
     33  lib/first_page.h lib/Functor.h \
     34  lib/Graph.h \
     35  lib/HtmlBuf.h lib/HtmlStream.h lib/html_utility.h \
     36  lib/LineTypeParser.h \
     37  lib/main_utility.h lib/Node.h lib/NodeCounter.h lib/NodePrinter.h \
     38  lib/NodeVisitor.h \
     39  lib/OptionVersion.h lib/rmdirhier.h \
     40  lib/Stats.h lib/StatsCollection.h lib/StatsPlotter.h \
     41  lib/subversion_revision.h \
     42  lib/SvndigestVisitor.h lib/SVN.h lib/SVNblame.h \
     43  lib/SVNdiff.h lib/SVNinfo.h lib/SVNlog.h lib/SVNproperty.h \
     44  lib/TinyStats.h \
     45  lib/Trac.h lib/utility.h lib/Vector.h
    2846
    29 noinst_HEADERS = AddStats.h Alias.h BlameStats.h CacheCopyer.h \
    30   CacheRemover.h ClassicStats.h \
    31   Colors.h Commitment.h Configuration.h \
    32   CopyrightStats.h CopyrightVisitor.h css.h \
    33   Date.h Directory.h DirectoryPrinter.h DirectoryUtil.h File.h FilePrinter.h \
    34   first_page.h Functor.h \
    35   Graph.h \
    36   HtmlBuf.h HtmlStream.h html_utility.h LineTypeParser.h \
    37   main_utility.h Node.h NodeCounter.h NodePrinter.h NodeVisitor.h \
    38   OptionVersion.h rmdirhier.h \
    39   Stats.h StatsCollection.h StatsPlotter.h subversion_revision.h \
    40   SvndigestVisitor.h SVN.h SVNblame.h \
    41   SVNdiff.h SVNinfo.h SVNlog.h SVNproperty.h TinyStats.h \
    42   Trac.h utility.h Vector.h
     47lib_libsvndigest_a_SOURCES =
     48lib_libsvndigest_a_SOURCES += lib/DirectoryPrinter.cc
     49lib_libsvndigest_a_SOURCES += lib/FilePrinter.cc
     50lib_libsvndigest_a_SOURCES += lib/first_page.cc
     51lib_libsvndigest_a_SOURCES += lib/Graph.cc
     52lib_libsvndigest_a_SOURCES += lib/NodePrinter.cc
     53lib_libsvndigest_a_SOURCES += lib/StatsPlotter.cc
     54lib_libsvndigest_a_SOURCES += lib/SvndigestVisitor.cc
    4355
    44 libsvndigest_a_SOURCES =
    45 libsvndigest_a_SOURCES += DirectoryPrinter.cc
    46 libsvndigest_a_SOURCES += FilePrinter.cc
    47 libsvndigest_a_SOURCES += first_page.cc
    48 libsvndigest_a_SOURCES += Graph.cc
    49 libsvndigest_a_SOURCES += NodePrinter.cc
    50 libsvndigest_a_SOURCES += StatsPlotter.cc
    51 libsvndigest_a_SOURCES += SvndigestVisitor.cc
    52 
    53 libsvndigest_core_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
    54   CacheCopyer.cc CacheRemover.cc ClassicStats.cc Colors.cc \
    55   Commitment.cc Configuration.cc CopyrightStats.cc CopyrightVisitor.cc \
    56   css.cc Date.cc Directory.cc DirectoryUtil.cc File.cc \
    57   Functor.cc HtmlBuf.cc HtmlStream.cc \
    58   html_utility.cc LineTypeParser.cc main_utility.cc Node.cc \
    59   NodeCounter.cc OptionVersion.cc \
    60   rmdirhier.cc Stats.cc StatsCollection.cc subversion_revision.cc SVN.cc \
    61   SVNblame.cc SVNdiff.cc SVNinfo.cc \
    62   SVNlog.cc SVNproperty.cc TinyStats.cc \
    63   Trac.cc utility.cc Vector.cc
    64 
    65 clean-local:
    66   rm -rf *~
    67 
    68 all-local:
     56lib_libsvndigest_core_a_SOURCES = lib/AddStats.cc lib/Alias.cc \
     57  lib/BlameStats.cc \
     58  lib/CacheCopyer.cc lib/CacheRemover.cc lib/ClassicStats.cc \
     59  lib/Colors.cc \
     60  lib/Commitment.cc lib/Configuration.cc \
     61  lib/CopyrightStats.cc lib/CopyrightVisitor.cc \
     62  lib/css.cc lib/Date.cc lib/Directory.cc \
     63  lib/DirectoryUtil.cc lib/File.cc \
     64  lib/Functor.cc lib/HtmlBuf.cc lib/HtmlStream.cc \
     65  lib/html_utility.cc lib/LineTypeParser.cc \
     66  lib/main_utility.cc lib/Node.cc \
     67  lib/NodeCounter.cc lib/OptionVersion.cc \
     68  lib/rmdirhier.cc lib/Stats.cc \
     69  lib/StatsCollection.cc lib/subversion_revision.cc lib/SVN.cc \
     70  lib/SVNblame.cc lib/SVNdiff.cc lib/SVNinfo.cc \
     71  lib/SVNlog.cc lib/SVNproperty.cc lib/TinyStats.cc \
     72  lib/Trac.cc lib/utility.cc lib/Vector.cc
  • trunk/man/Makefile.am

    r1402 r1525  
    2121
    2222dist_man1_MANS =
    23 dist_man1_MANS += $(srcdir)/svncopyright.1
    24 dist_man1_MANS += $(srcdir)/svndigest.1
    25 dist_man1_MANS += $(srcdir)/svndigest-copy-cache.1
     23dist_man1_MANS += $(srcdir)/man/svncopyright.1
     24dist_man1_MANS += $(srcdir)/man/svndigest.1
     25dist_man1_MANS += $(srcdir)/man/svndigest-copy-cache.1
    2626
    27 EXTRA_DIST = svndigest.x
     27EXTRA_DIST += man/svndigest.x
    2828
    29 MAINTAINERCLEANFILES = $(dist_man1_MANS)
     29MAINTAINERCLEANFILES += $(dist_man1_MANS)
    3030
    3131# We would like to depend on binaries, but since svndigest.1
    3232# is distributed it is recommended to depend on only distributed files
    33 # (see automake manual 27.5).
     33# (see automake manual 28.5).
    3434# We depend on configure to catch VERSION changes, Makefile.in to
    3535# catch rules changes, svndigest.x is an obvious dependency, and
    36 # lib/.revision changes for every revision.
     36# .revision changes for every revision.
    3737man_deps=$(top_srcdir)/configure $(srcdir)/Makefile.in \
    38   $(srcdir)/svndigest.x $(top_srcdir)/.revision
     38  $(srcdir)/man/svndigest.x $(top_srcdir)/.revision
    3939
    40 $(srcdir)/svndigest.1: $(man_deps)
    41   @$(HELP2MAN) --no-info -o $@ \
    42   --include $(srcdir)/svndigest.x \
     40## FIXME can we achieve similar behaviour without make invocations
     41
     42$(srcdir)/man/svndigest.1: $(man_deps)
     43  @$(MAKE) $(AM_MAKE_FLAGS) bin/svndigest$(EXEEXT)
     44  $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
     45  --include $(srcdir)/man/svndigest.x \
    4346  --version-option="--no-verbose --version" \
    4447  $(top_builddir)/bin/svndigest$(EXEEXT)
    4548
    46 $(srcdir)/svncopyright.1: $(man_deps)
    47   @$(HELP2MAN) --no-info -o $@ \
    48   --include $(srcdir)/svndigest.x \
     49$(srcdir)/man/svncopyright.1: $(man_deps)
     50  @$(MAKE) $(AM_MAKE_FLAGS) bin/svncopyright$(EXEEXT)
     51  $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
     52  --include $(srcdir)/man/svndigest.x \
    4953  --version-option="--no-verbose --version" \
    5054  $(top_builddir)/bin/svncopyright$(EXEEXT)
    5155
    52 $(srcdir)/svndigest-copy-cache.1: $(man_deps)
    53   @$(HELP2MAN) --no-info -o $@ \
    54   --include $(srcdir)/svndigest.x \
     56$(srcdir)/man/svndigest-copy-cache.1: $(man_deps)
     57  @$(MAKE) $(AM_MAKE_FLAGS) bin/svndigest-copy-cache$(EXEEXT)
     58  $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
     59  --include $(srcdir)/man/svndigest.x \
    5560  --version-option="--no-verbose --version" \
    5661  $(top_builddir)/bin/svndigest-copy-cache$(EXEEXT)
  • trunk/test/Makefile.am

    r1508 r1525  
    2121# along with svndigest. If not, see <http://www.gnu.org/licenses/>.
    2222
    23 check_SCRIPTS = svn_update.sh init.sh
     23check_SCRIPTS = test/svn_update.sh test/init.sh
    2424
    25 ## we use suffix .cc for all source
     25## we use suffix .cc for all test source
    2626AM_DEFAULT_SOURCE_EXT = .cc
    2727
    28 EXTRA_PROGRAMS = cache.test cache_partial.test color.test \
    29   config.test copyright.test date.test \
    30   graph.test htmlstream.test ignore_rev.test \
    31   parser.test option.test stats.test svn_diff.test trac.test utility.test \
    32   vector.test
     28EXTRA_PROGRAMS = test/cache.test test/cache_partial.test test/color.test \
     29  test/config.test test/copyright.test test/date.test \
     30  test/graph.test test/htmlstream.test test/ignore_rev.test \
     31  test/parser.test test/option.test test/stats.test \
     32  test/svn_diff.test test/trac.test test/utility.test \
     33  test/vector.test
    3334
    34 CLEANFILES = $(EXTRA_PROGRAMS)
     35CLEANFILES += $(EXTRA_PROGRAMS)
    3536
    36 option_test_SOURCES = option.cc $(top_srcdir)/bin/Parameter.cc \
    37   $(top_srcdir)/bin/AbstractParameter.cc $(top_srcdir)/bin/svndigestParameter.cc
     37test_option_test_SOURCES = test/option.cc bin/Parameter.cc \
     38  bin/AbstractParameter.cc bin/svndigestParameter.cc
    3839
    3940distributed_TESTS =
    40 distributed_TESTS += cmd_format_test.sh
    41 distributed_TESTS += config2_test.sh
    42 distributed_TESTS += config3_test.sh
    43 distributed_TESTS += config_props_test.sh
    44 distributed_TESTS += copyright2_test.sh
    45 distributed_TESTS += copyright_cache_test.sh
    46 distributed_TESTS += error_test.sh
    47 distributed_TESTS += ignore_revs_test.sh
    48 distributed_TESTS += link_root_test.sh
    49 distributed_TESTS += permission_test.sh
    50 distributed_TESTS += remove_cache_test.sh
    51 distributed_TESTS += repo_status_test.sh
    52 distributed_TESTS += repo_test.sh
    53 distributed_TESTS += svncopyright_test.sh
    54 distributed_TESTS += svndigest_copy_cache_test.sh
    55 distributed_TESTS += svndigest_copy_cache_test2.sh
    56 distributed_TESTS += traverse_test.sh
    57 distributed_TESTS += try_help_test.sh
     41distributed_TESTS += test/cmd_format_test.sh
     42distributed_TESTS += test/config2_test.sh
     43distributed_TESTS += test/config3_test.sh
     44distributed_TESTS += test/config_props_test.sh
     45distributed_TESTS += test/copyright2_test.sh
     46distributed_TESTS += test/copyright_cache_test.sh
     47distributed_TESTS += test/error_test.sh
     48distributed_TESTS += test/ignore_revs_test.sh
     49distributed_TESTS += test/link_root_test.sh
     50distributed_TESTS += test/permission_test.sh
     51distributed_TESTS += test/remove_cache_test.sh
     52distributed_TESTS += test/repo_status_test.sh
     53distributed_TESTS += test/repo_test.sh
     54distributed_TESTS += test/svncopyright_test.sh
     55distributed_TESTS += test/svndigest_copy_cache_test.sh
     56distributed_TESTS += test/svndigest_copy_cache_test2.sh
     57distributed_TESTS += test/traverse_test.sh
     58distributed_TESTS += test/try_help_test.sh
    5859
    5960TESTS = $(EXTRA_PROGRAMS) $(distributed_TESTS)
     
    6162TEST_EXTENSIONS = .sh .test
    6263
    63 EXTRA_DIST = $(distributed_TESTS)
     64EXTRA_DIST += $(distributed_TESTS)
    6465
    6566# tests not yet passing are listed here
    6667XFAIL_TESTS =
    6768
    68 noinst_HEADERS = Suite.h
     69noinst_HEADERS += test/Suite.h
    6970
    70 check_LIBRARIES = libsvndigesttest.a
     71check_LIBRARIES = test/libsvndigesttest.a
    7172
    72 LDADD = $(builddir)/libsvndigesttest.a \
    73   $(top_builddir)/lib/libsvndigest_core.a \
    74   $(top_builddir)/yat/libyat.a \
     73LDADD = test/libsvndigesttest.a \
     74  lib/libsvndigest_core.a \
     75  yat/libyat.a \
    7576  $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
    7677
    7778## graph test needs to link against Graph class
    78 graph_test_LDADD = $(LDADD) $(top_builddir)/lib/libsvndigest.a
     79test_graph_test_LDADD = $(LDADD) lib/libsvndigest.a
    7980
    80 AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
    81 
    82 AM_CPPFLAGS = -I$(top_srcdir) $(SVNDIGEST_CPPFLAGS)
    83 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    84 
    85 libsvndigesttest_a_SOURCES = Suite.cc
    86 
    87 clean-local:
    88   rm -rf generated_output toy_project testSubDir
    89 
    90 mostlyclean-local:
    91   rm -f *.png *.tmp *~
     81test_libsvndigesttest_a_SOURCES = test/Suite.cc
    9282
    9383.PHONY: lazycheck
     
    9686
    9787if HAVE_SVN_WC
    98 repo_stamp = $(srcdir)/repo/db/current svn_update.sh
     88repo_stamp = $(srcdir)/test/repo/db/current test/svn_update.sh
    9989else
    10090repo_stamp =
     
    10292
    10393# dependencies for lazycheck
    104 cmd_format_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
    105 config2_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
    106 config3_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT)
    107 config_props_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
    108 copyright2_test.log:init.sh $(top_builddir)/bin/svncopyright$(EXEEXT) $(repo_stamp)
    109 copyright_cache_test.log:init.sh $(top_builddir)/bin/svncopyright$(EXEEXT) $(repo_stamp)
    110 link_root_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
    111 permission_test.log:init.sh $(top_builddir)/bin/svncopyright$(EXEEXT) $(repo_stamp)
    112 repo_status_test.log:init.sh
    113 repo_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
    114 svncopyright_test.log:init.sh $(top_builddir)/bin/svncopyright$(EXEEXT)
    115 svndigest_copy_cache_test.log:init.sh $(top_builddir)/bin/svndigest-copy-cache $(repo_stamp)
    116 svndigest_copy_cache_test.log:init.sh $(top_builddir)/bin/svndigest-copy-cache $(repo_stamp)
    117 try_help_test.log:init.sh $(top_builddir)/bin/svndigest
     94cmd_format_test.log: test/init.sh bin/svndigest$(EXEEXT) $(repo_stamp)
     95config2_test.log: test/init.sh bin/svndigest$(EXEEXT) $(repo_stamp)
     96config3_test.log: test/init.sh bin/svndigest$(EXEEXT)
     97config_props_test.log: test/init.sh bin/svndigest$(EXEEXT) $(repo_stamp)
     98copyright2_test.log: test/init.sh bin/svncopyright$(EXEEXT) $(repo_stamp)
     99copyright_cache_test.log: test/init.sh bin/svncopyright$(EXEEXT) $(repo_stamp)
     100link_root_test.log: test/init.sh bin/svndigest$(EXEEXT) $(repo_stamp)
     101permission_test.log: test/init.sh bin/svncopyright$(EXEEXT) $(repo_stamp)
     102repo_status_test.log: test/init.sh
     103repo_test.log: test/init.sh bin/svndigest$(EXEEXT) $(repo_stamp)
     104svncopyright_test.log: test/init.sh bin/svncopyright$(EXEEXT)
     105svndigest_copy_cache_test.log: test/init.sh bin/svndigest-copy-cache \
     106  $(repo_stamp)
     107svndigest_copy_cache_test.log: test/init.sh bin/svndigest-copy-cache \
     108  $(repo_stamp)
     109try_help_test.log: test/init.sh bin/svndigest
    118110
    119111cache_partial.log: $(repo_stamp)
  • trunk/test/Suite.cc

    r1478 r1525  
    2424
    2525#include "Suite.h"
    26 #include "environment.h"
     26// include from topdir to allow VPATH build
     27#include "test/environment.h"
    2728
    2829#include "lib/Stats.h"
  • trunk/test/Suite.h

    r1478 r1525  
    2727#define EXIT_SKIP 77
    2828
    29 #include "environment.h"
     29// include from topdir to allow VPATH build
     30#include "test/environment.h"
    3031
    3132#include <string>
  • trunk/test/cmd_format_test.sh

    r1220 r1525  
    2222required="repo"
    2323
    24 . ./init.sh || exit 1
     24. test/init.sh || exit 99
    2525set -e
    2626
  • trunk/test/config2_test.sh

    r1220 r1525  
    2424required=repo
    2525
    26 . ./init.sh || exit 1
     26. test/init.sh || exit 99
    2727set -e
    2828
  • trunk/test/config3_test.sh

    r1220 r1525  
    2121# test that we can use /dev/null as config file
    2222
    23 . ./init.sh || exit 1
     23. test/init.sh || exit 99
    2424set -e
    2525
  • trunk/test/config_props_test.sh

    r1373 r1525  
    2424required="repo"
    2525
    26 . ./init.sh || exit 1
     26. test/init.sh || exit 99
    2727set -e
    2828
  • trunk/test/copyright2_test.sh

    r1515 r1525  
    2323required="repo"
    2424
    25 . ./init.sh || exit 1
     25. test/init.sh || exit 99
    2626
    2727# exit if cmd fails
  • trunk/test/copyright_cache_test.sh

    r1381 r1525  
    2222required="repo"
    2323
    24 . ./init.sh || exit 1
     24. test/init.sh || exit 99
    2525
    2626# exit if cmd fails
  • trunk/test/error_test.sh

    r1373 r1525  
    2424required=
    2525
    26 . ./init.sh || exit 1
     26. test/init.sh || exit 99
    2727
    2828# exit if cmd fails
  • trunk/test/ignore_revs_test.sh

    r1515 r1525  
    2121required="repo"
    2222
    23 . ./init.sh || exit 99
     23. test/init.sh || exit 99
    2424set -e
    2525
  • trunk/test/init.sh.in

    r1515 r1525  
    2222# along with svndigest. If not, see <http://www.gnu.org/licenses/>.
    2323
    24 exit_fail () 
    25 { 
     24exit_fail ()
     25{
    2626  set +x
    27   echo "$me: failed test: $@"; 
     27  echo "$me: failed test: $@";
    2828  exit 1
    2929}
    3030
    31 exit_skip () 
    32 { 
     31exit_skip ()
     32{
    3333  set +x
    34   echo "$me: skipped test: $@" 
     34  echo "$me: skipped test: $@"
    3535  exit 77
    3636}
    3737
    38 exit_success () 
    39 { 
     38exit_success ()
     39{
    4040  set +x
    41   echo "$me: successsful test: $@"; 
     41  echo "$me: successsful test: $@";
    4242  exit 0
    4343}
     
    6969
    7070test_dir=`echo $me.dir | sed -e 's,.*[\\/],,'`
    71 test_dir="testSubDir/$test_dir"
     71test_dir="test/testSubDir/$test_dir"
    7272$mkdir_p --verbose $test_dir
    7373cd $test_dir
  • trunk/test/link_root_test.sh

    r1264 r1525  
    2222required="repo"
    2323
    24 . ./init.sh || exit 1
     24. test/init.sh || exit 99
    2525
    2626targetdir=output
  • trunk/test/option.cc

    r1280 r1525  
    2121
    2222#include "Suite.h"
    23 #include "environment.h"
    2423
    2524#include "bin/svndigestParameter.h"
  • trunk/test/permission_test.sh

    r1392 r1525  
    2121required="repo"
    2222
    23 . ./init.sh || exit 1
     23. test/init.sh || exit 1
    2424set -e
    2525
  • trunk/test/remove_cache_test.sh

    r1438 r1525  
    2121required="repo"
    2222
    23 . ./init.sh || exit 99
     23. test/init.sh || exit 99
    2424set -e
    2525
  • trunk/test/repo_status_test.sh

    r978 r1525  
    2222
    2323required="wc"
    24 . ./init.sh
     24. test/init.sh || exit 99
    2525
    2626set -e
  • trunk/test/repo_test.sh

    r1256 r1525  
    2323required="repo"
    2424
    25 . ./init.sh || exit 1
     25. test/init.sh || exit 99
    2626
    2727targetdir=$abs_builddir/generated_output
  • trunk/test/svncopyright_test.sh

    r1220 r1525  
    2121required=""
    2222
    23 . ./init.sh || exit 1
     23. test/init.sh || exit 99
    2424set -e
    2525
  • trunk/test/svndigest_copy_cache_test.sh

    r1296 r1525  
    2020
    2121required="repo"
    22 set -x
    23 . ./init.sh || exit 1
     22. test/init.sh || exit 99
    2423set -e
    2524
  • trunk/test/svndigest_copy_cache_test2.sh

    r1515 r1525  
    2222
    2323required="repo"
    24 set -x
    25 . ./init.sh || exit 1
     24. test/init.sh || exit 99
    2625set -e
    2726
  • trunk/test/traverse_test.sh

    r1495 r1525  
    2727rm -rf testSubdir/traverse_test.sh.dir
    2828
    29 . ./init.sh || exit 99
     29. test/init.sh || exit 99
    3030
    3131daughter=.svndigest/branches_wc
  • trunk/test/try_help_test.sh

    r1420 r1525  
    2121required=""
    2222
    23 . ./init.sh || exit 99
     23. test/init.sh || exit 99
    2424set -e
    2525
  • trunk/yat/Makefile.am

    r1506 r1525  
    2222MOVE_IF_CHANGE = $(SHELL) $(abs_top_srcdir)/move-if-change
    2323
    24 AM_CPPFLAGS = $(SVNDIGEST_CPPFLAGS)
    25 AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
     24noinst_LIBRARIES += yat/libyat.a
    2625
    27 noinst_LIBRARIES = libyat.a
     26yat_headers =
     27yat_headers += yat/ColumnStream.h
     28yat_headers += yat/CommandLine.h
     29yat_headers += yat/deprecate.h
     30yat_headers += yat/Exception.h
     31yat_headers += yat/FileUtil.h
     32yat_headers += yat/Option.h
     33yat_headers += yat/OptionArg.h
     34yat_headers += yat/OptionHelp.h
     35yat_headers += yat/OptionSwitch.h
     36yat_headers += yat/Segment.h
     37yat_headers += yat/SegmentSet.h
     38yat_headers += yat/SegmentTree.h
     39yat_headers += yat/split.h
     40yat_headers += yat/stl_utility.h
     41yat_headers += yat/utility.h
     42yat_headers += yat/yat_assert.h
    2843
    29 noinst_HEADERS  =
    30 noinst_HEADERS += ColumnStream.h
    31 noinst_HEADERS += CommandLine.h
    32 noinst_HEADERS += deprecate.h
    33 noinst_HEADERS += Exception.h
    34 noinst_HEADERS += FileUtil.h
    35 noinst_HEADERS += Option.h
    36 noinst_HEADERS += OptionArg.h
    37 noinst_HEADERS += OptionHelp.h
    38 noinst_HEADERS += OptionSwitch.h
    39 noinst_HEADERS += Segment.h
    40 noinst_HEADERS += SegmentSet.h
    41 noinst_HEADERS += SegmentTree.h
    42 noinst_HEADERS += split.h
    43 noinst_HEADERS += stl_utility.h
    44 noinst_HEADERS += utility.h
    45 noinst_HEADERS += yat_assert.h
    46 
     44noinst_HEADERS += $(yat_headers)
    4745
    4846yat_cc_files =
    49 yat_cc_files += ColumnStream.cc
    50 yat_cc_files += CommandLine.cc
    51 yat_cc_files += Exception.cc
    52 yat_cc_files += FileUtil.cc
    53 yat_cc_files += Option.cc
    54 yat_cc_files += OptionHelp.cc
    55 yat_cc_files += OptionSwitch.cc
    56 yat_cc_files += split.cc
     47yat_cc_files += yat/ColumnStream.cc
     48yat_cc_files += yat/CommandLine.cc
     49yat_cc_files += yat/Exception.cc
     50yat_cc_files += yat/FileUtil.cc
     51yat_cc_files += yat/Option.cc
     52yat_cc_files += yat/OptionHelp.cc
     53yat_cc_files += yat/OptionSwitch.cc
     54yat_cc_files += yat/split.cc
    5755
    58 libyat_a_SOURCES = $(yat_cc_files) dummie.cc
    59 
    60 clean-local:; rm -rf Fetchdir
     56yat_libyat_a_SOURCES = $(yat_cc_files) yat/dummie.cc
    6157
    6258SVN = svn
    63 FETCH_FILES = config_public.h.in $(noinst_HEADERS) $(yat_cc_files)
     59## FIXME
     60FETCH_FILES = yat/config_public.h.in $(yat_headers) $(yat_cc_files)
     61
     62FETCH_DIR = Fetchdir/yat
    6463
    6564yat_url = http://dev.thep.lu.se/yat/svn/trunk/yat/utility
    6665
    6766fetch:
    68   test -d Fetchdir || $(SVN) co $(yat_url) Fetchdir
    69   (cd Fetchdir && $(SVN) revert -Rq . && $(SVN) update)
    70   cp $(srcdir)/Exception.cc.patch Fetchdir
    71   (cd Fetchdir && patch -i Exception.cc.patch || exit 1)
    72   cp $(srcdir)/stl_utility.h.patch Fetchdir
    73   (cd Fetchdir && patch -i stl_utility.h.patch || exit 1)
     67  test -d $(FETCH_DIR) || $(SVN) co $(yat_url) $(FETCH_DIR)
     68  (cd $(FETCH_DIR) && $(SVN) revert -Rq . && $(SVN) update)
     69  cp $(srcdir)/yat/Exception.cc.patch $(FETCH_DIR)
     70  (cd $(FETCH_DIR) && patch -i Exception.cc.patch || exit 1)
     71  cp $(srcdir)/yat/stl_utility.h.patch $(FETCH_DIR)
     72  (cd $(FETCH_DIR) && patch -i stl_utility.h.patch || exit 1)
    7473  @for f in $(FETCH_FILES); do \
    7574    $(MOVE_IF_CHANGE) Fetchdir/$$f $(srcdir)/$$f; \
Note: See TracChangeset for help on using the changeset viewer.