diff --git a/build/.cvsignore b/build/.cvsignore index c433a52610a..8b334c95e99 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -1,8 +1,9 @@ -dolibarr-*.exe -dolibarr-*.tgz -dolibarr-*.zip -dolibarr-*.rpm -dolibarr-*.deb -makepack-google.conf -module_google-*.tgz -module_pibarcode-1.0.tgz +dolibarr-*.exe +dolibarr-*.tgz +dolibarr-*.zip +dolibarr-*.rpm +dolibarr-*.deb +makepack-google.conf +module_google-*.tgz +module_pibarcode-1.0.tgz +*.exe diff --git a/build/exe/doliwamp/doliwamp2.4.iss b/build/exe/doliwamp/doliwamp2.4.iss index f5d72900f37..e4d0e2798db 100644 --- a/build/exe/doliwamp/doliwamp2.4.iss +++ b/build/exe/doliwamp/doliwamp2.4.iss @@ -55,6 +55,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; ; 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" Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "httpd.conf,wampserver.conf,*.log,*_log" Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,wampserver.conf,*.log,*_log" @@ -78,7 +79,7 @@ Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.2.5"; Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion; Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion; ; Licence -Source: "COPYRIGHT"; DestDir: "{app}"; +Source: "COPYRIGHT"; DestDir: "{app}"; Flags: ignoreversion; diff --git a/build/exe/doliwamp/install.forced.php.install b/build/exe/doliwamp/install.forced.php.install new file mode 100644 index 00000000000..cca576eab6c --- /dev/null +++ b/build/exe/doliwamp/install.forced.php.install @@ -0,0 +1,11 @@ + \ No newline at end of file