Changeset 1086 for trunk

Timestamp:

Jun 12, 2010, 7:06:27 AM (11 years ago)

Author:

Peter Johansson

Message:

first working version of svncopyright. refs #307. linking snvcopyright against plplot unfortunately.

Location:

trunk

Files:

• bin/Makefile.am (modified) (1 diff)
• bin/svncopyright.cc (modified) (3 diffs)
• bin/svndigest.cc (modified) (3 diffs)
• lib/main_utility.cc (modified) (2 diffs)
• lib/main_utility.h (modified) (2 diffs)

trunk/bin/Makefile.am

@@ -33 +33 @@
 
 LDADD = $(top_builddir)/lib/libsvndigest.a \
-  $(top_builddir)/lib/yat/libyat.a $(SVN_LIBS) $(APR_LIBS)
-AM_LDFLAGS = $(APR_LDFLAGS) $(SVN_LDFLAGS)
+  $(top_builddir)/lib/yat/libyat.a $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
+AM_LDFLAGS = $(APR_LDFLAGS) $(SVN_LDFLAGS) $(PLPLOT_LDFLAGS)
 
 AM_CPPFLAGS  = -I$(top_srcdir)/lib $(DEFAULT_CPPFLAGS) \
-  $(APR_CPPFLAGS) $(SVN_CPPFLAGS)
+  $(APR_CPPFLAGS) $(SVN_CPPFLAGS) $(PLPLOT_CPPFLAGS)
 AM_CXXFLAGS = $(DEFAULT_CXXFLAGS)
 
-svndigest_LDADD = $(LDADD) $(PLPLOT_LIBS)
-svndigest_LDFLAGS = $(AM_LDFLAGS) $(PLPLOT_LDFLAGS)
-svndigest_CPPFLAGS  = $(AM_CPPFLAGS) $(PLPLOT_CPPFLAGS)
+##svndigest_LDADD = $(LDADD) $(PLPLOT_LIBS)
+##svndigest_LDFLAGS = $(AM_LDFLAGS) $(PLPLOT_LDFLAGS)
+##svndigest_CPPFLAGS  = $(AM_CPPFLAGS) $(PLPLOT_CPPFLAGS)
 
 .as.in:

trunk/bin/svncopyright.cc

@@ -23 +23 @@
 
 #include "Configuration.h"
+#include "Directory.h"
 #include "main_utility.h"
 
@@ -46 +47 @@
   }
   catch (std::runtime_error& e) {
-    std::cerr << cmd.program_name() << ": " << e.what() << std::endl;
+    std::cerr << "svncopyright: " << e.what() << std::endl;
     return EXIT_FAILURE;
   }
@@ -60 +61 @@
       std::cout << "Initializing SVN singleton." << std::endl;
     SVN::instance(option.root());
+
+    // build directory tree already here ... see comment in svndigest.cc
+    if (option.verbose())
+      std::cout << "Building directory tree" << std::endl;
+    Directory tree(0,option.root(),"");
+
+    if (option.verbose())
+      std::cout << "Parsing directory tree" << std::endl;
+    tree.parse(option.verbose(), option.ignore_cache());
+    update_copyright(tree, option.verbose());
   }
   catch (std::runtime_error& e) {

trunk/bin/svndigest.cc

@@ -75 +75 @@
   }
   catch (std::runtime_error& e) {
-    std::cerr << cmd.program_name() << ": " << e.what() << std::endl;
+    std::cerr << "svndigest: " << e.what() << std::endl;
     return EXIT_FAILURE;
   }
@@ -91 +91 @@
     SVN::instance(option.root());
 
-    // just for convenience
-    Configuration& config = Configuration::instance();
-
     // Extract repository location
     std::string repo=SVNinfo(option.root()).repos_root_url();
@@ -114 +111 @@
 
     if (option.copyright()){
-      if (option.verbose())
-        std::cout << "Updating copyright statements" << std::endl;
-      std::map<std::string, Alias> alias(config.copyright_alias());
-      tree.print_copyright(alias, option.verbose());
+      update_copyright(tree, option.verbose());
     }
-
-    if (option.verbose())
-      std::cout << "Finalizing" << std::endl;
-
   }
   catch (std::runtime_error& e) {

trunk/lib/main_utility.cc

@@ -23 +23 @@
 
 #include "Configuration.h"
+#include "Node.h"
 #include "utility.h"
 
@@ -55 +56 @@
 
 
+  void update_copyright(const Node& tree, bool verbose)
+  {
+    if (verbose)
+      std::cout << "Updating copyright statements" << std::endl;
+    const Configuration& config = Configuration::instance();
+    std::map<std::string, Alias> alias(config.copyright_alias());
+    tree.print_copyright(alias, verbose);
+  }
+
 }} // end of namespace svndigest and namespace theplu

trunk/lib/main_utility.h

@@ -33 +33 @@
 namespace svndigest {
 
+  class Node;
+
   /**
      If \a file exists load configuration file, otherwise load default
@@ -41 +43 @@
   void load_config(const std::string& file);
 
+  /**
+     \brief update copyright statements in \a node
+   */
+  void update_copyright(const Node& node, bool verbose);
+
 }} // end of namespace svndigest end of namespace theplu