From: Eduardo DAVILA <davila@localhost.localdomain>
Date: Fri, 15 May 2020 07:33:20 +0000 (+0200)
Subject: #342 8BBTK Feature New Normal  -  Clean PlugPackage Windows
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d3e9248abd5502eeca0c84974cccf885d4744d8c;p=bbtk.git

#342 8BBTK Feature New Normal  -  Clean PlugPackage Windows
---

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index 0cc1448..e91dcfd 100644
--- a/kernel/src/bbtkConfigurationFile.cxx
+++ b/kernel/src/bbtkConfigurationFile.cxx
@@ -436,18 +436,16 @@ namespace bbtk
     char copyFile[250];
 
     if (!Utilities::FileExists(configXmlTmp)) // bbtk_config.xml.tmp not found (not installed)
-      {
-	// if "bbtk_path/bbtk_config.xml.tmp" doesn't exist, hard-create a minimum version in .bbtk
-	CreateConfigXML( rootDirectory );// create .bbtk
-      }
-    else
-      {
-	sprintf(copyFile,"cp %s  %s/bbtk_config.xml ",configXmlTmp,rootDirectory );
-	if (!Utilities::FileExists(configPath))
-	  {
-	    system(copyFile);
-	  }
-      }
+    {
+		// if "bbtk_path/bbtk_config.xml.tmp" doesn't exist, hard-create a minimum version in .bbtk
+		CreateConfigXML( rootDirectory );// create .bbtk
+    } else {
+		sprintf(copyFile,"cp %s  %s/bbtk_config.xml ",configXmlTmp,rootDirectory );
+		if (!Utilities::FileExists(configPath))
+		{
+		    system(copyFile);
+		} // FileExists configPath
+    } // FileExists configXmlTmp
     return;
 
     // ------------------------------------------------------------------
@@ -587,29 +585,35 @@ namespace bbtk
 
 	std::string pack_path;
 #ifdef _WIN32
-    pack_path = path + "/bin";
+    pack_path = path;
     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);
 
-    pack_path = path + "/RelWithDebInfo";
-    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 + "/Debug";
+    pack_path = path + "/bin";
     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);
+//    pack_path = path + "/RelWithDebInfo";
+//    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 + "/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);
 #else
     pack_path = path ;
     XMLNode PACKPATH = BB.addChild((XMLCSTR)"package_path");