Changeset 1264

Timestamp:

Nov 2, 2010, 1:46:21 AM (13 years ago)

Author:

Peter Johansson

Message:

merge release 0.8.1 into trunk. Delta 0.8.1 - 0.8

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• NEWS (modified) (1 diff)
• bin/Parameter.cc (modified) (2 diffs)
• bin/Parameter.h (modified) (2 diffs)
• bin/svncopyright.cc (modified) (1 diff)
• bin/svndigest.cc (modified) (2 diffs)
• bin/svndigestParameter.cc (modified) (1 diff)
• build_support/Portfile.in (modified) (1 diff)
• lib/Directory.cc (modified) (1 diff)
• lib/Directory.h (modified) (2 diffs)
• lib/Node.cc (modified) (3 diffs)
• lib/Node.h (modified) (2 diffs)
• m4/apache_LICENSE-2.0.txt (modified) (1 prop)
• m4/ax_cxx_check_flag.m4 (modified) (1 prop)
• m4/ax_cxxcpp_check_flag.m4 (modified) (1 prop)
• m4/ax_ld_check_flag.m4 (modified) (1 prop)
• m4/find_apr.m4 (modified) (1 prop)
• m4/pkg.m4 (modified) (1 prop)
• m4/version.m4 (modified) (1 prop)
• m4/yat_add_flag.m4 (modified) (1 prop)
• test/Makefile.am (modified) (2 diffs)
• test/link_root_test.sh (copied) (copied from branches/0.8-stable/test/link_root_test.sh)
• test/parameter_test.cc (copied) (copied from branches/0.8-stable/test/parameter_test.cc)

trunk/Makefile.am

@@ -79 +79 @@
   -e 's|@VERSION[@]|$(VERSION)|g'
 
-build_support/Portfile: Makefile build_support/Portfile.in $(distdir).tar.gz.MD5
+build_support/Portfile: Makefile build_support/Portfile.in
   @rm -f $@ $@.t
-  @md5sum=`cut -f 1 -d ' ' $(distdir).tar.gz.MD5`;\
-  $(edit) -e "s|@MD5SUM[@]|$$md5sum|g" '$(srcdir)/$@.in' > $@.t
+  @openssl version > /dev/null || exit 1
+  @openssl sha1 $(distdir).tar.gz > $(distdir).tar.gz.sha1
+  @openssl rmd160 $(distdir).tar.gz > $(distdir).tar.gz.rmd160
+  @sha1=`cut -f 2 -d ' ' $(distdir).tar.gz.sha1`;\
+  rmd160=`cut -f 2 -d ' ' $(distdir).tar.gz.rmd160`;\
+  $(edit) -e "s|@SHA1SUM[@]|$$sha1|g" -e "s|@RMD160SUM[@]|$$rmd160|g" \
+  '$(srcdir)/$@.in' > $@.t
   @chmod a-w $@.t
   @mv $@.t $@

trunk/NEWS

@@ -15 +15 @@
 svndigest 0.8.x series from
     http://dev.thep.lu.se/svndigest/svn/branches/0.8-stable
+
+Version 0.8.1 (released 2 November 2010)
+  - fix bug when ROOT is symlink (ticket #477)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.8.1
 
 Version 0.8 (released 25 August 2010)

trunk/bin/Parameter.cc

@@ -91 +91 @@
       check_readable(root_.value());
       check_is_dir(root_.value());
+
       chdir(root_.value());
-      root_.value(pwd());
+      root_full_ = pwd();
       chdir(save_wd);
+
+      // take care of when root is a symlink (see ticket #477)
+      struct stat stats;
+      lstat(root_.value().c_str(), &stats);
+      if (S_ISLNK(stats.st_mode))
+        root_basename_ = file_name(root_.value());
+      else
+        root_basename_ = file_name(root_full_);
     }
 
@@ -190 +199 @@
   std::string Parameter::root(void) const
   {
-    return root_.value();
-  }
+    return root_full_;
+  }
+
+
+  const std::string& Parameter::root_basename(void) const
+  {
+    assert(root_basename_.size());
+    return root_basename_;
+  }
+
 
   void Parameter::set_default(void)

trunk/bin/Parameter.h

@@ -55 +55 @@
     bool generate_config(void) const ;
     bool ignore_cache(void) const;
-    /// @return absolute path to root directory
+
+    /**
+       @return Dereferenced absolute path to root directory
+    */
     std::string root(void) const;
+
+    /**
+       If --root argument is a link we return the file_name(argument).
+       Otherwise we return file_name(root()). See root(void).
+
+       \return basename of --root argument.
+     */
+    const std::string& root_basename(void) const;
     bool verbose(void) const;
 
@@ -83 +94 @@
     yat::utility::OptionSwitch ignore_cache_;
     yat::utility::OptionArg<std::string> root_;
+    std::string root_basename_;
+    std::string root_full_;
     yat::utility::OptionSwitch verbose_;
   protected:

trunk/bin/svncopyright.cc

@@ -65 +65 @@
     if (option.verbose())
       std::cout << "Building directory tree" << std::endl;
-    Directory tree(0,option.root(),"");
+    Directory tree(0,option.root(),"",option.root_basename());
 
     update_copyright(tree, option.verbose(), option.ignore_cache());

trunk/bin/svndigest.cc

@@ -113 +113 @@
     if (option.verbose())
       std::cout << "Building directory tree" << std::endl;
-    Directory tree(0,option.root(),"");
+    Directory tree(0,option.root(),"", option.root_basename());
 
     if (option.report())
@@ -244 +244 @@
   if (option.verbose())
     std::cout << "Generating output" << std::endl;
-  mkdir(tree.name());
-  chdir(tree.name());
+  mkdir(option.root_basename());
+  chdir(option.root_basename());
   print_css("svndigest.css");
   // create structure StatsType/Author/LineType

trunk/bin/svndigestParameter.cc

@@ -90 +90 @@
         check_readable(target_.value());
         check_is_dir(target_.value());
-        std::string base_root = file_name(root());
-        std::string path = concatenate_path(target_.value(),base_root); 
+        std::string path = concatenate_path(target_.value(),root_basename()); 
         if (access_rights(target_.value(), "w")) {
           std::stringstream ss;

trunk/build_support/Portfile.in

@@ -6 +6 @@
 name                svndigest
 version             @VERSION@
-revision            0
 categories          devel
 platforms           darwin
-maintainers         peter
+maintainers         gmail.com:pj31042
+
 description         Create statistics of a subversion repository
-long_description svndigest is a tool to extract development \
-information and statistics from a subversion repository.  Svndigest is \
-written in C++ and\ extracts repository history using the subversion \
-API. The resulting\ report is written to a user specifiable directory
-in HTML format.
+
+long_description    ${name} is a tool to extract development information and \
+                    statistics from a subversion repository. Svndigest is \
+                    written in C++ and extracts repository history using the \
+                    Subversion API. The resulting report is written to a user \
+                    specifiable directory in HTML format.
 
 homepage            @PACKAGE_URL@
 master_sites        sourceforge
-checksums           md5 @MD5SUM@
+
+checksums           sha1    @SHA1SUM@ \
+                    rmd160  @RMD160SUM@
+
+depends_build       port:pkgconfig
+
+depends_lib         port:subversion \
+                    port:apr \
+                    port:plplot
+
+use_parallel_build  yes
 
 test.run            yes
 test.target         check
-
-depends_lib         port:subversion port:apr port:plplot
-
-use_parallel_build  yes

trunk/lib/Directory.cc

@@ -52 +52 @@
 
   Directory::Directory(const unsigned int level, const std::string& path, 
-                       const std::string& output)
-    : Node(level,path,output)
+                       const std::string& output, const std::string& project)
+    : Node(level,path,output,project)
   {
     output_dir_=local_path();

trunk/lib/Directory.h

@@ -6 +6 @@
 /*
   Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -54 +54 @@
     ///
     Directory(const unsigned int level, const std::string& path, 
-              const std::string& output="");
+              const std::string& output="", const std::string& project="");
 
     ///

trunk/lib/Node.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -48 +48 @@
 
   Node::Node(const unsigned int level, const std::string& path, 
-             const std::string& local_path)
+             const std::string& local_path, const std::string& project)
     : level_(level), path_(path), stats_(path), log_(NULL),  
       svninfo_(path)
@@ -57 +57 @@
     svncopyright_ignore_=property.svncopyright_ignore();
     if (Node::project_==std::string()) // no root directory in local path
-      Node::project_ = file_name(path);
+      Node::project_ = project;
     else if (local_path.empty())
       local_path_ = file_name(path);

trunk/lib/Node.h

@@ -7 +7 @@
   Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
   Copyright (C) 2009 Peter Johansson
-  Copyright (C) 2010 Jari Häkkinen
+  Copyright (C) 2010 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -61 +61 @@
     /// @brief Constructor 
     /// 
-    Node(const unsigned int, const std::string&, const std::string&);
+    Node(const unsigned int, const std::string&, const std::string&, 
+         const std::string& = "");
 
     ///

trunk/test/Makefile.am

@@ -28 +28 @@
 EXTRA_PROGRAMS = cache_partial.test color.test \
   config.test copyright.test date.test \
-  graph.test htmlstream.test \
+  graph.test htmlstream.test parameter_test \
   parser.test stats.test svn_diff.test trac.test utility.test \
   vector.test
 
 CLEANFILES = $(EXTRA_PROGRAMS)
+
+parameter_test_SOURCES = parameter_test.cc $(top_srcdir)/bin/Parameter.cc \
+  $(top_srcdir)/bin/svndigestParameter.cc
 
 distributed_TESTS =
@@ -40 +43 @@
 distributed_TESTS += copyright2_test.sh
 distributed_TESTS += error_test.sh
+distributed_TESTS += link_root_test.sh
 distributed_TESTS += repo_status_test.sh
 distributed_TESTS += repo_test.sh