From 666c42eb721ba2f7ab9203cbed9ee590749c78cb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@users.sourceforge.net> Date: Tue, 1 Dec 2009 10:25:09 +0000 Subject: [PATCH] Prepare 2.8 version --- build/exe/doliwamp/doliwamp.iss | 14 +++++++------- build/makepack-dolibarr.pl | 6 +++--- htdocs/install/inc.php | 2 +- htdocs/master.inc.php | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index f599b6e8ab0..59f0414c300 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -4,11 +4,11 @@ ; Idea from WampServer 2 (http://www.wampserver.com) ;---------------------------------------------------------------------------------------- ; You must edit some path in this file to build an exe (like SourceDir). -; 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. +; WARNING: Be sure that user.* files of Mysql database used to build +; package contains only one user called root with no password. +; For this, you can edit the mysql.user table of the source database to keep +; only the root user with no password, stop server and catch +; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory. ; ; Version: $Id$ ;---------------------------------------------------------------------------------------- @@ -18,9 +18,9 @@ ; ----- Change this ----- AppName=DoliWamp ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -AppVerName=DoliWamp-2.7.0 +AppVerName=DoliWamp-2.8.0-dev ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -OutputBaseFilename=DoliWamp-2.7.0 +OutputBaseFilename=DoliWamp-2.8.0-dev ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory SourceDir=C:\Work\Data\Workspace\dolibarr diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 9b4ef17d7a4..31c57293ada 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -3,15 +3,15 @@ # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe) # \version $Revision$ -# \author (c)2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> +# \author (c)2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> #---------------------------------------------------------------------------- use Cwd; $PROJECT="dolibarr"; $MAJOR="2"; -$MINOR="7"; -$BUILD="0"; # Mettre x pour release, x-beta pour beta, x-rc pour release candidate +$MINOR="8"; +$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="1"; # A incrementer au moment de la release @LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE","EXEDOLIWAMP","SNAPSHOT"); # Possible packages diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 4ff4b47f2a0..29050b1b2bd 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -25,7 +25,7 @@ * \version $Id$ */ -define('DOL_VERSION','2.7.0'); // Also defined in htdocs/master.inc.php +define('DOL_VERSION','2.8.0-dev'); // Also defined in htdocs/master.inc.php require_once('../translate.class.php'); require_once('../lib/functions.lib.php'); diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 0dfb3e1fbc4..823aa4c9e5d 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -31,7 +31,7 @@ * \version $Id$ */ -define('DOL_VERSION','2.7.0'); // Also defined in htdocs/install/inc.php +define('DOL_VERSION','2.8.0-dev'); // Also defined in htdocs/install/inc.php define('EURO',chr(128)); // Definition des constantes syslog -- GitLab