X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FcreaNewProject%2FcreaNewProject.cpp;h=350b034dd2fc785a3ca5cf9a5b81c62677fa84b6;hb=b47b66052e23c48c036ab3f666791a946d4c7b4c;hp=93cfd5c9d70f085434f9b5cefd39221331a6d58a;hpb=43809f06e3ad67bc2b0b30f6682a4e1ad23341a1;p=crea.git

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index 93cfd5c..350b034 100644
--- a/appli/creaNewProject/creaNewProject.cpp
+++ b/appli/creaNewProject/creaNewProject.cpp
@@ -33,13 +33,17 @@ bool myApp::OnInit( )
    wxString description = wxGetTextFromUser(_T("Enter Package Description (html format)"),
 				     _T("create New Package"),
 				     _T("NO_DESCRIPTION"));
-   if (description.IsEmpty()) return false;				       
+   if (description.IsEmpty()) return false;
+
+   wxString authorWX = wxGetTextFromUser(_T("Author (One word)"),
+				     _T("Author"),
+				     _T("Author_Name"));
+   if (description.IsEmpty()) return false;
+
 
-char * install_Dir = getenv("bbtk_DIR");
-std::string execGUICreateNewPackage(install_Dir);
-execGUICreateNewPackage = "bbi " + execGUICreateNewPackage;
 
 #if(_WIN32)
+     
 	std::string command("creaNewProject.bat ");
 	std::string command1("creaSed.exe ");
 	std::string command2("del ");
@@ -51,17 +55,21 @@ execGUICreateNewPackage = "bbi " + execGUICreateNewPackage;
 	{
 		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
-                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);
@@ -86,7 +94,9 @@ execGUICreateNewPackage = "bbi " + execGUICreateNewPackage;
 		// 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";
 
@@ -96,12 +106,12 @@ execGUICreateNewPackage = "bbi " + execGUICreateNewPackage;
 		
 		std::string add;
 		add = "echo 'ADD_SUBDIRECTORY(bbtk_" + crea::wx2std(name)  + "_PKG)' >> " + nomDirectory + "/CMakeLists.txt";
-		std::cout << add << std::endl;
+		//std::cout << add << std::endl;
 		system(add.c_str());
 		
 	}
 	else
-	{
+	{	
 		wxString err(_T("An error occured while running '"));
 		err +=  crea::std2wx(command) + _T("'");
 		wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);