diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 5dcf2fa6723..1f6cd0b146c 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -205,7 +205,7 @@ begin 'If first install, please specify some technical parameters. If you don''t understand, are not sure, or are doing an upgrade, just leave the default values.'); // TODO Add control differently if first install or update - if firstinstall == true + if firstinstall then begin Page.Add('SMTP server (your own or ISP SMTP server, first install only) :', False); @@ -713,9 +713,10 @@ begin batFile := path+'\install_services.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); - // Stard services + // Start services batFile := path+'\startdoliwamp.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); + //MsgBox(myResult,mbInformation,MB_OK); // Change mysql password batFile := path+'\mysqlinitpassword.bat'; diff --git a/build/exe/doliwamp/install_services.bat.install b/build/exe/doliwamp/install_services.bat.install index b1f6eb45682..815e7c721b5 100644 --- a/build/exe/doliwamp/install_services.bat.install +++ b/build/exe/doliwamp/install_services.bat.install @@ -1,7 +1,13 @@ @echo off +REM -------------------------------------------------------- +REM This script install Apache and Mysql DoliWamp services +REM -------------------------------------------------------- + +echo ---- Execute install_services.bat >> doliwamp.log 2>>&1 REM NET STOP doliwampapache REM NET STOP doliwampmysqld .\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache REM reg add HKLM\SYSTEM\CurrentControlSet\Services\doliwampapache /V Start /t REG_DWORD /d 3 /f REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install-manual doliwampmysqld .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install doliwampmysqld +echo ---- End script >> doliwamp.log 2>>&1 diff --git a/build/exe/doliwamp/mysqlinitpassword.bat.install b/build/exe/doliwamp/mysqlinitpassword.bat.install index 43fb9d59900..2509d7f13e0 100644 --- a/build/exe/doliwamp/mysqlinitpassword.bat.install +++ b/build/exe/doliwamp/mysqlinitpassword.bat.install @@ -10,9 +10,9 @@ REM type .\mysqlinitpassword.bat >> doliwamp.log 2>>&1 sleep 3 REM sleep 20 -echo ---- Execute script mysqlinitpassword.bat to init mysql password >> doliwamp.log 2>>&1 +echo ---- Execute mysqlinitpassword.bat to init mysql password >> doliwamp.log 2>>&1 echo For a first installation, if an error is shown here, rerun the script manually. >> doliwamp.log 2>>&1 -echo For an update, you will get an "Acces denied error", ignore this error. >> doliwamp.log 2>>&1 +echo For an update, you will get an "Acces denied" error, ignore this error. >> doliwamp.log 2>>&1 .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -v -w6 -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1 echo ---- End script >> doliwamp.log 2>>&1 diff --git a/build/exe/doliwamp/startdoliwamp.bat b/build/exe/doliwamp/startdoliwamp.bat index 452126b5a69..a51891a6d01 100644 --- a/build/exe/doliwamp/startdoliwamp.bat +++ b/build/exe/doliwamp/startdoliwamp.bat @@ -1,5 +1,16 @@ @echo off -NET START doliwampapache -NET START doliwampmysqld +REM -------------------------------------------------------- +REM This script start the Apache and Mysql DoliWamp services +REM -------------------------------------------------------- + +echo ---- Execute startdoliwamp.bat >> doliwamp.log 2>>&1 + +echo NET START doliwampapache >> doliwamp.log 2>>&1 +NET START doliwampapache >> doliwamp.log 2>>&1 +echo NET START doliwampmysqld >> doliwamp.log 2>>&1 +NET START doliwampmysqld >> doliwamp.log 2>>&1 + echo Please wait... -sleep 1 \ No newline at end of file +echo ---- End script >> doliwamp.log 2>>&1 + +sleep 1 diff --git a/build/exe/doliwamp/stopdoliwamp.bat b/build/exe/doliwamp/stopdoliwamp.bat index c65edefc10a..dd4c29a6a39 100644 --- a/build/exe/doliwamp/stopdoliwamp.bat +++ b/build/exe/doliwamp/stopdoliwamp.bat @@ -1,5 +1,16 @@ @echo off +REM -------------------------------------------------------- +REM This script start the Apache and Mysql DoliWamp services +REM -------------------------------------------------------- + +echo ---- Execute stopdoliwamp.bat >> doliwamp.log 2>>&1 + +echo NET STOP doliwampapache >> doliwamp.log 2>>&1 NET STOP doliwampapache +echo NET STOP doliwampmysqld >> doliwamp.log 2>>&1 NET STOP doliwampmysqld + echo Please wait... +echo ---- End script >> doliwamp.log 2>>&1 + sleep 1 \ No newline at end of file diff --git a/build/exe/doliwamp/uninstall_services.bat.install b/build/exe/doliwamp/uninstall_services.bat.install index 68a697de296..52b166c19d4 100644 --- a/build/exe/doliwamp/uninstall_services.bat.install +++ b/build/exe/doliwamp/uninstall_services.bat.install @@ -1,5 +1,12 @@ +@echo off +REM -------------------------------------------------------- +REM This script install Apache and Mysql DoliWamp services +REM -------------------------------------------------------- + +echo ---- Execute uninstall_services.bat >> doliwamp.log 2>>&1 NET STOP doliwampapache .\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k uninstall -n doliwampapache NET STOP doliwampmysqld .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld -REM wampmanager.exe -quit -id={doliwampserver} \ No newline at end of file +REM wampmanager.exe -quit -id={doliwampserver} +echo ---- End script >> doliwamp.log 2>>&1