X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkConfigurationFile.h;h=e6dd488f78df23676b67fb072931693d12d23cfa;hb=a280c10c9ba7730cd9105a91bf1a40e72503a6e3;hp=aa5daf30aa58a67f55c99d20b38ae5b3d3f58e15;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/kernel/src/bbtkConfigurationFile.h b/kernel/src/bbtkConfigurationFile.h
index aa5daf3..e6dd488 100644
--- a/kernel/src/bbtkConfigurationFile.h
+++ b/kernel/src/bbtkConfigurationFile.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigurationFile.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:13 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2009/01/27 14:22:56 $
+  Version:   $Revision: 1.11 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -82,31 +82,28 @@ namespace bbtk
     
     ~ConfigurationFile();
     
-  private:
-    ConfigurationFile();
-    void InstallPath ();
-    
-  public:
     void GetHelp(int level) const;
 
+    /// Returns true iff the directory .bbtk has been created on construction
+    inline bool DotBbtkIsNew() { return mDot_bbtk_is_new; }
+
     inline const std::string& Get_description() const
     { return mDescription;}
-    //    inline const std::string& Get_url() const
-    //    { return mUrl;}
+
     inline const std::string& Get_data_path() const
     { return mData_path;}  
     inline const std::string& Get_file_separator() const
 	{ return mFile_separator;}
     
+    inline const std::string& Get_dot_bbtk_path() const
+    { return mDot_bbtk_path;}
     inline const std::string& Get_bin_path() const
     { return mBin_path;}
     inline const std::string& Get_install_path() const
     { return mInstall_path;}
     inline const std::string& Get_doc_path() const
     { return mDoc_path;}
-    inline const std::string& Get_rsc_path() const
-    { return mRsc_path;}
-    
+      
     inline const std::string& Get_root_bbs_path() const
     { return mBbs_path;}
     inline const std::vector<std::string>& Get_bbs_paths() const
@@ -116,15 +113,16 @@ namespace bbtk
     inline const std::string& Get_config_xml_full_path() const
     { return mConfig_xml_full_path;}
     inline const std::string& Get_default_temp_dir() const
-    { return mDefault_temp_dir;}
+    { return mTemp_path;}
 
     bool AddPackagePathsAndWrite( const std::string& package_root_path );
     
   private:
+    ConfigurationFile();
+    void InstallPath ();
     void Read(const std::string& fileName);
-     std::string GetExecutablePath();
-     void CreateConfigXML( char *rootDirectory );
-    
+    void CreateConfigXML( char *rootDirectory );
+    void InitializeDotBbtkStructure();
     // Attributes :
   private :
     std::string mDescription; 
@@ -134,20 +132,18 @@ namespace bbtk
     /// Set automatically :
     /// The path to the executable (usually bbi)
     std::string mBin_path;
+    /// The path to the .bbtk user's dir (e.g. /home/username/.bbtk)
+    std::string mDot_bbtk_path;
     /// The path to the install prefix (=mBinPath+"/..")
     std::string mInstall_path;
-    /// The relative path to the doc folder (=BBTK_DOC_REL_PATH)
-    std::string mDoc_rel_path;
-    /// The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
+    /// The path to the doc folder (=mDot_bbtk_path+"/doc")
     std::string mDoc_path;
+    /// Temp directory for generated data (=mDot_bbtk_path+"/tmp")
+    std::string mTemp_path;      
     /// The relative path to the doc folder (=BBTK_BBS_REL_PATH)
     std::string mBbs_rel_path;
     /// The path to the bbs folder (=mInstall_path+"/"+mBbs_rel_path)
     std::string mBbs_path;
-    /// The relative path to the rsc folder (=BBTK_RSC_REL_PATH)
-    std::string mRsc_rel_path;
-    /// The path to the rsc folder (=mInstall_path+"/"+mRsc_rel_path)
-    std::string mRsc_path;
     /// The path to the bbtk data folder 
     /// Initialized to mInstall_path+"/"+BBTK_DATA_REL_PATH
     /// But can be overriden by value read from bbtk_config.xml
@@ -165,9 +161,12 @@ namespace bbtk
     std::vector<std::string> mPackage_paths;
     /// If Packages link against extern dlls
     std::vector<std::string> mExt_dll_paths;
-    /// Temp directory for generated data
-    std::string mDefault_temp_dir;       
-  };
+
+
+    /// Set to true by InitializeDotBbtkStructure() if .bbtk has been newly
+    /// created
+    bool mDot_bbtk_is_new;
+   };
   
   
 }// namespace bbtk