]> Creatis software - bbtk.git/commitdiff
git://git.creatis.insa-lyon.fr / bbtk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2c81d41)
revert to mPackage_paths.push_back(mInstall_path + "/lib/creatools"); only
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Tue, 8 Mar 2011 16:56:13 +0000 (16:56 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Tue, 8 Mar 2011 16:56:13 +0000 (16:56 +0000)
kernel/src/bbtkConfigurationFile.cxx patch | blob | history

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index 408c7f765391bf0a99aee4717faca3b1399787ee..eaeca60440d756f923a2791230111a67359e8740 100644 (file)
--- a/kernel/src/bbtkConfigurationFile.cxx
+++ b/kernel/src/bbtkConfigurationFile.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigurationFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/03/08 11:32:02 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2011/03/08 16:56:13 $
+  Version:   $Revision: 1.37 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -46,24 +46,17 @@
 #endif
 
 
-
-
 namespace bbtk
 {
-
   //====================================================================
   /// Constructor
   ConfigurationFile::ConfigurationFile()
   {
-
-       mFile_separator = VALID_FILE_SEPARATOR;
+    mFile_separator = VALID_FILE_SEPARATOR;
 
     // ==> Set system paths
     mBin_path = Utilities::GetExecutablePath();
 
-
-
-
 /*     EED 23 Mars 2009
 #ifdef MACOSX
     mInstall_path = mBin_path + "/../../../..";
@@ -72,7 +65,6 @@ namespace bbtk
 #endif
 */
 #ifdef MACOSX
-
          std::string macPath("Contents/MacOS");
          int sbp = mBin_path.length();
          int smp = macPath.length();
@@ -80,12 +72,10 @@ namespace bbtk
          {
                  mBin_path = mBin_path + "/../../..";
          }
-
-
 #endif
-         mInstall_path = mBin_path + "/..";
-
 
+///\TODO : better use ??
+         mInstall_path = mBin_path + "/..";
 
     // The relative path to the doc folder (=BBTK_DOC_REL_PATH)
     //    mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH);
@@ -124,9 +114,6 @@ namespace bbtk
     bbtkMessage("config",1," ==> bbs    : '"<<mBbs_path<<"'"<<std::endl);
     bbtkMessage("config",1," ==> data   : '"<<mData_path<<"'"<<std::endl);
 
-
-
-
     // bbs_paths
     // always add "." (current working directory) at the begining
     mBbs_paths.push_back( "." );
@@ -157,8 +144,12 @@ namespace bbtk
     mPackage_paths.push_back(mBin_path);
     // add system lib path (for install tree)
     //EED    mPackage_paths.push_back(mInstall_path + mFile_separator + "lib");
-    mPackage_paths.push_back(mInstall_path + "/lib");
-    mPackage_paths.push_back(mInstall_path + "/lib64");
+    
+    //mPackage_paths.push_back(mInstall_path + "/lib"); // JPR
+    //mPackage_paths.push_back(mInstall_path + "/lib64");// JPR
+    
+    ///\TODO : better use BBTK_PACKAGE_LIB_PATH  // JPR
+    
     mPackage_paths.push_back(mInstall_path + "/lib/creatools");
     mPackage_paths.push_back(mInstall_path + "/lib64/creatools");
 #ifdef WIN32
@@ -174,8 +165,6 @@ namespace bbtk
       Utilities::replace( mPackage_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
     }
 
-
-
     GetHelp(2);
 
     // ==> First we look for bbtk_config.xml in "."
@@ -252,7 +241,6 @@ namespace bbtk
                          + BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH) + "/";
                        Utilities::MakeValidFileName(doc_path);
 
-
                        std::ofstream f;
                        f.open(filename.c_str(), std::ios::out );
                        f << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD "
Black Box Tool Kit