Feature #1711 CreaDevManager application implementation

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

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index b0e9f8ee63b811eaba56d52241687d9f4f07071f..17f64baeb072bc7f1ea1838da33f1e20f04e6b7b 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
@@ -35,6 +62,13 @@ bool myApp::OnInit( )
                                     _T("NO_DESCRIPTION"));
    if (description.IsEmpty()) return false;
 
+   wxString authorWX = wxGetTextFromUser(_T("Author (One word)"),
+                                    _T("Author"),
+                                    _T("Author_Name"));
+   if (description.IsEmpty()) return false;
+
+
+
 #if(_WIN32)
      
        std::string command("creaNewProject.bat ");
@@ -48,24 +82,21 @@ bool myApp::OnInit( )
        {
                system ( command1.c_str() );
                system ( command2.c_str() );
+
+        // Create a Package at the same time.   JPR
+               char *author = (char*) (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 ");
+               bbCreatePackage += nomDirectory + " " + crea::wx2std(name) + " " + author + " " + crea::wx2std(description);
+               system (bbCreatePackage.c_str());               
+               std::string add;
+               add = "echo ADD_SUBDIRECTORY(bbtk_" + crea::wx2std(name)  + "_PKG) >> " + nomDirectory + "/CMakeLists.txt";
+               system(add.c_str());
+
                wxMessageBox(_T("New Project created !"),_T("creaNewProject"),
                                wxOK | wxICON_INFORMATION);
-
-                // Create a Package at the same time.   JPR
-               
-               /// \TODO rewrite, according to new trick // JPR
-                                  // \TODO rewrite, according to new trick // JPR
-                                       char * install_Dir = getenv("bbtk_DIR");
-                                               if(install_Dir != NULL) // variable not always defined
-                                               {
-                                                       std::string execGUICreateNewPackage(install_Dir);
-                                                       execGUICreateNewPackage = "bbi " + execGUICreateNewPackage;
-                                       execGUICreateNewPackage += "\..\..\..\share\bbtk\bbs\toolsbbtk\appli\GUICreatePackage.bbs";
-                                                       system(execGUICreateNewPackage.c_str());
-                                               }
-       }
-       else 
-       {
+       }       else    {
                wxString err(_T("An error occured while running '"));
                err +=  crea::std2wx(command) + _T("'");
                wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);
@@ -90,7 +121,9 @@ bool myApp::OnInit( )
                // or, better, new trick :
                // bbCreatePackage nomDirectory nomPackage author Description
    
-               char *author = getenv("USER");
+//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";