From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Wed, 15 Jun 2011 07:27:26 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3ef49ba6daedb975233f0abb6dadacc5517f5567;p=crea.git

*** empty log message ***
---

diff --git a/appli/creaNewProject/creaNewProject.bat.in b/appli/creaNewProject/creaNewProject.bat.in
index 9a183d1..65bd3e5 100755
--- a/appli/creaNewProject/creaNewProject.bat.in
+++ b/appli/creaNewProject/creaNewProject.bat.in
@@ -59,4 +59,4 @@ goto end
 
 
 :END
-pause
+
diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index b0e9f8e..0b2d98e 100644
--- a/appli/creaNewProject/creaNewProject.cpp
+++ b/appli/creaNewProject/creaNewProject.cpp
@@ -35,6 +35,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 +55,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 +94,8 @@ bool myApp::OnInit( )
 		// or, better, new trick :
 		// bbCreatePackage nomDirectory nomPackage author Description
    
-		char *author = getenv("USER");
+//EED		char *author = getenv("USER");
+		char *author = (char*) (authorWX.mb_str()) ;
 		std::string nomDirectory = crea::wx2std(dir) + "/" + crea::wx2std(name);
 		std::string nomPackageDirectory = nomDirectory + "/" + "bbtk_" + crea::wx2std(name) + "_PKG";