Changeset 11039 for trunk/FACT++

Timestamp:

06/16/11 19:41:33 (13 years ago)

Author:

tbretz

Message:

'UnLibToolize' the program name.

Location:

trunk/FACT++/src

Files:

• Configuration.cc (modified) (4 diffs)
• Configuration.h (modified) (1 diff)

trunk/FACT++/src/Configuration.cc

@@ -467 +467 @@
 //!
 //
-Configuration::Configuration(const string &prgname) : fName(prgname),
+Configuration::Configuration(const string &prgname) : fName(UnLibToolize(prgname)),
 fNameMapper(bind1st(mem_fun(&Configuration::DefaultMapper), this)),
 fPrintUsage(boost::bind(&Configuration::PrintUsage, this))
@@ -493 +493 @@
     po::options_description def_config;
     def_config.add_options()
-        ("default",  var<string>(prgname+string(".rc")), "Default configuration file.")
+        ("default",  var<string>(fName+string(".rc")), "Default configuration file.")
         ;
 
@@ -1035 +1035 @@
 // --------------------------------------------------------------------------
 //
+//! Removes /.libs/lt- from a path or just lt- from the filename.
+//!
+//! @param src
+//!    input path with filename
+//! @returns
+//!    path cleaned from libtool extensions
+//!
+string Configuration::UnLibToolize(const string &src) const
+{
+    const boost::filesystem::path path(src);
+
+    string pname = path.parent_path().string();
+    string fname = path.filename();
+
+    if (fname.substr(0, 3)=="lt-")
+        fname = fname.substr(3);
+
+    if (pname==".libs")
+        return fname;
+
+    const size_t pos = pname.length()-6;
+    if (pname.substr(pos)=="/.libs")
+        pname = pname.substr(0, pos);
+
+    return pname+'/'+fname;
+}
+
+// --------------------------------------------------------------------------
+//
 //! Print version information about the program and package.
 //!
@@ -1092 +1121 @@
     }
 
-    std::string n = boost::filesystem::basename(fName);
-    if (n.substr(0, 3)=="lt-")
-        n = n.substr(3);
+    const std::string n = boost::filesystem::path(fName).filename();
 
     const string name = PACKAGE_STRING;

trunk/FACT++/src/Configuration.h

@@ -63 +63 @@
     virtual void PrintUsage() const { }
     virtual void PrintVersion() const;
+
+    std::string UnLibToolize(const std::string &src) const;
 
 public: