- Timestamp:
- Jun 12, 2010, 7:06:27 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bin/Makefile.am
r1060 r1086 33 33 34 34 LDADD = $(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) 36 AM_LDFLAGS = $(APR_LDFLAGS) $(SVN_LDFLAGS) $(PLPLOT_LDFLAGS) 37 37 38 38 AM_CPPFLAGS = -I$(top_srcdir)/lib $(DEFAULT_CPPFLAGS) \ 39 $(APR_CPPFLAGS) $(SVN_CPPFLAGS) 39 $(APR_CPPFLAGS) $(SVN_CPPFLAGS) $(PLPLOT_CPPFLAGS) 40 40 AM_CXXFLAGS = $(DEFAULT_CXXFLAGS) 41 41 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) 45 45 46 46 .as.in: -
trunk/bin/svncopyright.cc
r1085 r1086 23 23 24 24 #include "Configuration.h" 25 #include "Directory.h" 25 26 #include "main_utility.h" 26 27 … … 46 47 } 47 48 catch (std::runtime_error& e) { 48 std::cerr << cmd.program_name() << ": " << e.what() << std::endl;49 std::cerr << "svncopyright: " << e.what() << std::endl; 49 50 return EXIT_FAILURE; 50 51 } … … 60 61 std::cout << "Initializing SVN singleton." << std::endl; 61 62 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()); 62 73 } 63 74 catch (std::runtime_error& e) { -
trunk/bin/svndigest.cc
r1085 r1086 75 75 } 76 76 catch (std::runtime_error& e) { 77 std::cerr << cmd.program_name() << ": " << e.what() << std::endl;77 std::cerr << "svndigest: " << e.what() << std::endl; 78 78 return EXIT_FAILURE; 79 79 } … … 91 91 SVN::instance(option.root()); 92 92 93 // just for convenience94 Configuration& config = Configuration::instance();95 96 93 // Extract repository location 97 94 std::string repo=SVNinfo(option.root()).repos_root_url(); … … 114 111 115 112 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()); 120 114 } 121 122 if (option.verbose())123 std::cout << "Finalizing" << std::endl;124 125 115 } 126 116 catch (std::runtime_error& e) { -
trunk/lib/main_utility.cc
r1074 r1086 23 23 24 24 #include "Configuration.h" 25 #include "Node.h" 25 26 #include "utility.h" 26 27 … … 55 56 56 57 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 57 67 }} // end of namespace svndigest and namespace theplu -
trunk/lib/main_utility.h
r1071 r1086 33 33 namespace svndigest { 34 34 35 class Node; 36 35 37 /** 36 38 If \a file exists load configuration file, otherwise load default … … 41 43 void load_config(const std::string& file); 42 44 45 /** 46 \brief update copyright statements in \a node 47 */ 48 void update_copyright(const Node& node, bool verbose); 49 43 50 }} // end of namespace svndigest end of namespace theplu 44 51
Note: See TracChangeset
for help on using the changeset viewer.