#3203 BBTK Feature New Normal vtk7itk4wx3-mingw64

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index 4c6ffe3608d61dbb86f3b3530a7177fd0b87d97f..69a1ffd188f3340267098f79e786e439148fa22e 100644 (file)
--- a/kernel/src/bbtkConfigurationFile.cxx
+++ b/kernel/src/bbtkConfigurationFile.cxx
@@ -342,52 +342,7 @@ namespace bbtk
 
 
     // -----------------------------------------------------------------
-#if defined(__GNUC__)
-    // ------------------ create some usefull strings ----------------
-    // installed bbtk_path
-    char bbtk_path[1000];
-    strcpy(bbtk_path, Utilities::GetExecutablePath().c_str());  // JPR
-    //strcpy(bbtk_path, "/usr/local/bin");
-
-
-    std::string str_home=Utilities::GetEnvHome();
-
-       #if defined(WIN32)      
-               str_home="C:"+str_home;
-       #endif
-
-    // rootDirectory
-    char rootDirectory[200];
-    sprintf( rootDirectory,  "%s/.bbtk", str_home.c_str());
-
-    // configPath
-    char configPath[200];
-    sprintf(configPath, "%s/bbtk_config.xml",rootDirectory);
-
-    // configXmlTmp
-    char configXmlTmp[250];
-    sprintf(configXmlTmp, "%s/bbtk_config.xml.tmp", bbtk_path);
-
-    // copyFile
-    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);
-         }
-      }
-    return;
-
-    // ------------------------------------------------------------------
-#elif defined(WIN32)
+#if defined(WIN32)
 
     // installed bbtk_path
     char bbtk_path[100];
@@ -427,21 +382,64 @@ namespace bbtk
     int attribs = GetFileAttributes (rootDirectory);
     bbtkMessage("config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl);
     if ( attribs != 0xFFFFFFFF)
-      {
-       if ((attribs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY ) /// \TODO : check !
-         {
-           if ( GetFileAttributes( configPath ) == 0xFFFFFFFF)
-             {
+    {
+               if ((attribs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY ) /// \TODO : check !
+               {       
+                       if ( GetFileAttributes( configPath ) == 0xFFFFFFFF)
+                       {
+                               system(copyFile);
+                       }
+               }
+    } else {
+               system(makeDir);
                system(copyFile);
-             }
-         }
+       }
+  return;
+    // ------------------------------------------------------------------
+#elif defined(__GNUC__)
+    // ------------------ create some usefull strings ----------------
+    // installed bbtk_path
+    char bbtk_path[1000];
+    strcpy(bbtk_path, Utilities::GetExecutablePath().c_str());  // JPR
+    //strcpy(bbtk_path, "/usr/local/bin");
+
+
+    std::string str_home=Utilities::GetEnvHome();
+
+       #if defined(WIN32)      
+               str_home="C:"+str_home;
+       #endif
+
+    // rootDirectory
+    char rootDirectory[200];
+    sprintf( rootDirectory,  "%s/.bbtk", str_home.c_str());
+
+    // configPath
+    char configPath[200];
+    sprintf(configPath, "%s/bbtk_config.xml",rootDirectory);
+
+    // configXmlTmp
+    char configXmlTmp[250];
+    sprintf(configXmlTmp, "%s/bbtk_config.xml.tmp", bbtk_path);
+
+    // copyFile
+    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
       {
-       system(makeDir);
-       system(copyFile);
+       sprintf(copyFile,"cp %s  %s/bbtk_config.xml ",configXmlTmp,rootDirectory );
+       if (!Utilities::FileExists(configPath))
+         {
+           system(copyFile);
+         }
       }
     return;
+
     // ------------------------------------------------------------------
 #else
 /// \todo  ConfigurationFile::InstallPath() : exit when for not WIN32 and not__GNUC__