Prepare freeze of 3.3

This commit is contained in:
Laurent Destailleur 2012-12-18 14:21:56 +01:00
parent 6b01c45210
commit 19d5458ded
7 changed files with 8 additions and 9 deletions

View File

@ -17,9 +17,9 @@
; ----- Change this -----
AppName=DoliWamp
; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
AppVerName=DoliWamp-3.3.0-alpha
AppVerName=DoliWamp-3.3.0-beta
; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
OutputBaseFilename=DoliWamp-3.3.0-alpha
OutputBaseFilename=DoliWamp-3.3.0-beta
; Define full path from wich all relative path are defined
; You must modify this to put here your dolibarr root directory
;SourceDir=C:\Documents and Settings\ldestail\git\dolibarr_old

View File

@ -10,7 +10,7 @@ use Cwd;
$PROJECT="dolibarr";
$MAJOR="3";
$MINOR="3";
$BUILD="0-alpha"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$RPMSUBVERSION="auto"; # auto use value found into BUILD
@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages

View File

@ -333,5 +333,5 @@ fi
%changelog
* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
- Initial version (#723326)

View File

@ -522,5 +522,5 @@ fi
%changelog
* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
- Initial version (#723326)

View File

@ -322,5 +322,5 @@ fi
%changelog
* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
- Initial version (#723326)

View File

@ -328,5 +328,5 @@ fi
%changelog
* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
- Initial version (#723326)

View File

@ -29,7 +29,7 @@
* \brief File that include conf.php file and commons lib like functions.lib.php
*/
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.3.0-alpha');
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.3.0-beta');
if (! defined('EURO')) define('EURO',chr(128));
// Define syslog constants
@ -225,7 +225,6 @@ if (! defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset(
//if (! defined('ARTICHOW_FONT')) { define('ARTICHOW_FONT', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD))?DOL_DOCUMENT_ROOT.'/includes/fonts':dirname($dolibarr_font_DOL_DEFAULT_TTF_BOLD)); }
//if (! defined('ARTICHOW_FONT_NAMES')) { define('ARTICHOW_FONT_NAMES', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD))?'Aerial,AerialBd,AerialBdIt,AerialIt':'DejaVuSans,DejaVuSans-Bold,DejaVuSans-BoldOblique,DejaVuSans-Oblique'); }
//if (! defined('ARTICHOW_PATH')) { define('ARTICHOW_PATH', (!isset($dolibarr_lib_ARTICHOW))?DOL_DOCUMENT_ROOT.'/includes/artichow/':(empty($dolibarr_lib_ARTICHOW)?'':$dolibarr_lib_ARTICHOW.'/')); }
//if (! defined('FPDF_PATH')) { define('FPDF_PATH', DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf/'); }
/*