textLabel_MacOS->hide();
#ifdef Q_WS_WIN
/*if (QFile::exists("C:/MedinTuxRo.txt")) pushButtonMakeSQL->hide(); */ // pas de bash sous W
- pushButton_compilation->hide();
- comboBox_Executables->hide();
+ //pushButton_compilation->hide();
+ //comboBox_Executables->hide();
textLabel_RootField->hide();
lineEdit_RootPass->hide();
comboBox_PortLecteur->hide();
lineEdit_SesamPath->setText("C:\\");
- lineEdit_BinaryPath->setText("C:\\WINDOWS");
- pushButton_Qt4Sdk->hide();
- lineEdit_Qt4Sdk->hide();
- lineEdit_Qt3->hide();
- pushButton_Qt3->hide();
+ lineEdit_BinaryPath->setText("C:\\WINDOWS");\r
+ lineEdit_Qt3->setText(tryToFindQt3());
+ lineEdit_Qt4Sdk->setText(tryToFindSdkQt4());\r
+ //pushButton_Qt4Sdk->hide();
+ //lineEdit_Qt4Sdk->hide();
+ //lineEdit_Qt3->hide();
+ //pushButton_Qt3->hide();
textLabel_WindPathField->setText(tr("Répertoire WINDOWS "));
- tabWidget_Instal->removePage(m_pTabQWidgetCompil);
+ //tabWidget_Instal->removePage(m_pTabQWidgetCompil);
// textLabel_MacOS->setText(m_SousAppleSeMettreEnModeAdmin); // pour tester sous W
// textLabel_MacOS->show(); // pour tester sous W
#endif
//----------------------------------------- pushButton_Qt4Sdk_clicked ---------------------------------------------
void C_DlgMainDialog::pushButton_Qt4Sdk_clicked()
{QString optDir = QFileDialog::getExistingDirectory (lineEdit_Qt4Sdk->text(), this, "findqt4sdk", tr("Chercher le répertoire du Sdk QT4") ) ;
- if (optDir.length()) lineEdit_Qt4Sdk->setText(optDir);
+#ifdef Q_WS_WIN\r
+ if (optDir.length() && QFile::exists(optDir + "/bin/qmake")) \r
+#else\r
+ if (optDir.length() && QFile::exists(optDir + "/bin/qmake.exe")) \r
+#endif\r
+\r
+ { lineEdit_Qt4Sdk->setText(optDir);\r
+#ifdef Q_WS_WIN\r
+ QString key = "WinQt4Dir";\r
+#endif\r
+#ifdef Q_WS_X11\r
+ QString key = "X11Qt4Dir";\r
+#endif\r
+#ifdef Q_OS_MACX\r
+ QString key = "MacQt4Dir";\r
+#endif\r
+ CGestIni::Param_WriteParam( &G_pCApp->m_ParamData, "Compilation", key ,optDir);\r
+ }\r
+ else\r
+ {QMessageBox::information( this, tr( "MedinTux demande votre attention" ),\r
+ tr( "Ce chemin '%1' n'est pas celui de Qt. \n"\r
+ "La compilation avec celui-ci est impossible.").arg(optDir) ,\r
+ tr( "&ok"), 0, 0, 1, 1 \r
+ ) ;\r
+ }
}
//----------------------------------------- pushButton_Qt3_clicked ---------------------------------------------
void C_DlgMainDialog::pushButton_Qt3_clicked()
-{QString optDir = QFileDialog::getExistingDirectory (lineEdit_Qt3->text(), this, "findqt3", tr("Chercher le répertoire de QT3") ) ;
- if (optDir.length()) lineEdit_Qt3->setText(optDir);
+{QString optDir = QFileDialog::getExistingDirectory (lineEdit_Qt3->text(), this, "findqt3", tr("Chercher le répertoire de QT3") ) ;\r
+#ifdef Q_WS_WIN\r
+ if (optDir.length() && QFile::exists(optDir + "/bin/qmake")) \r
+#else\r
+ if (optDir.length() && QFile::exists(optDir + "/bin/qmake.exe")) \r
+#endif\r
+\r
+ { lineEdit_Qt3->setText(optDir);\r
+#ifdef Q_WS_WIN\r
+ QString key = "WinQt3Dir";\r
+#endif\r
+#ifdef Q_WS_X11\r
+ QString key = "X11Qt3Dir";\r
+#endif\r
+#ifdef Q_OS_MACX\r
+ QString key = "MacQt3Dir";\r
+#endif\r
+ CGestIni::Param_WriteParam( &G_pCApp->m_ParamData, "Compilation", key ,optDir);\r
+ }\r
+ else\r
+ {QMessageBox::information( this, tr( "MedinTux demande votre attention" ),\r
+ tr( "Ce chemin '%1' n'est pas celui de Qt. \n"\r
+ "La compilation avec celui-ci est impossible.").arg(optDir) ,\r
+ tr( "&ok"), 0, 0, 1, 1 \r
+ ) ;\r
+ }
}
//----------------------------------------- keepOnlyNumber ---------------------------------------------
{main_path = qDir.path() + "/comptabilite/check_dus";
}
else if ( target=="comptabilite" )
- {main_path = qDir.path() + "/comptabilite/compta";
+ {main_path = qDir.path() + "/comptabilite/comptabilite";
}
else
{main_path = qDir.path() + QDir::separator() + target + QDir::separator() +"src";
}
//----------------------------------------- tryToFindQt3 ---------------------------------------------
QString C_DlgMainDialog::tryToFindQt3()
-{
+{\r
+#ifdef Q_WS_WIN\r
+ QString qt3Path = "";\r
+ if ( ! (CGestIni::Param_ReadParam(G_pCApp->m_ParamData, "Compilation", "WinQt3Dir", &qt3Path) !=0 // zero = pas d'erreur\r
+ && QFile::exists(qt3Path + "/bin/qmake.exe")\r
+ ) \r
+ )\r
+ {qt3Path = "C:/Qt3/3.3.4";\r
+ }\r
+ return qt3Path;\r
+#endif\r
+
#ifdef Q_OS_MACX
QString ret = QString::null;
if (QFile::exists(QDir::cleanDirPath(G_pCApp->m_PathAppli+"../../Qt/bin/qmake"))) ret = QDir::cleanDirPath(G_pCApp->m_PathAppli+"../../Qt");
else if (QFile::exists("/usr/lib/qt3/bin/qmake")) ret = "/usr/lib/qt3";
- return ret;
-#else
+ return ret;\r
+#endif\r
+
+#ifdef Q_WS_X11
QString ret = QString::null;
QString toTest = QDir::cleanDirPath(G_pCApp->m_PathAppli + "../../../qt3_l64");
if (QFile::exists(toTest+"/bin/qmake")) return toTest;
//----------------------------------------- tryToFindSdkQt4 ---------------------------------------------
QString C_DlgMainDialog::tryToFindSdkQt4()
-{
+{\r
+\r
+#ifdef Q_WS_WIN\r
+ QString qt4Path = "";\r
+ if ( ! (CGestIni::Param_ReadParam(G_pCApp->m_ParamData, "Compilation", "WinQt4Dir", &qt4Path) !=0 // zero = pas d'erreur\r
+ && QFile::exists(qt4Path + "/bin/qmake.exe")\r
+ ) \r
+ )\r
+ {qt4Path = "C:/Qt4/qt";\r
+ }\r
+ return qt4Path;\r
+#endif\r
+
#ifdef Q_OS_MACX
QStringList listOptDir = CGestIni::listDirectory("/usr/local/Trolltech", "", "Qt-", "|", FALSE, TRUE);
int lastIndex = -1;
}
}
if (lastIndex != -1) return listOptDir[lastIndex].prepend("/usr/local/Trolltech/");
- else return QString::null;
-#else
+ else return QString::null;\r
+#endif\r
+
+#ifdef Q_WS_X11
//............ rechercher bon path qt ...................................
QString prefix = QDir::cleanDirPath(G_pCApp->m_PathAppli + "../../../qt4_l64");
QString sufix = "";
#endif
#ifdef Q_WS_WIN
- bool isQT4Here = false;
+ bool isQT4Here = QFile::exists(sdkDir+"bin/qmake.exe");
os = "Windows";
#endif
//.................... corriger les versions des UI du module en cours .....................
QDir::setCurrent ( path );
- if ( (target == "QFseVitale"||target == "qgetdatasemp") && IsSesamVersionExist() )
+ if ( (target == "QFseVitale") && IsSesamVersionExist() )
{if (isQT3) G_pCApp->RemoveAllDesignerVersion(getTargetSrcPath("QFseVitale"));
}
else
m_CurrentCompil = target;
if (isQT3)
{ QApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) );
- toLog( tr ("<br>============= Compilation de <font color=#ffa800><b> '%1' </b></font> sur <font color=#00e5e8><b>%2</b></font> <font color=#ff0000><b>(librairie QT3)</b></font> en cours ... =============").arg(target,os));
+ toLog( tr ("<br>============= Compilation de <font color=#ffa800><b> '%1' </b></font> sur <font color=#00e5e8><b>%2</b></font> <font color=#ff0000><b>(librairie QT3)</b></font> en cours ... =============").arg(target,os));\r
+ #ifdef Q_WS_WIN\r
+ QString qtdir = lineEdit_Qt3->text().stripWhiteSpace();\r
+ QString disk = G_pCApp->m_PathAppli.left(2);\r
+ script = QString ("echo \"================= compilation de %4 ===========================\"\r\n"\r
+ "%1\r\n"\r
+ "cd %2\r\n"\r
+ "set QMAKE=%3\\bin\\qmake\r\n"\r
+ "set QMAKESPEC=win32-msvc\r\n"\r
+ "set MODULE=%4\r\n").arg(disk,G_pCApp->m_PathAppli,qtdir, target);\r
+\r
+ script += "cd ../../%MODULE%/src\r\n"\r
+ "echo \"================= se plaver dans %MODULE%/src ===========================\"\r\n"\r
+ "erase %MODULE%.dsw\r\n"\r
+ "erase %MODULE%.dsp\r\n"\r
+ "if exist %MODULE%.pro %QMAKE% -t vcapp -o %MODULE%.dsp %MODULE%.pro\r\n"\r
+ "if exist src.pro %QMAKE% -t vcapp -o %MODULE%.dsp src.pro\r\n"\r
+ "cd ../../mise_a_jour/bin\r\n"\r
+ "mise_a_jour.exe MSDEV ../../%MODULE%/src/%MODULE%.dsp %MODULE%.exe\r\n"\r
+ "cd ../../%MODULE%/src\r\n"\r
+ "msdev %MODULE%.dsp /MAKE /CLEAN\r\n"\r
+ "msdev %MODULE%.dsp /MAKE ALL\r\n"; \r
+ #endif\r
+
#ifdef Q_WS_MAC
- QString qtdir = lineEdit_Qt3->text().stripWhiteSpace();
+ QString qtdir = lineEdit_Qt3->text().stripWhiteSpace();\r
script = "#! /bin/sh\n"
"#----- DEB FOR MAC --------\n"
" QTDIR=\"";
"export DYLD_LIBRARY_PATH\n"
"export INCLUDE\n"
"cd '"+G_pCApp->m_PathAppli+"'\n"
- "./MakeAllMac.sh '" + m_CurrentCompil + "' '" + lineEdit_Qt3->text() + "'";
- qDebug(script);
- #else
+ "./MakeAllMac.sh '" + m_CurrentCompil + "' '" + lineEdit_Qt3->text() + "'";\r
+ #endif
+ #ifdef Q_WS_X11
QString qtdir = lineEdit_Qt3->text().stripWhiteSpace();
script = "#! /bin/sh\n"
"#----- DEB FOR LINUX --------\n"
script = "#! /bin/sh\n "
"./MakeAllMac.sh '" + m_CurrentCompil + "' '" + lineEdit_Qt3->text() + "'";
*/
- #endif
+ #endif\r
+ #ifdef Q_WS_WIN\r
+ CGestIni::Param_UpdateToDisk(G_pCApp->m_PathAppli+"makeModuleQt3.bat", script);\r
+ system(G_pCApp->m_PathAppli+"makeModuleQt3.bat");\r
+ updateExit();\r
+ //m_proc = new QProcess(this); if (m_proc == 0 ) return;\r
+ \r
+ //m_proc->addArgument("cmd"); // QProcess::startDetached (QString ("cmd /c start ") + scriptToDo ); //START.EXE /B /MIN leScriptAmasquer.CMD\r
+ //m_proc->addArgument(QString ("cmd /c start ") + script); \r
+ //m_proc->start(); \r
+ //pushButton_compilation->setText(tr("&Interrompre la compilation des exécutables en cours"));\r
+ //m_MakeExeRun = MAKE_EXE_RUN;\r
+ #else \r
CGestIni::Param_UpdateToDisk(G_pCApp->m_PathAppli+"makeModule.sh", script);
execute(G_pCApp->m_PathAppli + "makeModule.sh");
pushButton_compilation->setText(tr("&Interrompre la compilation des exécutables en cours"));
- m_MakeExeRun = MAKE_EXE_RUN;
+ m_MakeExeRun = MAKE_EXE_RUN;\r
+ #endif
}
else if (QFile::exists(modulePath + "src/"+target+".pro"))
{if (isQT4Here)
//toLog( tr ("<br> Remove <font color=#ff0000><b>QT4</b></font> de<font color=#ffa800><b> %1 </b></font>en cours ...").arg(modulePath+"src/makeQT4Module.sh"));
QApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) );
QDir::setCurrent ( modulePath + "src" );
- #ifdef Q_WS_MAC
+ #ifdef Q_WS_WIN\r
+ #endif\r
+ #ifdef Q_WS_MAC
script = "#!/bin/bash\n"
"LD_LIBRARY_PATH={{sdkDir}}lib\n"
"PATH={{sdkDir}}bin:/usr/bin:/bin:/usr/X11R6/bin/:\n"
if (target=="guinch") script += "strip ../../Manager/bin/{{target}}.app/Contents/MacOS/{{target}}\n"; // sous mac pas de -s pour strip
else script += "strip ../../{{target}}/bin/{{target}}.app/Contents/MacOS/{{target}}\n";
script.replace("{{sdkDir}}",sdkDir);
- script.replace("{{target}}",target);
- #else
+ script.replace("{{target}}",target);\r
+ #endif\r
+ #ifdef Q_WS_X11
script = "#!/bin/bash\n"
"LD_LIBRARY_PATH={{sdkDir}}lib/qtcreator:\n"
"PATH={{sdkDir}}bin:/usr/bin:/bin:/usr/X11R6/bin/:\n"
script.replace("{{sdkDir}}",sdkDir);
script.replace("{{target}}",target);
- #endif
-
+ #endif
+ #ifdef Q_WS_WIN\r
+ #else
CGestIni::Param_UpdateToDisk(modulePath+"src/makeQT4Module.sh", script);
execute(modulePath+"src/makeQT4Module.sh", modulePath+"src/");
// QFile::remove ( modulePath+"src/makeQT4Module.sh" );
pushButton_compilation->setText(tr("&Interrompre la compilation des ex\303\251cutables en cours"));
- m_MakeExeRun = MAKE_EXE_RUN;
+ m_MakeExeRun = MAKE_EXE_RUN;\r
+ #endif
}
else
{toLog( tr ("<br>============= Compilation <font color=#ff0000><b>QT4</b></font> de<font color=#ffa800><b> %1 </b></font>Avort\303\251e (sdk QT4 Absent) ... =============").arg(target));
//............... la formation du path est alambiquee pour .....................
// pouvoir etre juste aussi bien qaund set_bases demarre de .app que de MacOS
if (exe_name.left(6)=="guinch")
- {path = G_pCApp->m_PathAppli +"../../Manager/bin/guinch";
- path = QDir::cleanDirPath(path);
+ { path = G_pCApp->m_PathAppli +"../../Manager/bin/guinch";
+ path = QDir::cleanDirPath(path);
#ifdef Q_OS_MACX
- path += ".app/Contents/MacOS/guinch";
+ path += ".app/Contents/MacOS/guinch";
+#endif\r
+#ifdef Q_WS_WIN\r
+ path += ".exe";\r
#endif
}
- else if ("compta-plugins")
- {path = G_pCApp->m_PathAppli +"../../comptabilite/bin/compta-plugins";
- path = QDir::cleanDirPath(path);
+ else if (exe_name.left(14) == "compta-plugins")
+ { path = G_pCApp->m_PathAppli +"../../comptabilite/bin/compta-plugins";
+ path = QDir::cleanDirPath(path);
#ifdef Q_OS_MACX
- path += ".app/Contents/MacOS/compta-plugins";
+ path += ".app/Contents/MacOS/compta-plugins";
+#endif\r
+#ifdef Q_WS_WIN\r
+ path += ".exe";\r
#endif
- }
- else if ("check_dus.app")
- {path = G_pCApp->m_PathAppli +"../../comptabilite/bin/check_dus.app";
- path = QDir::cleanDirPath(path);
+ }
+ else if (exe_name.left(9) == "check_dus")
+ { path = G_pCApp->m_PathAppli +"../../comptabilite/bin/check_dus";
+ path = QDir::cleanDirPath(path);
#ifdef Q_OS_MACX
- path += ".app/Contents/MacOS/check_dus.app";
+ path += ".app/Contents/MacOS/check_dus";
+#endif\r
+#ifdef Q_WS_WIN\r
+ path += ".exe";\r
#endif
- }
+ }
else
- {path = CGestIni::Construct_Name_Exe(exe_name, folder);
- pos = path.find(exe_name);
- if (pos==-1) return FALSE;
- path = G_pCApp->m_PathAppli +"../../" + path.mid(pos);
- path = QDir::cleanDirPath(path);
+ { path = CGestIni::Construct_Name_Exe(exe_name, folder);
+ pos = path.find(exe_name);
+ if (pos==-1) return FALSE;
+ path = G_pCApp->m_PathAppli +"../../" + path.mid(pos);
+ path = QDir::cleanDirPath(path);
}
if ( ! QFile::exists (path) )
- {toLog( tr("Cet exécutable <font color=#ff0000><b>'%1'</b></font> n'existe pas ").arg(exe_name) );
- return FALSE;
+ { toLog( tr("Cet exécutable <font color=#ff0000><b>'%1'</b></font> n'existe pas ").arg(exe_name) );
+ return FALSE;
}
toLog( tr("Cet exécutable <font color=#ffa800><b>'%1'</b></font> existe déjà ").arg(exe_name) );
return TRUE;
void C_DlgMainDialog::execute(const QString &command, const QString curDir /*=""*/)
{ if (curDir.length()==0) QDir::setCurrent ( G_pCApp->m_PathAppli );
else QDir::setCurrent ( curDir );
- m_proc = new QProcess(this); if (m_proc == 0 ) return;
+ m_proc = new QProcess(this); if (m_proc == 0 ) return;\r
+#ifdef Q_WS_WIN\r
+ m_proc->addArgument(QString("cmd /c start %1").arg(command)); // QProcess::startDetached (QString ("cmd /c start ") + scriptToDo ); //START.EXE /B /MIN leScriptAmasquer.CMD\r
+ //m_proc->addArgument("/c start");\r
+ //m_proc->addArgument(command); \r
+#else
m_proc->addArgument("bash");
m_proc->addArgument(command);
- //connect(m_proc, SIGNAL(processExited ()), this, SLOT(EndCompilation()));
+ //connect(m_proc, SIGNAL(processExited ()), this, SLOT(EndCompilation()));\r
+#endif
connect(m_proc, SIGNAL(readyReadStderr()), this, SLOT(updateError()));
connect(m_proc, SIGNAL(readyReadStdout()), this, SLOT(updateText()));
connect(m_proc, SIGNAL(processExited()), this, SLOT(updateExit()));
//----------------------------------------- updateExit --------------------------------------------------------------------
void C_DlgMainDialog::updateExit()
-{
- if (m_proc->normalExit()) {
+{\r
+ #ifdef Q_WS_WIN\r
+ pushButton_SetBases->show();\r
+ comboBox_Executables->show();\r
+ comboBox_Bases->show();\r
+ pushButton_LancerDrTux->show();\r
+ progressBar_Load->show();\r
+ QApplication::restoreOverrideCursor(); \r
+ #else
+ if (m_proc->normalExit()) \r
+ {
QDateTime dtEnd= QDateTime::currentDateTime();
long s = m_dtDebComp.secsTo (dtEnd);
int pos = toWriteOnDisk.find(toFind);
if (pos != -1) toWriteOnDisk = toWriteOnDisk.mid(pos);
CGestIni::Param_UpdateToDisk(G_pCApp->m_PathAppli+"Compilation_"+m_CurrentCompil+".log", toWriteOnDisk);
- m_MakeExeRun = MAKE_EXE_NOTRUN;
+ m_MakeExeRun = MAKE_EXE_NOTRUN;\r
+
//............. strip de l'executable ....................
QDir::setCurrent ( G_pCApp->m_PathAppli );
QString script = "#! /bin/sh\r\n ./stripall.sh " + m_CurrentCompil;
comboBox_Bases->show();
pushButton_LancerDrTux->show();
progressBar_Load->show();
- }
+ }\r
+#endif
}
//----------------------------------------- pushButton_SetBases_clicked --------------------------------------------------------------------
void C_DlgMainDialog::pushButton_SetBases_clicked()