Changeset 1264 for trunk


Ignore:
Timestamp:
Nov 2, 2010, 1:46:21 AM (10 years ago)
Author:
Peter Johansson
Message:

merge release 0.8.1 into trunk. Delta 0.8.1 - 0.8

Location:
trunk
Files:
22 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Makefile.am

    r1182 r1264  
    7979  -e 's|@VERSION[@]|$(VERSION)|g'
    8080
    81 build_support/Portfile: Makefile build_support/Portfile.in $(distdir).tar.gz.MD5
     81build_support/Portfile: Makefile build_support/Portfile.in
    8282  @rm -f $@ $@.t
    83   @md5sum=`cut -f 1 -d ' ' $(distdir).tar.gz.MD5`;\
    84   $(edit) -e "s|@MD5SUM[@]|$$md5sum|g" '$(srcdir)/$@.in' > $@.t
     83  @openssl version > /dev/null || exit 1
     84  @openssl sha1 $(distdir).tar.gz > $(distdir).tar.gz.sha1
     85  @openssl rmd160 $(distdir).tar.gz > $(distdir).tar.gz.rmd160
     86  @sha1=`cut -f 2 -d ' ' $(distdir).tar.gz.sha1`;\
     87  rmd160=`cut -f 2 -d ' ' $(distdir).tar.gz.rmd160`;\
     88  $(edit) -e "s|@SHA1SUM[@]|$$sha1|g" -e "s|@RMD160SUM[@]|$$rmd160|g" \
     89  '$(srcdir)/$@.in' > $@.t
    8590  @chmod a-w $@.t
    8691  @mv $@.t $@
  • trunk/NEWS

    r1182 r1264  
    1515svndigest 0.8.x series from
    1616    http://dev.thep.lu.se/svndigest/svn/branches/0.8-stable
     17
     18Version 0.8.1 (released 2 November 2010)
     19  - fix bug when ROOT is symlink (ticket #477)
     20
     21  A complete list of closed tickets can be found here [[br]]
     22  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.8.1
    1723
    1824Version 0.8 (released 25 August 2010)
  • trunk/bin/Parameter.cc

    r1241 r1264  
    9191      check_readable(root_.value());
    9292      check_is_dir(root_.value());
     93
    9394      chdir(root_.value());
    94       root_.value(pwd());
     95      root_full_ = pwd();
    9596      chdir(save_wd);
     97
     98      // take care of when root is a symlink (see ticket #477)
     99      struct stat stats;
     100      lstat(root_.value().c_str(), &stats);
     101      if (S_ISLNK(stats.st_mode))
     102        root_basename_ = file_name(root_.value());
     103      else
     104        root_basename_ = file_name(root_full_);
    96105    }
    97106
     
    190199  std::string Parameter::root(void) const
    191200  {
    192     return root_.value();
    193   }
     201    return root_full_;
     202  }
     203
     204
     205  const std::string& Parameter::root_basename(void) const
     206  {
     207    assert(root_basename_.size());
     208    return root_basename_;
     209  }
     210
    194211
    195212  void Parameter::set_default(void)
  • trunk/bin/Parameter.h

    r1119 r1264  
    5555    bool generate_config(void) const ;
    5656    bool ignore_cache(void) const;
    57     /// @return absolute path to root directory
     57
     58    /**
     59       @return Dereferenced absolute path to root directory
     60    */
    5861    std::string root(void) const;
     62
     63    /**
     64       If --root argument is a link we return the file_name(argument).
     65       Otherwise we return file_name(root()). See root(void).
     66
     67       \return basename of --root argument.
     68     */
     69    const std::string& root_basename(void) const;
    5970    bool verbose(void) const;
    6071
     
    8394    yat::utility::OptionSwitch ignore_cache_;
    8495    yat::utility::OptionArg<std::string> root_;
     96    std::string root_basename_;
     97    std::string root_full_;
    8598    yat::utility::OptionSwitch verbose_;
    8699  protected:
  • trunk/bin/svncopyright.cc

    r1234 r1264  
    6565    if (option.verbose())
    6666      std::cout << "Building directory tree" << std::endl;
    67     Directory tree(0,option.root(),"");
     67    Directory tree(0,option.root(),"",option.root_basename());
    6868
    6969    update_copyright(tree, option.verbose(), option.ignore_cache());
  • trunk/bin/svndigest.cc

    r1257 r1264  
    113113    if (option.verbose())
    114114      std::cout << "Building directory tree" << std::endl;
    115     Directory tree(0,option.root(),"");
     115    Directory tree(0,option.root(),"", option.root_basename());
    116116
    117117    if (option.report())
     
    244244  if (option.verbose())
    245245    std::cout << "Generating output" << std::endl;
    246   mkdir(tree.name());
    247   chdir(tree.name());
     246  mkdir(option.root_basename());
     247  chdir(option.root_basename());
    248248  print_css("svndigest.css");
    249249  // create structure StatsType/Author/LineType
  • trunk/bin/svndigestParameter.cc

    r1234 r1264  
    9090        check_readable(target_.value());
    9191        check_is_dir(target_.value());
    92         std::string base_root = file_name(root());
    93         std::string path = concatenate_path(target_.value(),base_root);
     92        std::string path = concatenate_path(target_.value(),root_basename());
    9493        if (access_rights(target_.value(), "w")) {
    9594          std::stringstream ss;
  • trunk/build_support/Portfile.in

    r1182 r1264  
    66name                svndigest
    77version             @VERSION@
    8 revision            0
    98categories          devel
    109platforms           darwin
    11 maintainers         peter
     10maintainers         gmail.com:pj31042
     11
    1212description         Create statistics of a subversion repository
    13 long_description svndigest is a tool to extract development \
    14 information and statistics from a subversion repository.  Svndigest is \
    15 written in C++ and\ extracts repository history using the subversion \
    16 API. The resulting\ report is written to a user specifiable directory
    17 in HTML format.
     13
     14long_description    ${name} is a tool to extract development information and \
     15                    statistics from a subversion repository. Svndigest is \
     16                    written in C++ and extracts repository history using the \
     17                    Subversion API. The resulting report is written to a user \
     18                    specifiable directory in HTML format.
    1819
    1920homepage            @PACKAGE_URL@
    2021master_sites        sourceforge
    21 checksums           md5 @MD5SUM@
     22
     23checksums           sha1    @SHA1SUM@ \
     24                    rmd160  @RMD160SUM@
     25
     26depends_build       port:pkgconfig
     27
     28depends_lib         port:subversion \
     29                    port:apr \
     30                    port:plplot
     31
     32use_parallel_build  yes
    2233
    2334test.run            yes
    2435test.target         check
    25 
    26 depends_lib         port:subversion port:apr port:plplot
    27 
    28 use_parallel_build  yes
  • trunk/lib/Directory.cc

    r1238 r1264  
    5252
    5353  Directory::Directory(const unsigned int level, const std::string& path,
    54                        const std::string& output)
    55     : Node(level,path,output)
     54                       const std::string& output, const std::string& project)
     55    : Node(level,path,output,project)
    5656  {
    5757    output_dir_=local_path();
  • trunk/lib/Directory.h

    r1238 r1264  
    66/*
    77  Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
    8   Copyright (C) 2009 Peter Johansson
     8  Copyright (C) 2009, 2010 Peter Johansson
    99
    1010  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    5454    ///
    5555    Directory(const unsigned int level, const std::string& path,
    56               const std::string& output="");
     56              const std::string& output="", const std::string& project="");
    5757
    5858    ///
  • trunk/lib/Node.cc

    r1256 r1264  
    33/*
    44  Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
    5   Copyright (C) 2009 Peter Johansson
     5  Copyright (C) 2009, 2010 Peter Johansson
    66
    77  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    4848
    4949  Node::Node(const unsigned int level, const std::string& path,
    50              const std::string& local_path)
     50             const std::string& local_path, const std::string& project)
    5151    : level_(level), path_(path), stats_(path), log_(NULL), 
    5252      svninfo_(path)
     
    5757    svncopyright_ignore_=property.svncopyright_ignore();
    5858    if (Node::project_==std::string()) // no root directory in local path
    59       Node::project_ = file_name(path);
     59      Node::project_ = project;
    6060    else if (local_path.empty())
    6161      local_path_ = file_name(path);
  • trunk/lib/Node.h

    r1238 r1264  
    77  Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
    88  Copyright (C) 2009 Peter Johansson
    9   Copyright (C) 2010 Jari Häkkinen
     9  Copyright (C) 2010 Jari Häkkinen, Peter Johansson
    1010
    1111  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    6161    /// @brief Constructor
    6262    ///
    63     Node(const unsigned int, const std::string&, const std::string&);
     63    Node(const unsigned int, const std::string&, const std::string&,
     64         const std::string& = "");
    6465
    6566    ///
  • trunk/m4/apache_LICENSE-2.0.txt

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_cxx_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_cxxcpp_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_ld_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/find_apr.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/pkg.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/version.m4

  • trunk/m4/yat_add_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/test/Makefile.am

    r1220 r1264  
    2828EXTRA_PROGRAMS = cache_partial.test color.test \
    2929  config.test copyright.test date.test \
    30   graph.test htmlstream.test \
     30  graph.test htmlstream.test parameter_test \
    3131  parser.test stats.test svn_diff.test trac.test utility.test \
    3232  vector.test
    3333
    3434CLEANFILES = $(EXTRA_PROGRAMS)
     35
     36parameter_test_SOURCES = parameter_test.cc $(top_srcdir)/bin/Parameter.cc \
     37  $(top_srcdir)/bin/svndigestParameter.cc
    3538
    3639distributed_TESTS =
     
    4043distributed_TESTS += copyright2_test.sh
    4144distributed_TESTS += error_test.sh
     45distributed_TESTS += link_root_test.sh
    4246distributed_TESTS += repo_status_test.sh
    4347distributed_TESTS += repo_test.sh
Note: See TracChangeset for help on using the changeset viewer.