diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 64b08a3d240..903f61be444 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -68,6 +68,7 @@ Source: "build\exe\doliwamp\install_services.bat.install"; DestDir: "{app}\"; Fl Source: "build\exe\doliwamp\uninstall_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion; Source: "build\exe\doliwamp\mysqlinitpassword.bat.install"; DestDir: "{app}\"; Flags: ignoreversion; Source: "build\exe\doliwamp\mysqltestinstall.bat.install"; DestDir: "{app}\"; Flags: ignoreversion; +Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir: "{app}\"; Flags: ignoreversion; ; PhpMyAdmin, Apache, Php, Mysql ; Put here path of Wampserver applications Source: "C:\Program Files\Wamp\apps\phpmyadmin2.10.1\*.*"; DestDir: "{app}\apps\phpmyadmin2.10.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log" @@ -580,6 +581,8 @@ begin LoadStringFromFile (srcFile, srcContents); //version de apache et mysql + StringChange (srcContents, 'WAMPROOT', pathWithSlashes); + StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion); StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion); StringChange (srcContents, 'WAMPMYSQLPORT', myport); @@ -587,6 +590,26 @@ begin end + //---------------------------------------------- + // Fichier startdoliwamp_manual_donotuse.bat + //---------------------------------------------- + + destFile := pathWithSlashes+'/startdoliwamp_manual_donotuse.bat'; + srcFile := pathWithSlashes+'/startdoliwamp_manual_donotuse.bat.install'; + + if not FileExists (destFile) and FileExists (srcFile) then + begin + LoadStringFromFile (srcFile, srcContents); + + //version de apache et mysql + StringChange (srcContents, 'WAMPROOT', pathWithSlashes); + StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion); + StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion); + StringChange (srcContents, 'WAMPMYSQLPORT', myport); + + SaveStringToFile(destFile,srcContents, False); + end + //---------------------------------------------- diff --git a/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install b/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install new file mode 100644 index 00000000000..fbeeeb4318b --- /dev/null +++ b/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install @@ -0,0 +1,17 @@ +@echo off +REM ----------------------------------------------------- +REM Run this script only if you have problem to run +REM Apache and Mysql as service. This can occurs when +REM Microsoft add bugs in service packs that prevents +REM servers ran as a service to launch. +REM ----------------------------------------------------- + +echo Running Apache +WAMPROOT\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k start + +echo + +echo Running Mysql +WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini + +pause \ No newline at end of file