Program: bbtk
Module: $RCSfile: bbtkConfigurationFile.cxx,v $
Language: C++
- Date: $Date: 2008/02/18 10:41:02 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2008/03/17 10:51:35 $
+ Version: $Revision: 1.14 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See doc/license.txt or
#include <direct.h> // for getcwd
#endif
+
+
namespace bbtk
{
/// Constructor
ConfigurationFile::ConfigurationFile()
{
- // file separator
-#if defined(_WIN32)
- mFile_separator = "\\";
-#else
- mFile_separator = "/";
-#endif
+
+ mFile_separator = VALID_FILE_SEPARATOR;
- // ==> Set system paths
+ // ==> Set system paths
mBin_path = GetExecutablePath();
- mInstall_path = mBin_path + mFile_separator + "..";
+//EED mInstall_path = mBin_path + mFile_separator + "..";
+ 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);
// The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
- mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path;
+//EED mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path;
+ mDoc_path = mInstall_path + "/" + mDoc_rel_path;
// The relative path to the doc folder (=BBTK_BBS_REL_PATH)
mBbs_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_BBS_REL_PATH);
// The path to the bbs folder (=mInstall_path+"/"+mBbs_rel_path)
- mBbs_path = mInstall_path + mFile_separator + mBbs_rel_path;
+//EED mBbs_path = mInstall_path + mFile_separator + mBbs_rel_path;
+ mBbs_path = mInstall_path + "/" + mBbs_rel_path;
// The relative path to the rsc folder (=BBTK_RSC_REL_PATH)
// mRsc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_RSC_REL_PATH);
// The path to the rsc folder (=mInstall_path+"/"+mRsc_rel_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
- mData_path = mInstall_path + mFile_separator + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH);
+//EED mData_path = mInstall_path + mFile_separator + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH);
+ mData_path = mInstall_path + "/" + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH);
+
+ Utilities::replace( mBin_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+ Utilities::replace( mInstall_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+ Utilities::replace( mDoc_rel_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+ Utilities::replace( mDoc_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+ Utilities::replace( mBbs_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+ Utilities::replace( mData_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
bbtkMessage("Config",1," ==> bin : '"<<mBin_path<<"'"<<std::endl);
bbtkMessage("Config",1," ==> prefix : '"<<mInstall_path<<"'"<<std::endl);
bbtkMessage("Config",1," ==> doc : '"<<mDoc_path<<"'"<<std::endl);
bbtkMessage("Config",1," ==> bbs : '"<<mBbs_path<<"'"<<std::endl);
- // bbtkMessage("Config",1," ==> rsc : '"<<mRsc_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(".");
+ mBbs_paths.push_back( "." );
// add system bbs path
-#ifdef WIN32
-//EED for windows BUILD tree
- mBbs_paths.push_back(mInstall_path + mFile_separator + ".." + mFile_separator + mBbs_rel_path);
-#endif
mBbs_paths.push_back(mBbs_path);
+ // add toolsbbtk/appli
+//EED std::string toolsappli_rel_path(mFile_separator);
+ std::string toolsappli_rel_path("/");
+//EED toolsappli_rel_path += "toolsbbtk" + mFile_separator + "appli";
+ toolsappli_rel_path += "toolsbbtk/appli";
+ //
+ //-----------------------------------------------------------
+ // LG : REMOVE BUGGY PATH WITH include *:
+ //
+ // mBbs_paths.push_back(mBbs_path + toolsappli_rel_path);
+ //-----------------------------------------------------------
+ int iStrVec,sizeStrVec;
+
+ sizeStrVec = mBbs_paths.size();
+ for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
+ Utilities::replace( mBbs_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+ }
// always add "." (current working directory) at the begining
// add system bin path (for build tree / standalone folder install)
mPackage_paths.push_back(mBin_path);
// add system lib path (for install tree)
- mPackage_paths.push_back(mInstall_path + mFile_separator + "lib");
+//EED mPackage_paths.push_back(mInstall_path + mFile_separator + "lib");
+ mPackage_paths.push_back(mInstall_path + "/lib");
#ifdef WIN32
// add bin/Debug bin/Release paths (for build/install tree)
- mPackage_paths.push_back(mBin_path + mFile_separator + "Debug");
- mPackage_paths.push_back(mBin_path + mFile_separator + "Release");
+//EED mPackage_paths.push_back(mBin_path + mFile_separator + "Debug");
+ mPackage_paths.push_back(mBin_path + "/Debug");
+//EED mPackage_paths.push_back(mBin_path + mFile_separator + "Release");
+ mPackage_paths.push_back(mBin_path + "/Release");
#endif
-
+
+ sizeStrVec = mPackage_paths.size();
+ for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
+ Utilities::replace( mPackage_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+ }
+
+
+
GetHelp(2);
// ==> First we look for bbtk_config.xml in "."
// LG : throw an exception
}
- std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml";
-
+// std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml";
+ std::string configXmlFullPathName = currentDir ;
+ configXmlFullPathName += "/bbtk_config.xml";
+ Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+
if ( Utilities::FileExists( configXmlFullPathName ))
{
bbtkMessage("Config",1, "ConfigurationFile : [" << configXmlFullPathName <<
#elif defined(_WIN32)
std::string str_home(getenv("USERPROFILE"));
#endif
- configXmlFullPathName = str_home + mFile_separator + ".bbtk/bbtk_config.xml";
+//EED configXmlFullPathName = str_home + mFile_separator + ".bbtk/bbtk_config.xml";
+ configXmlFullPathName = str_home + "/.bbtk/bbtk_config.xml";
+ Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+
if (!Utilities::FileExists( configXmlFullPathName ))
{
// ==> Nothing found, we create bbtk_config.xml in ".bbtk"
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff