-/*=========================================================================
-
+/*=========================================================================
Program: bbtk
Module: $RCSfile: bbtkConfigurationFile.cxx,v $
Language: C++
- Date: $Date: 2008/02/14 10:47:51 $
- Version: $Revision: 1.7 $
-
- Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
- l'Image). All rights reserved. See doc/license.txt or
- http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
+ Date: $Date: 2008/10/21 08:37:04 $
+ Version: $Revision: 1.19 $
=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+* This software is governed by the CeCILL-B license under French law and
+* abiding by the rules of distribution of free software. You can use,
+* modify and/ or redistribute the software under the terms of the CeCILL-B
+* license as circulated by CEA, CNRS and INRIA at the following URL
+* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+* or in the file LICENSE.txt.
+*
+* As a counterpart to the access to the source code and rights to copy,
+* modify and redistribute granted by the license, users are provided only
+* with a limited warranty and the software's author, the holder of the
+* economic rights, and the successive licensors have only limited
+* liability.
+*
+* The fact that you are presently reading this means that you have had
+* knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */
+
/**
*\file
*\brief Class bbtk::ConfigurationFile
#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
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
mPackage_paths.push_back(".");
-#ifndef WIN32
- // add system bin path (for build tree)
- // mPackage_paths.push_back(mBin_path);
+ // 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");
-#else
+//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 <<
// ==> Then we look for bbtk_config.xml in ".bbtk"
else
{
-#if defined(__GNUC__)
- std::string str_home(getenv("HOME"));
-#elif defined(_WIN32)
- std::string str_home(getenv("USERPROFILE"));
-#endif
- configXmlFullPathName = str_home + mFile_separator + ".bbtk/bbtk_config.xml";
+ configXmlFullPathName = Utilities::MakeUserSettingsFullFileName("bbtk_config.xml");
if (!Utilities::FileExists( configXmlFullPathName ))
{
// ==> Nothing found, we create bbtk_config.xml in ".bbtk"
FILE *fp;
char configXml[250];
sprintf (configXml , "%s/bbtk_config.xml", rootDirectory);
- bbtkMessage("Config",1, "in CreateConfigXML[" << configXml << "]" << std::endl);
+ bbtkDebugMessage("Config",1, "in CreateConfigXML[" << configXml << "]" << std::endl);
fp = fopen (configXml, "w");
fprintf(fp, "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n");
- // fprintf(fp, "<!DOCTYPE config SYSTEM \"/mnt/windows/bbtk/bbtk_config.xml>\n");
fprintf(fp, "<config>\n");
- fprintf(fp, " <description> </description>\n");
- // fprintf(fp, " <url> http://www.creatis.insa-lyon.fr/software/bbtk </url>\n");
- // fprintf(fp, " <install_path> </install_path>\n");
fprintf(fp, " <bbs_path> </bbs_path>\n");
- // fprintf(fp, " <ext_dll_path> </ext_dll_path>\n");
fprintf(fp, " <package_path> </package_path>\n");
- fprintf(fp, " <data_path> </data_path>\n");//, BBTK_DATA_PATH);
- /// \todo find a decent default value !
- ///fprintf(fp, " <default_temp_dir> %s </default_temp_dir>\n", " ");
- // when $ will be found, default_temp_dir value will be replaced
- fprintf(fp, " <default_temp_dir>$</default_temp_dir>\n");
- fprintf(fp, "</config>\n");
- fclose(fp);
+ fprintf(fp, "</config>\n");
+ fclose(fp);
}
//=========================================================================
}
//=========================================================================
+ //=========================================================================
+ bool ConfigurationFile::AddPackagePathsAndWrite( const std::string& path )
+ {
+ bbtkDebugMessageInc("Config",9,
+ "ConfigurationFile::AddPackagePathsAndWrite("
+ <<path<<")"<<std::endl);
+
+ XMLResults* res = new XMLResults;
+ XMLNode BB =
+ XMLNode::parseFile((XMLCSTR)Get_config_xml_full_path().c_str(),
+ (XMLCSTR)"config",res);
+
+ if ( res->error != eXMLErrorNone )
+ {
+ std::string mess = GetErrorMessage(res,Get_config_xml_full_path());
+ delete res;
+ bbtkDebugMessage("Config",1,mess<< std::endl);
+ bbtkError(mess);
+ }
+ delete res;
+
+#ifdef _WIN32
+ std::string bbs_path = path + "/bbs";
+#else
+ std::string bbs_path = path + "/share/bbtk/bbs" ;
+#endif
+ XMLNode BBSPATH = BB.addChild((XMLCSTR)"bbs_path");
+ BBSPATH.addText((XMLCSTR)bbs_path.c_str());
+ Utilities::replace(bbs_path, INVALID_FILE_SEPARATOR, VALID_FILE_SEPARATOR);
+ mBbs_paths.push_back(bbs_path);
+
+#ifdef _WIN32
+ std::string pack_path = path + "/bin";
+#else
+ std::string pack_path = path ;
+#endif
+ XMLNode PACKPATH = BB.addChild((XMLCSTR)"package_path");
+ PACKPATH.addText((XMLCSTR)pack_path.c_str());
+ Utilities::replace(pack_path,INVALID_FILE_SEPARATOR,VALID_FILE_SEPARATOR);
+ mPackage_paths.push_back(pack_path);
+
+#ifdef _WIN32
+ pack_path = path + "/Debug";
+ PACKPATH = BB.addChild((XMLCSTR)"package_path");
+ PACKPATH.addText((XMLCSTR)pack_path.c_str());
+ Utilities::replace(pack_path,INVALID_FILE_SEPARATOR,VALID_FILE_SEPARATOR);
+ mPackage_paths.push_back(pack_path);
+ pack_path = path + "/Release";
+ PACKPATH = BB.addChild((XMLCSTR)"package_path");
+ PACKPATH.addText((XMLCSTR)pack_path.c_str());
+ Utilities::replace(pack_path,INVALID_FILE_SEPARATOR,VALID_FILE_SEPARATOR);
+ mPackage_paths.push_back(pack_path);
+#endif
+
+
+ XMLError err = BB.writeToFile((XMLCSTR)Get_config_xml_full_path().c_str());
+ if ( err != eXMLErrorNone )
+ {
+ std::string mess = GetErrorMessage(res,Get_config_xml_full_path());
+ bbtkDebugMessage("Config",1,mess<< std::endl);
+ bbtkError(mess);
+ }
+
+ return true;
+ }
+ //=========================================================================
//=========================================================================
void ConfigurationFile::GetHelp(int level) const
bbtkMessage("Help",level, "=============" << std::endl);
bbtkMessage("Help",level, "Configuration" << std::endl);
bbtkMessage("Help",level, "=============" << std::endl);
- bbtkMessage("Help",level, "bbtk_config.xml : [" << config_xml_full_path << "]" << std::endl);
- bbtkMessage("Help",level, "Documentation Url : [" << url << "]" << std::endl);
- bbtkMessage("Help",level, "Data Path : [" << data_path << "]" << std::endl);
- bbtkMessage("Help",level, "Default Temp-Dir : [" << default_temp_dir << "]" << std::endl);
- bbtkMessage("Help",level, "File Separator : [" << file_separator << "]" << std::endl);
+ bbtkMessage("Help",level, "bbtk_config.xml : [" << config_xml_full_path << "]" << std::endl);
+ bbtkMessage("Help",level, "Documentation Path : [" << url << "]" << std::endl);
+ bbtkMessage("Help",level, "Data Path : [" << data_path << "]" << std::endl);
+ bbtkMessage("Help",level, "Temp Directory : [" << default_temp_dir << "]" << std::endl);
+ bbtkMessage("Help",level, "File Separator : [" << file_separator << "]" << std::endl);
std::vector<std::string>::const_iterator i;
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff