lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes for installer

Browse Source
This commit is contained in:
Laurent Destailleur 2008-04-04 00:03:21 +00:00
parent 691ab71ecf
commit 18c3dff627
6 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
build/exe/doliwamp/doliwamp2.4.iss
View File

@ -1,6 +1,13 @@
; -- Doliwamp.iss -- ; -- Doliwamp.iss --
; Script to build an auto installer for Dolibarr. ; Script to build an auto installer for Dolibarr.
; Idea from WampServer 2 (http://www.wampserver.com) ; Idea from WampServer 2 (http://www.wampserver.com)
;
; You must edit some path in this file to build an exe.
; WARNING: Be sure that user files for Mysql data used to build
; package contains only user root with no password.
; For this, you can edit mysql.user table for a database to keep
; only root user with no password, stop server and catch
; files user.MY* to put them in data sources.
[Setup] [Setup]
@ -61,7 +68,7 @@ Source: "C:\Program Files\Wamp\apps\phpmyadmin2.10.1\*.*"; DestDir: "{app}\apps\
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\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" 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"
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" 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"
; Mysql database ; Mysql data files
Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45\data\mysql"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db" Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45\data\mysql"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
; Dolibarr ; Dolibarr
Source: "external-libs\*.*"; DestDir: "{app}\www\dolibarr\external-libs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db" Source: "external-libs\*.*"; DestDir: "{app}\www\dolibarr\external-libs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
@ -221,7 +228,7 @@ begin
StringChange (srcContents, 'WAMPAPACHEPORT', apachePort); StringChange (srcContents, 'WAMPAPACHEPORT', apachePort);
SaveStringToFile(destFile,srcContents, False); SaveStringToFile(destFile,srcContents, False);
end end
DeleteFile(SrcFile); DeleteFile(srcFile);
@ -244,7 +251,7 @@ begin
SaveStringToFile(destFile,srcContents, False); SaveStringToFile(destFile,srcContents, False);
end end
DeleteFile(SrcFile); DeleteFile(srcFile);
@ -265,7 +272,7 @@ begin
SaveStringToFile(destFile, srcContents, False); SaveStringToFile(destFile, srcContents, False);
end end
DeleteFile(SrcFile); DeleteFile(srcFile);
@ -295,7 +302,7 @@ begin
SaveStringToFile(destFile,srcContents, False); SaveStringToFile(destFile,srcContents, False);
end end
end end
//DeleteFile(SrcFile); //DeleteFile(srcFile);
@ -316,7 +323,7 @@ begin
SaveStringToFile(destFile,srcContents, False); SaveStringToFile(destFile,srcContents, False);
end end
//DeleteFile(SrcFile); //DeleteFile(srcFile);
@ -367,7 +374,7 @@ begin
StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion); StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion);
SaveStringToFile(destFile, srcContents, False); SaveStringToFile(destFile, srcContents, False);
end end
DeleteFile(SrcFile); DeleteFile(srcFile);
@ -377,23 +384,6 @@ DeleteFile(SrcFile);
// Fichier dolibarr // Fichier dolibarr
//---------------------------------------------- //----------------------------------------------
//destFile := pathWithSlashes+'/www/dolibarr/htdocs/conf/conf.php';
//srcFile := pathWithSlashes+'/www/dolibarr/htdocs/conf/conf.php.example';
//if not FileExists (destFile) then
//begin
// LoadStringFromFile (srcFile, srcContents);
//installDir et version de php
// StringChange (srcContents, '$dolibarr_main_document_root=""', '$dolibarr_main_document_root="'+pathWithSlashes+'/www/dolibarr/htdocs"');
// StringChange (srcContents, '$dolibarr_main_data_root=""', '$dolibarr_main_data_root="'+pathWithSlashes+'/dolibarr_documents"');
// StringChange (srcContents, '$dolibarr_main_db_port=""', '$dolibarr_main_db_port="'+mysqlPort+'"');
// StringChange (srcContents, '$dolibarr_main_db_user=""', '$dolibarr_main_db_user="admin"');
// StringChange (srcContents, '$dolibarr_main_db_pass=""', '$dolibarr_main_db_user="'+newPassword+'"');
// SaveStringToFile(destFile,srcContents, False);
//end
destFile := pathWithSlashes+'/www/dolibarr/htdocs/install/install.forced.php'; destFile := pathWithSlashes+'/www/dolibarr/htdocs/install/install.forced.php';
srcFile := pathWithSlashes+'/www/dolibarr/htdocs/install/install.forced.php.install'; srcFile := pathWithSlashes+'/www/dolibarr/htdocs/install/install.forced.php.install';
@ -407,7 +397,7 @@ begin
SaveStringToFile(destFile,srcContents, False); SaveStringToFile(destFile,srcContents, False);
end end
DeleteFile(srcFile);
@ -429,7 +419,7 @@ begin
SaveStringToFile(destFile,srcContents, False); SaveStringToFile(destFile,srcContents, False);
end end
DeleteFile(SrcFile); DeleteFile(srcFile);
@ -453,7 +443,7 @@ begin
SaveStringToFile(destFile,srcContents, False); SaveStringToFile(destFile,srcContents, False);
end end
DeleteFile(SrcFile); DeleteFile(srcFile);
@ -476,7 +466,7 @@ begin
SaveStringToFile(destFile,srcContents, False); SaveStringToFile(destFile,srcContents, False);
end end
DeleteFile(SrcFile); DeleteFile(srcFile);
@ -494,11 +484,12 @@ begin
//version de apache et mysql //version de apache et mysql
StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion); StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion);
StringChange (srcContents, 'WAMPMYSQLPORT', mysqlPort);
StringChange (srcContents, 'WAMPMYSQLNEWPASSWORD', newPassword); StringChange (srcContents, 'WAMPMYSQLNEWPASSWORD', newPassword);
SaveStringToFile(destFile,srcContents, False); SaveStringToFile(destFile,srcContents, False);
end end
DeleteFile(SrcFile); DeleteFile(srcFile);
@ -506,6 +497,7 @@ DeleteFile(SrcFile);
//---------------------------------------------- //----------------------------------------------
// fichier php.ini dans php // fichier php.ini dans php
//---------------------------------------------- //----------------------------------------------
destFile := pathWithSlashes+'/bin/php/php'+phpVersion+'/php.ini'; destFile := pathWithSlashes+'/bin/php/php'+phpVersion+'/php.ini';
srcFile := pathWithSlashes+'/bin/php/php'+phpVersion+'/php.ini.install'; srcFile := pathWithSlashes+'/bin/php/php'+phpVersion+'/php.ini.install';
@ -525,8 +517,6 @@ DeleteFile(SrcFile);
// fichier phpForApache.ini dans php // fichier phpForApache.ini dans php
//---------------------------------------------- //----------------------------------------------
destFile := pathWithSlashes+'/bin/php/php'+phpVersion+'/phpForApache.ini'; destFile := pathWithSlashes+'/bin/php/php'+phpVersion+'/phpForApache.ini';
if not FileExists (destFile) then if not FileExists (destFile) then
begin begin
@ -539,8 +529,6 @@ DeleteFile(SrcFile);
// fichier php.ini dans apache // fichier php.ini dans apache
//---------------------------------------------- //----------------------------------------------
destFile := pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/php.ini'; destFile := pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/php.ini';
if not FileExists (destFile) then if not FileExists (destFile) then
begin begin
@ -565,7 +553,7 @@ DeleteFile(SrcFile);
// Remove dangerous files // Remove dangerous files
batFile := path+'\removefiles.bat'; batFile := path+'\removefiles.bat';
Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); // Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
end end
@ -602,7 +590,7 @@ begin
smtpServer := 'localhost'; smtpServer := 'localhost';
apachePort := '81'; apachePort := '81';
mysqlPort := '3307'; mysqlPort := '3307';
newPassword := 'dolibarr'; newPassword := 'changeme';
@ -654,7 +642,7 @@ filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlas
Page.Add('SMTP server (your own or ISP SMTP server) :', False); Page.Add('SMTP server (your own or ISP SMTP server) :', False);
Page.Add('Apache port:', False); Page.Add('Apache port:', False);
Page.Add('Mysql port:', False); Page.Add('Mysql port:', False);
Page.Add('Mysql and dolibarr root password:', False); Page.Add('Mysql and Dolibarr root password:', False);
// Valeurs par defaut // Valeurs par defaut
Page.Values[0] := smtpServer; Page.Values[0] := smtpServer;
@ -674,8 +662,6 @@ Filename: "{app}\rundoliwamp.bat"; Description: "Launch Dolibarr now"; Flags: sh
[UninstallDelete] [UninstallDelete]
Type: files; Name: "{app}\*.*" Type: files; Name: "{app}\*.*"
Type: files; Name: "{app}\www\dolibarr\htdocs\conf\conf.php"
Type: files; Name: "{app}\www\dolibarr\htdocs\install\install.forced.php"
Type: filesandordirs; Name: "{app}\alias" Type: filesandordirs; Name: "{app}\alias"
Type: filesandordirs; Name: "{app}\apps" Type: filesandordirs; Name: "{app}\apps"
Type: filesandordirs; Name: "{app}\bin\apache" Type: filesandordirs; Name: "{app}\bin\apache"
@ -685,6 +671,7 @@ Type: filesandordirs; Name: "{app}\lang"
Type: filesandordirs; Name: "{app}\logs" Type: filesandordirs; Name: "{app}\logs"
Type: filesandordirs; Name: "{app}\scripts" Type: filesandordirs; Name: "{app}\scripts"
Type: filesandordirs; Name: "{app}\tmp" Type: filesandordirs; Name: "{app}\tmp"
Type: filesandordirs; Name: "{app}\www\dolibarr"
[UninstallRun] [UninstallRun]

BIN
build/exe/doliwamp/mysql/user.MYD
View File

Binary file not shown.

BIN
build/exe/doliwamp/mysql/user.MYI
View File

Binary file not shown.

2
build/exe/doliwamp/mysqlinitpassword.bat.install
View File

@ -1 +1 @@
.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -u root password WAMPMYSQLNEWPASSWORD .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD

2
build/exe/doliwamp/removefiles.bat
View File

@ -1,3 +1,3 @@
@echo off @echo off
del /F .\mysqlinitpassword.bat del /F .\mysqlinitpassword.bat
rename .\www\dolibarr\htdocs\install install.norun

19
htdocs/install/inc.php
View File

@ -1,8 +1,8 @@
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org>
* Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2007-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -17,13 +17,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** \file htdocs/install/inc.php /** \file htdocs/install/inc.php
\brief Fichier include du programme d'installation \brief Fichier include du programme d'installation
\version $Revision$ \version $Id$
*/ */
require_once('../translate.class.php'); require_once('../translate.class.php');
@ -32,6 +30,13 @@ require_once('../lib/admin.lib.php');
// DOL_DOCUMENT_ROOT has been defined in function.inc.php to '..' // DOL_DOCUMENT_ROOT has been defined in function.inc.php to '..'
// Security check
if (eregi('install.norun',$_SERVER["SCRIPT_FILENAME"]))
{
dolibarr_print_error('','Install pages have been disabled for security reason.');
exit;
}
// Correction PHP_SELF (ex pour apache via caudium) car PHP_SELF doit valoir URL relative // Correction PHP_SELF (ex pour apache via caudium) car PHP_SELF doit valoir URL relative
// et non path absolu. // et non path absolu.
if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"]) if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"])