*** empty log message ***

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

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index 8cafa23b3be00859811dba83caabd276b0e4de45..0b2d98e3fba0fbbef8683e1e28b0108e2bf2435d 100644 (file)
--- a/appli/creaNewProject/creaNewProject.cpp
+++ b/appli/creaNewProject/creaNewProject.cpp
@@ -29,16 +29,25 @@ bool myApp::OnInit( )
                                     _T("creaNewProject"),
                                     _T("New"));
    if (name.IsEmpty()) return false;
+   
+   wxString description = wxGetTextFromUser(_T("Enter Package Description (html format)"),
+                                    _T("create New Package"),
+                                    _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;
+
+
 
-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 ");
-       
+
        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\"";
@@ -46,40 +55,68 @@ execGUICreateNewPackage = "bbi " + execGUICreateNewPackage;
        {
                system ( command1.c_str() );
                system ( command2.c_str() );
-               wxMessageBox(_T("Done !"),_T("creaNewProject"),
+
+        // 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
-                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);      
+               wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);
        }
+
+// ------ LINUX / MacOS
+
 #else
        std::string command("creaNewProject.sh ");
        command += "\"" + crea::wx2std(dir) + "\"" +" " + crea::wx2std(name);
+       
        if ( ! system ( command.c_str() ) )
        {
-               wxMessageBox(_T("Done !"),_T("creaNewProject"),
+               wxMessageBox(_T("New Project created !"),_T("creaNewProject"),
                                        wxOK | wxICON_INFORMATION);
+
                 // Create a Package at the same time.   JPR
-                execGUICreateNewPackage += "/../../../share/bbtk/bbs/toolsbbtk/appli/GUICreatePackage.bbs";
-                system(execGUICreateNewPackage.c_str());
+               
+                //execGUICreateNewPackage += "/../../../share/bbtk/bbs/toolsbbtk/appli/GUICreatePackage.bbs";
+               //system(execGUICreateNewPackage.c_str());
+               
+               // or, better, new trick :
+               // bbCreatePackage nomDirectory nomPackage author Description
+   
+//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";
 
+               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";
+               //std::cout << add << std::endl;
+               system(add.c_str());
+               
        }
-       else 
-       {
+       else
+       {       
                wxString err(_T("An error occured while running '"));
                err +=  crea::std2wx(command) + _T("'");
-               wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);      
+               wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);
        }
-       
-#endif
-
 
+#endif
 
    return false;
 }