3388 TDx

[crea.git] / appli / creaNewProject / creaNewProject.cpp

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index 0b2d98e3fba0fbbef8683e1e28b0108e2bf2435d..b7b1bf635c6e696e8deffb57b662aa82dafec4cb 100644 (file)
--- a/appli/creaNewProject/creaNewProject.cpp
+++ b/appli/creaNewProject/creaNewProject.cpp
@@ -1,3 +1,30 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  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.
+# ------------------------------------------------------------------------ 
+*/ 
+
 #include <creaWx.h>
 #include <wx/dirdlg.h>
 #include <stdlib.h> // for getenv
@@ -53,11 +80,15 @@ bool myApp::OnInit( )
        command2 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\"";
        if ( ! system ( command.c_str() ) )
        {
-               system ( command1.c_str() );
+               system ( command1.c_str() );
                system ( command2.c_str() );
 
         // Create a Package at the same time.   JPR
-               char *author = (char*) (authorWX.mb_str()) ;
+
+               //2018-07-06 mingw64
+//             char *author = (char*) (authorWX.mb_str()) ;
+               char *author = authorWX.mb_str() ;
+               
                std::string nomDirectory = crea::wx2std(dir) + "\\" + crea::wx2std(name);
                std::string nomPackageDirectory = nomDirectory + "\\" + "bbtk_" + crea::wx2std(name) + "_PKG";
                std::string bbCreatePackage("bbCreatePackage ");
@@ -94,8 +125,9 @@ bool myApp::OnInit( )
                // or, better, new trick :
                // bbCreatePackage nomDirectory nomPackage author Description
    
-//EED          char *author = getenv("USER");
-               char *author = (char*) (authorWX.mb_str()) ;
+//EED           char *author = getenv("USER");
+// JPR          char *author = (char*) (authorWX.mb_str());
+                std::string author(authorWX.mb_str());
                std::string nomDirectory = crea::wx2std(dir) + "/" + crea::wx2std(name);
                std::string nomPackageDirectory = nomDirectory + "/" + "bbtk_" + crea::wx2std(name) + "_PKG";