Changeset 1086


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/Makefile.am

    r1060 r1086  
    3333
    3434LDADD = $(top_builddir)/lib/libsvndigest.a \
    35   $(top_builddir)/lib/yat/libyat.a $(SVN_LIBS) $(APR_LIBS)
    36 AM_LDFLAGS = $(APR_LDFLAGS) $(SVN_LDFLAGS)
     35  $(top_builddir)/lib/yat/libyat.a $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
     36AM_LDFLAGS = $(APR_LDFLAGS) $(SVN_LDFLAGS) $(PLPLOT_LDFLAGS)
    3737
    3838AM_CPPFLAGS  = -I$(top_srcdir)/lib $(DEFAULT_CPPFLAGS) \
    39   $(APR_CPPFLAGS) $(SVN_CPPFLAGS)
     39  $(APR_CPPFLAGS) $(SVN_CPPFLAGS) $(PLPLOT_CPPFLAGS)
    4040AM_CXXFLAGS = $(DEFAULT_CXXFLAGS)
    4141
    42 svndigest_LDADD = $(LDADD) $(PLPLOT_LIBS)
    43 svndigest_LDFLAGS = $(AM_LDFLAGS) $(PLPLOT_LDFLAGS)
    44 svndigest_CPPFLAGS  = $(AM_CPPFLAGS) $(PLPLOT_CPPFLAGS)
     42##svndigest_LDADD = $(LDADD) $(PLPLOT_LIBS)
     43##svndigest_LDFLAGS = $(AM_LDFLAGS) $(PLPLOT_LDFLAGS)
     44##svndigest_CPPFLAGS  = $(AM_CPPFLAGS) $(PLPLOT_CPPFLAGS)
    4545
    4646.as.in:
  • trunk/bin/svncopyright.cc

    r1085 r1086  
    2323
    2424#include "Configuration.h"
     25#include "Directory.h"
    2526#include "main_utility.h"
    2627
     
    4647  }
    4748  catch (std::runtime_error& e) {
    48     std::cerr << cmd.program_name() << ": " << e.what() << std::endl;
     49    std::cerr << "svncopyright: " << e.what() << std::endl;
    4950    return EXIT_FAILURE;
    5051  }
     
    6061      std::cout << "Initializing SVN singleton." << std::endl;
    6162    SVN::instance(option.root());
     63
     64    // build directory tree already here ... see comment in svndigest.cc
     65    if (option.verbose())
     66      std::cout << "Building directory tree" << std::endl;
     67    Directory tree(0,option.root(),"");
     68
     69    if (option.verbose())
     70      std::cout << "Parsing directory tree" << std::endl;
     71    tree.parse(option.verbose(), option.ignore_cache());
     72    update_copyright(tree, option.verbose());
    6273  }
    6374  catch (std::runtime_error& e) {
  • trunk/bin/svndigest.cc

    r1085 r1086  
    7575  }
    7676  catch (std::runtime_error& e) {
    77     std::cerr << cmd.program_name() << ": " << e.what() << std::endl;
     77    std::cerr << "svndigest: " << e.what() << std::endl;
    7878    return EXIT_FAILURE;
    7979  }
     
    9191    SVN::instance(option.root());
    9292
    93     // just for convenience
    94     Configuration& config = Configuration::instance();
    95 
    9693    // Extract repository location
    9794    std::string repo=SVNinfo(option.root()).repos_root_url();
     
    114111
    115112    if (option.copyright()){
    116       if (option.verbose())
    117         std::cout << "Updating copyright statements" << std::endl;
    118       std::map<std::string, Alias> alias(config.copyright_alias());
    119       tree.print_copyright(alias, option.verbose());
     113      update_copyright(tree, option.verbose());
    120114    }
    121 
    122     if (option.verbose())
    123       std::cout << "Finalizing" << std::endl;
    124 
    125115  }
    126116  catch (std::runtime_error& e) {
  • trunk/lib/main_utility.cc

    r1074 r1086  
    2323
    2424#include "Configuration.h"
     25#include "Node.h"
    2526#include "utility.h"
    2627
     
    5556
    5657
     58  void update_copyright(const Node& tree, bool verbose)
     59  {
     60    if (verbose)
     61      std::cout << "Updating copyright statements" << std::endl;
     62    const Configuration& config = Configuration::instance();
     63    std::map<std::string, Alias> alias(config.copyright_alias());
     64    tree.print_copyright(alias, verbose);
     65  }
     66
    5767}} // end of namespace svndigest and namespace theplu
  • trunk/lib/main_utility.h

    r1071 r1086  
    3333namespace svndigest {
    3434
     35  class Node;
     36
    3537  /**
    3638     If \a file exists load configuration file, otherwise load default
     
    4143  void load_config(const std::string& file);
    4244
     45  /**
     46     \brief update copyright statements in \a node
     47   */
     48  void update_copyright(const Node& node, bool verbose);
     49
    4350}} // end of namespace svndigest end of namespace theplu
    4451
Note: See TracChangeset for help on using the changeset viewer.