Changeset 49 for trunk

Timestamp:

Jan 14, 2006, 1:53:56 AM (17 years ago)

Author:

Jari Häkkinen

Message:

bin directory compiles but svnstat not finished.

Location:

trunk/bin

Files:

• Makefile.am (modified) (1 diff)
• Parameter.cc (modified) (5 diffs)
• Parameter.h (modified) (2 diffs)
• rmdirhier.cc (added)
• rmdirhier.h (added)
• svnstat.cc (modified) (2 diffs)

trunk/bin/Makefile.am

@@ -5 +5 @@
 bin_PROGRAMS = svnstat
 
-svnstat_SOURCES = svnstat.cc Parameter.cc
+svnstat_SOURCES = Parameter.cc rmdirhier.cc svnstat.cc
 
-EXTRA_DIST = Parameter.h
+LDADD = @top_srcdir@/lib/libsvnstat.a
+
+INCLUDES = -I@top_srcdir@/lib
+
+clean-local: 
+  rm -rf svnstat_output *~

trunk/bin/Parameter.cc

@@ -4 +4 @@
 
 #include <iostream>
+#include <stdexcept>
 #include <string>
 
@@ -10 +11 @@
 
   Parameter::Parameter(const int argc,const char *argv[])
-    : force_(false), outdir_("svnstat"), root_("."), verbose_(false)
+    : force_(false), root_("."), targetdir_("svnstat_output"), verbose_(false)
   {
   
@@ -18 +19 @@
       if (myargv=="-d" || myargv=="--directory"){
         if (++i<argc){
-          outdir_= std::string(argv[i]);
+          targetdir_= std::string(argv[i]);
           ok=true;
         }
@@ -42 +43 @@
         ok = true;
       }
-      if (!ok){
-        std::cerr << "svnstat: invalid option: " << myargv << "\n"
-                  << "Type 'svnstat --help' for usage." << std::endl;
-        exit(-1);
-      }
+
+      if (!ok)
+        throw std::runtime_error("svnstat: invalid option: " + myargv +
+                                 "\nType 'svnstat --help' for usage.");
     }
 
@@ -71 +71 @@
               << "\n"
               << "Valid options:\n"
-              << "  -d [--dir] arg : output directory [svnstat]\n"
-              << "  -f [--force]   : overwrite existing files\n"
+              << "  -d [--dir] arg : output target directory [svnstat_output]\n"
+              << "  -f [--force]   : remove target directory/file if it exists\n"
+              << "                   [no force]\n"
               << "  -h [--help]    : display this help and exit\n"
               << "  -v [--verbose] : explain what is being done\n"

trunk/bin/Parameter.h

@@ -14 +14 @@
     Parameter(const int argc,const char *argv[]);
     inline bool force(void) const { return force_; }
-    inline const std::string& outdir(void) const { return outdir_; }
     inline const std::string& root(void) const { return root_; }
+    inline const std::string& targetdir(void) const { return targetdir_; }
     inline bool verbose(void) const { return verbose_; }
 
@@ -24 +24 @@
 
     bool force_;
-    std::string outdir_;
     std::string root_;
+    std::string targetdir_;
     bool verbose_;
-    
+
   };
 

trunk/bin/svnstat.cc

@@ -2 +2 @@
 
 #include "Parameter.h"
+#include "Directory.h"
+
+#include <stdexcept>
+#include <string>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <iostream>
+
+using namespace std;
+
+///
+/// Create directory \a dir. The call can fail in many ways, cf. 'man
+/// mkdir'. If the \a dir exists, setting \a force to true will
+/// trigger a recursive removal of the target \a dir.
+///
+int createdir(const string& dir, bool force=false);
+
 
 int main(const int argc,const char* argv[])
@@ -8 +26 @@
   Parameter option(argc,argv);
 
+  if (createdir(option.targetdir(),option.force()))
+    throw runtime_error("Failed to create target directory '" +
+                        option.targetdir());
+
+  /*
+  Directory tree(option.root());
+  tree.purge();
+  tree.parse();
+
+  Stats::gnuplot_pipe_.command("cd 'svnstat_output'");
+  chdir("svnstat_output");
+  system("ln -fns testrepo.html index.html");
+  tree.print("./");
+  */
+
   exit(0);        // normal exit
 }
+
+
+int createdir(const string& dir, bool force)
+{
+  struct stat buf;
+  if (force && !stat(dir.c_str(),&buf)) {
+    std::cerr << "Remove item '" << dir << "'."
+              << std::endl;
+    std::cerr << unlink(dir.c_str()) << std::endl;
+  }
+
+  return mkdir(dir.c_str(),0777);
+}