X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FcreaNewProject%2FcreaNewProject.cpp;h=2861429ba2da4b8890d5c52eccf8ea93c562527b;hb=6d6ca2be571d8c3ece06fbe761af296c0b3d6dfe;hp=f66f2a54006d6c6e867fd9558f4ddd112a3d73ea;hpb=a19dd400a71fc95b4f264aa9f1d6f976717a22d5;p=crea.git

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index f66f2a5..2861429 100644
--- a/appli/creaNewProject/creaNewProject.cpp
+++ b/appli/creaNewProject/creaNewProject.cpp
@@ -20,7 +20,7 @@ bool myApp::OnInit( )
    wxInitAllImageHandlers();
 
    wxString dir = wxDirSelector(_T("Select directory in which to create the project"), _T(""), wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST );
-				
+
    if (dir.IsEmpty()) return false;
 
    wxString name = wxGetTextFromUser(_T("Enter project name"),
@@ -29,34 +29,43 @@ bool myApp::OnInit( )
    if (name.IsEmpty()) return false;
    
 #if(_WIN32)
-   std::string command("creaNewProject.bat ");
-    std::string command1("creaSed.exe ");
+	std::string command("creaNewProject.bat ");
+	std::string command1("creaSed.exe ");
 	std::string command2("del ");
+	
+	command  += "\"" + crea::wx2std(dir) + "\" \"" + crea::wx2std(name) + "\"";
+	command1 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\" " + "NameOfTheProject " + crea::wx2std(name) + "> \"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt\"";
+	command2 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\"";
+	if ( ! system ( command.c_str() ) )
+	{
+		system ( command1.c_str() );
+		system ( command2.c_str() );
+		wxMessageBox(_T("Done !"),_T("creaNewProject"),
+				wxOK | wxICON_INFORMATION);
+	}
+	else 
+	{
+		wxString err(_T("An error occured while running '"));
+		err +=  crea::std2wx(command) + _T("'");
+		wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);      
+	}	
 #else
-   std::string command("creaNewProject.sh ");
+   	std::string command("creaNewProject.sh ");
+	command += "\"" + crea::wx2std(dir) + "\"" +" " + crea::wx2std(name);
+	if ( ! system ( command.c_str() ) )
+	{
+		wxMessageBox(_T("Done !"),_T("creaNewProject"),
+					wxOK | wxICON_INFORMATION);
+	}
+	else 
+	{
+		wxString err(_T("An error occured while running '"));
+		err +=  crea::std2wx(command) + _T("'");
+		wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);      
+	}
+	
 #endif
-<<<<<<< creaNewProject.cpp
-   command += "\"" + crea::wx2std(dir) + "\"" +" " + crea::wx2std(name);
-=======
-   command += "\"" + crea::wx2std(dir) + "\" \"" + crea::wx2std(name) + "\"";
-   command1 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\" " + "PROJECT_NAME " + crea::wx2std(name) + "> \"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt\"";
-   command2 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\"";
->>>>>>> 1.3
-
-   if ( ! system ( command.c_str() ) )
-     {
-		 
-		 system ( command1.c_str() );
-		 system ( command2.c_str() );
-       wxMessageBox(_T("Done !"),_T("creaNewProject"),
-		    wxOK | wxICON_INFORMATION);
-     }
-   else 
-     {
-       wxString err(_T("An error occured while running '"));
-       err +=  crea::std2wx(command) + _T("'");
-       wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);      
-     }
+
 
    return false;
 }