#3510 Bug Install bbtk package Linux MacOs

diff --git a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
index 8ced93949321a22c41a3e11b1fbd1a412bd4ab4c..ed0d026862dfed5f301a58c785f6649ec4a6f1fe 100644 (file)
--- a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
+++ b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
@@ -67,10 +67,15 @@ int main(int argc, char **argv)
     
   f.close();
   
-  
+  std::cout << "executing   update file: bbtk_config.xml " << std::endl;
   ConfigurationFile::GetInstance().AddPackagePathsAndWrite( path );
   
   std::string command;
+    
+#ifdef __APPLE__
+        command = "source ~/.bashrc ; " + command;
+#endif
+
 #if defined(WIN32)
        command = "\"";
 #endif
@@ -81,17 +86,20 @@ int main(int argc, char **argv)
   command += "\"";
 #endif
   command += " " + pname + " -q";
-  std::cout << "executing '" << command << "'" << std::endl;
-if ( system ( command.c_str() ) )
- {
-    std::cout << "An error occured while running '" 
-               << command << "'" << std::endl;
-     // return 1; Feature #1676 - DFGO
-  }
-
-        
+  std::cout << "(SKIP EED) executing '" << command << "'" << std::endl;
+//if ( system ( command.c_str() ) )
+// {
+//    std::cout << "An error occured while running '"
+//             << command << "'" << std::endl;
+//     // return 1; Feature #1676 - DFGO
+//  }
 
   command = "";
+    
+#ifdef __APPLE__
+        command = "source ~/.bashrc ; " + command;
+#endif
+
 #if defined(WIN32)
   command = "\"";
 #endif
@@ -102,18 +110,18 @@ if ( system ( command.c_str() ) )
   command += "\"";
 #endif
   command += " -q";
- std::cout << "executing '" << command << "'" << std::endl;
-  if ( ! system ( command.c_str() ) )
-    {
-      std::cout << "Package '" 
-               << pname << "' successfully plugged in" << std::endl;
-    }
-  else 
-    {
-      std::cout << "An error occured while running '" 
-               << command << "'" << std::endl;
-      //return 1; Feature #1676 - DFGO
-    }
+ std::cout << "(SKIP EED) executing '" << command << "'" << std::endl;
+    
+//  if ( ! system ( command.c_str() ) )
+//    {
+//      std::cout << "Package '"
+//             << pname << "' successfully plugged in" << std::endl;
+//    } else {
+//      std::cout << "An error occured while running '"
+//             << command << "'" << std::endl;
+//      //return 1; Feature #1676 - DFGO
+//    }
+    
   return (int)0;
 }
 //==========================================================================

diff --git a/kernel/cmake/BBTKConfigureBbtkConfigXmlForBuildTree.cmake b/kernel/cmake/BBTKConfigureBbtkConfigXmlForBuildTree.cmake
index d74fb5dbb04a9709e9da19c457acf9eb2a4fadcd..5ce3a09a6dcb02c7fd02077e1674b6dba8713b41 100644 (file)
--- a/kernel/cmake/BBTKConfigureBbtkConfigXmlForBuildTree.cmake
+++ b/kernel/cmake/BBTKConfigureBbtkConfigXmlForBuildTree.cmake
@@ -26,22 +26,17 @@
 
 #-----------------------------------------------------------------------------
 # bbtk_config.xml for the build tree
-IF(UNIX)
-  CONFIGURE_FILE(
-    ${BBTK_CMAKE_DIR}/bbtk_config_build.xml.in
-    ${EXECUTABLE_OUTPUT_PATH}/bbtk_config.xml
-    @ONLY IMMEDIATE
-   )
-ELSE(UNIX)
-  CONFIGURE_FILE(
-    ${BBTK_CMAKE_DIR}/bbtk_config_build.xml.in
-    ${EXECUTABLE_OUTPUT_PATH}/Debug/bbtk_config.xml
-    @ONLY IMMEDIATE
-   )
-  CONFIGURE_FILE(
-    ${BBTK_CMAKE_DIR}/bbtk_config_build.xml.in
-    ${EXECUTABLE_OUTPUT_PATH}/Release/bbtk_config.xml
-    @ONLY IMMEDIATE
-   )
-ENDIF(UNIX)
+#IF(UNIX)
+#  CONFIGURE_FILE(
+#    ${BBTK_CMAKE_DIR}/bbtk_config_build.xml.in
+#    ${EXECUTABLE_OUTPUT_PATH}/bbtk_config.xml
+#    @ONLY IMMEDIATE
+#   )
+#ELSE(UNIX)
+#  CONFIGURE_FILE(
+#    ${BBTK_CMAKE_DIR}/bbtk_config_build.xml.in
+#    ${EXECUTABLE_OUTPUT_PATH}/bbtk_config.xml
+#    @ONLY IMMEDIATE
+#   )
+#ENDIF(UNIX)
 #-----------------------------------------------------------------------------

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index 2b246b578ffeb5beb873a26821624aed681da0d2..c8d66306891ec1f210ff704e67a2c51c2581d884 100644 (file)
--- a/kernel/src/bbtkConfigurationFile.cxx
+++ b/kernel/src/bbtkConfigurationFile.cxx
@@ -169,9 +169,10 @@ namespace bbtk
 #endif
 
     sizeStrVec = mPackage_paths.size();
-    for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
+    for (iStrVec=0 ; iStrVec<sizeStrVec ; iStrVec++)
+    {
       Utilities::replace( mPackage_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-    }
+    } // for iStrVec
 
     GetHelp(2);
 
@@ -193,23 +194,19 @@ namespace bbtk
     Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
 
     if ( Utilities::FileExists( configXmlFullPathName ))
-      {
-       bbtkMessage("config",1, "ConfigurationFile : [" << configXmlFullPathName <<
-                   "] found in current directory" << std::endl);
-       //Read(configXmlFullPathName.c_str());
-       // traiter le fichier local
-      }
-
-    // ==> Then we look for bbtk_config.xml in ".bbtk"
-    else
-      {
-       configXmlFullPathName = Utilities::MakeUserSettingsFullFileName("bbtk_config.xml");
-       if (!Utilities::FileExists( configXmlFullPathName ))
-         {
-           // ==> Nothing found, we create bbtk_config.xml in ".bbtk"
-           InstallPath ();
-         }
-      }
+    {
+        bbtkMessage("config",1, "ConfigurationFile : [" << configXmlFullPathName <<
+                    "] found in current directory" << std::endl);
+        //Read(configXmlFullPathName.c_str());
+        // traiter le fichier local
+    }    else {   // ==> Then we look for bbtk_config.xml in ".bbtk"
+        configXmlFullPathName = Utilities::MakeUserSettingsFullFileName("bbtk_config.xml");
+        if (!Utilities::FileExists( configXmlFullPathName ))
+        {
+            // ==> Nothing found, we create bbtk_config.xml in ".bbtk"
+            InstallPath ();
+        } 
+    }
 
     // In any case, deal with bbtk_config.xml!
     Read(configXmlFullPathName.c_str());
@@ -323,7 +320,6 @@ namespace bbtk
   //=========================================================================
   void ConfigurationFile::InstallPath ()
   {
-
     /*--------------------------------------------------
       New policy for bbtk_config.xml :
 
@@ -448,6 +444,7 @@ namespace bbtk
                    system(copyFile);
                } // FileExists configPath
     } // FileExists configXmlTmp
+      
     return;
 
     // ------------------------------------------------------------------
@@ -554,7 +551,7 @@ namespace bbtk
       XMLNode::parseFile((XMLCSTR)Get_config_xml_full_path().c_str(),
                         (XMLCSTR)"config",res);
 
-    if ( res->error != eXMLErrorNone )
+      if ( res->error != eXMLErrorNone )
       {
        std::string mess = GetErrorMessage(res,Get_config_xml_full_path());
        delete res;
@@ -639,15 +636,13 @@ namespace bbtk
 #ifdef _WIN32
 #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);
-      }
-
+    {
+        std::string mess = GetErrorMessage(res,Get_config_xml_full_path());
+        bbtkDebugMessage("config",1,mess<< std::endl);
+        bbtkError(mess);
+    } // if err
     return true;
   }
   //=========================================================================