Upgrade doliwamp
This commit is contained in:
Laurent Destailleur
parent
f9ceb78f58
commit
68ecc5eb89
@ -81,7 +81,7 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:
|
||||
Name: "{app}\logs"
|
||||
Name: "{app}\tmp"
|
||||
Name: "{app}\dolibarr_documents"
|
||||
Name: "{app}\bin\apache\apache2.2.14\logs"
|
||||
Name: "{app}\bin\apache\apache2.2.11\logs"
|
||||
|
||||
[Files]
|
||||
; Stop/start
|
||||
@ -100,10 +100,11 @@ Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; F
|
||||
Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
|
||||
; PhpMyAdmin, Apache, Php, Mysql
|
||||
; Put here path of Wampserver applications
|
||||
; Value OK: apache 2.2.6, php 5.2.5 (5.2.11+5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45 or 5.1.36
|
||||
; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45 or 5.1.36
|
||||
; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45 or 5.1.36
|
||||
Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Program Files\Wamp\bin\apache\apache2.2.14\*.*"; DestDir: "{app}\bin\apache\apache2.2.14"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Program Files\Wamp\bin\php\php5.3.1\*.*"; DestDir: "{app}\bin\php\php5.3.1"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Program Files\Wamp\bin\apache\apache2.2.11\*.*"; DestDir: "{app}\bin\apache\apache2.2.11"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Program Files\Wamp\bin\php\php5.3.0\*.*"; DestDir: "{app}\bin\php\php5.3.0"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
|
||||
; Mysql data files (does not overwrite if exists)
|
||||
Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
|
||||
@ -117,9 +118,9 @@ Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".
|
||||
Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
|
||||
Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
|
||||
Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion;
|
||||
Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.2.14\conf"; Flags: ignoreversion;
|
||||
Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.2.11\conf"; Flags: ignoreversion;
|
||||
Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
|
||||
Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.3.1"; Flags: ignoreversion;
|
||||
Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.3.0"; Flags: ignoreversion;
|
||||
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;
|
||||
Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
|
||||
@ -194,8 +195,8 @@ end;
|
||||
procedure InitializeWizard();
|
||||
begin
|
||||
//version des applis, a modifier pour chaque version de WampServer 2
|
||||
apacheVersion := '2.2.14';
|
||||
phpVersion := '5.3.1' ;
|
||||
apacheVersion := '2.2.11';
|
||||
phpVersion := '5.3.0' ;
|
||||
mysqlVersion := '5.0.45';
|
||||
phpmyadminVersion := '3.2.0.1';
|
||||
|
||||
@ -383,8 +384,6 @@ begin
|
||||
|
||||
phpDllCopy := 'php5activescript.dll';
|
||||
filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
|
||||
phpDllCopy := 'php5isapi.dll';
|
||||
filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
|
||||
phpDllCopy := 'php5nsapi.dll';
|
||||
filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
|
||||
phpDllCopy := 'php5ts.dll';
|
||||
@ -532,7 +531,14 @@ begin
|
||||
end;
|
||||
if browser = 'iexplore.exe' then
|
||||
begin
|
||||
GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, winPath,'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
|
||||
if FileExists (pfPath+'/Internet Explorer/iexplore.exe') then
|
||||
begin
|
||||
GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, pfPath+'/Internet Explorer','exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
|
||||
end
|
||||
else
|
||||
begin
|
||||
GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, winPath,'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
|
||||
end;
|
||||
end;
|
||||
|
||||
LoadStringFromFile (srcFile, srcContents);
|
||||
@ -629,10 +635,11 @@ begin
|
||||
if not FileExists (destFile) and FileExists (srcFile) then
|
||||
begin
|
||||
LoadStringFromFile (srcFile, srcContents);
|
||||
|
||||
|
||||
//installDir et version de php
|
||||
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
||||
StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
|
||||
StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
|
||||
StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
|
||||
StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
|
||||
|
||||
@ -871,6 +878,7 @@ begin
|
||||
LoadStringFromFile (srcFile, srcContents);
|
||||
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
||||
StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
|
||||
StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
|
||||
SaveStringToFile(destFile,srcContents, False);
|
||||
end
|
||||
|
||||
@ -886,6 +894,7 @@ begin
|
||||
LoadStringFromFile (srcFile, srcContents);
|
||||
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
||||
StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
|
||||
StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
|
||||
SaveStringToFile(destFile,srcContents, False);
|
||||
end
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ MaxRequestsPerChild 0
|
||||
# at a local disk. If you wish to share the same ServerRoot for multiple
|
||||
# httpd daemons, you will need to change at least LockFile and PidFile.
|
||||
#
|
||||
ServerRoot "WAMPROOT/bin/apache/apache2.2.14"
|
||||
ServerRoot "WAMPROOT/bin/apache/apacheWAMPAPACHEVERSION"
|
||||
|
||||
#
|
||||
# Listen: Allows you to bind Apache to specific IP addresses and/or
|
||||
|
||||
@ -326,6 +326,7 @@ else
|
||||
|
||||
// Read PHP extensions
|
||||
$loaded_extensions = get_loaded_extensions();
|
||||
$phpExtContents='';
|
||||
foreach ($loaded_extensions as $extension)
|
||||
$phpExtContents .= "<li>${extension}</li>";
|
||||
|
||||
@ -334,6 +335,7 @@ foreach ($loaded_extensions as $extension)
|
||||
// Read alias directory
|
||||
$listoffile=array();
|
||||
$aliasarray=array();
|
||||
$aliasContents='';
|
||||
if (is_dir($aliasDir))
|
||||
{
|
||||
$handle=opendir($aliasDir);
|
||||
@ -530,7 +532,6 @@ a:hover {
|
||||
</td>
|
||||
<td align="right">
|
||||
<ul class="utility">
|
||||
<li>${wampserverVersion}</li>
|
||||
<li><a href="?lang={$langues[$langue]['autreLangueLien1']}">{$langues[$langue]['autreLangue1']}</a>
|
||||
- <a href="?lang={$langues[$langue]['autreLangueLien2']}">{$langues[$langue]['autreLangue2']}</a></li>
|
||||
<br><br>
|
||||
|
||||
@ -375,7 +375,7 @@ display_errors = On
|
||||
; Even when display_errors is on, errors that occur during PHP's startup
|
||||
; sequence are not displayed. It's strongly recommended to keep
|
||||
; display_startup_errors off, except for when debugging.
|
||||
display_startup_errors = Off
|
||||
display_startup_errors = On
|
||||
|
||||
; Log errors into a log file (server-specific log, stderr, or error_log (below))
|
||||
; As stated above, you're strongly advised to use error logging in place of
|
||||
@ -534,7 +534,7 @@ doc_root =
|
||||
user_dir =
|
||||
|
||||
; Directory in which the loadable extensions (modules) reside.
|
||||
extension_dir = "WAMPROOT/bin/php/php5.3.1/ext/"
|
||||
extension_dir = "WAMPROOT/bin/php/phpWAMPPHPVERSION/ext/"
|
||||
|
||||
; Whether or not to enable the dl() function. The dl() function does NOT work
|
||||
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
|
||||
@ -657,7 +657,7 @@ extension=php_bz2.dll
|
||||
extension=php_curl.dll
|
||||
;extension=php_dba.dll
|
||||
;extension=php_dbase.dll
|
||||
extension=php_exif.dll
|
||||
;extension=php_exif.dll
|
||||
;extension=php_fdf.dll
|
||||
extension=php_gd2.dll
|
||||
;extension=php_gettext.dll
|
||||
@ -677,7 +677,7 @@ extension=php_mysql.dll
|
||||
extension=php_mysqli.dll
|
||||
;extension=php_oci8.dll
|
||||
extension=php_openssl.dll
|
||||
extension=php_pdo.dll
|
||||
;extension=php_pdo.dll ; for php 5.2.11
|
||||
;extension=php_pdo_firebird.dll
|
||||
;extension=php_pdo_mssql.dll
|
||||
extension=php_pdo_mysql.dll
|
||||
@ -685,19 +685,19 @@ extension=php_pdo_mysql.dll
|
||||
;extension=php_pdo_oci8.dll
|
||||
;extension=php_pdo_odbc.dll
|
||||
;extension=php_pdo_pgsql.dll
|
||||
;extension=php_pdo_sqlite.dll
|
||||
extension=php_pgsql.dll
|
||||
extension=php_pdo_sqlite.dll
|
||||
;extension=php_pgsql.dll
|
||||
;extension=php_pspell.dll
|
||||
extension=php_shmop.dll
|
||||
;extension=php_shmop.dll
|
||||
;extension=php_snmp.dll
|
||||
extension=php_soap.dll
|
||||
extension=php_sockets.dll
|
||||
extension=php_sqlite.dll
|
||||
;extension=php_sqlite.dll
|
||||
;extension=php_sybase_ct.dll
|
||||
;extension=php_tidy.dll
|
||||
;extension=php_xmlrpc.dll
|
||||
;extension=php_xsl.dll
|
||||
extension=php_zip.dll
|
||||
;extension=php_zip.dll
|
||||
;extension=php_xdebug-2.0.5-5.2.dll
|
||||
|
||||
|
||||
@ -710,7 +710,8 @@ extension=php_zip.dll
|
||||
; date.timezone = UTC => You have local = greenwich.
|
||||
; date.timzeone = Europe/Paris => To use TZ+1
|
||||
; See http://php.net/date.timezone
|
||||
;date.timezone =
|
||||
date.timezone = UTC
|
||||
;date.timezone = USERTIMEZONE
|
||||
|
||||
;date.default_latitude = 31.7667
|
||||
;date.default_longitude = 35.2333
|
||||
|
||||
@ -501,7 +501,7 @@ jQuery(document).ready(function() {
|
||||
jQuery("#db_create_user").click(function() {
|
||||
init_needroot();
|
||||
});
|
||||
<?php if ($force_install_noedit) { ?>
|
||||
<?php if ($force_install_noedit && empty($force_install_databasepass)) { ?>
|
||||
jQuery("#db_pass").focus();
|
||||
<?php } ?>
|
||||
});
|
||||
|
||||
@ -328,15 +328,15 @@ function pHeader($soutitre,$next,$action='set',$param='',$forcejqueryurl='')
|
||||
|
||||
print '<!-- Includes CSS for JQuery -->'."\n";
|
||||
if ($forcejqueryurl) print '<link rel="stylesheet" type="text/css" href="'.$forcejquerydir.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
|
||||
else if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
|
||||
else if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
|
||||
else print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n"; // JQuery
|
||||
|
||||
print '<!-- Includes JS for JQuery -->'."\n";
|
||||
if ($forcejqueryurl) print '<script type="text/javascript" src="'.$forcejqueryurl.'jquery.min.js"></script>'."\n";
|
||||
else if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
|
||||
else if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
|
||||
else print '<script type="text/javascript" src="../includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
|
||||
if ($forcejqueryurl) print '<script type="text/javascript" src="'.$forcejqueryurl.'jquery-ui.min.js"></script>'."\n";
|
||||
else if (constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js"></script>'."\n";
|
||||
else if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js"></script>'."\n";
|
||||
else print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui-latest.custom.min'.$ext.'"></script>'."\n";
|
||||
|
||||
print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user