Prepare 23.0.0
This commit is contained in:
parent
0a5b75582a
commit
82af80d411
8 changed files with 20 additions and 11 deletions
|
|
@ -60,9 +60,19 @@ my %ALTERNATEPATH = (
|
|||
);
|
||||
|
||||
my $RPMSUBVERSION = "auto"; # auto use value found into BUILD
|
||||
my $RPMDIR = "$ENV{HOME}/rpmbuild"; # by default
|
||||
if ( -d "/usr/src/redhat" ) { $RPMDIR = "/usr/src/redhat"; } # redhat
|
||||
if ( -d "/usr/src/packages" ) { $RPMDIR = "/usr/src/packages"; } # opensuse
|
||||
if ( -d "/usr/src/RPM" ) { $RPMDIR = "/usr/src/RPM"; } # mandrake
|
||||
|
||||
if ( ! -d "$RPMDIR/SOURCES" ) {
|
||||
mkdir("$RPMDIR/SOURCES");
|
||||
if ( ! -d "$RPMDIR/SOURCES" ) {
|
||||
print "Failed to create dir $RPMDIR/SOURCES\n";
|
||||
sleep 2;
|
||||
exit 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
use vars qw/ $REVISION $VERSION /;
|
||||
my $VERSION = "4.0";
|
||||
|
|
@ -203,10 +213,10 @@ while (<$IN>) {
|
|||
}
|
||||
}
|
||||
close $IN;
|
||||
open( my $IN2, "<", $SOURCE . "/htdocs/filefunc.inc.php" )
|
||||
open( my $IN2, "<", $SOURCE . "/htdocs/version.inc.php" )
|
||||
or die "Error: Can't open version file "
|
||||
. $SOURCE
|
||||
. "/htdocs/filefunc.inc.php\n";
|
||||
. "/htdocs/version.inc.php\n";
|
||||
while (<$IN2>) {
|
||||
if ( $_ =~ /define\('DOL_MINOR_VERSION',\s*'([\d\.a-z\-]+)'\)/ ) {
|
||||
$MINORVERSION = $1;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
|
||||
--- htdocs/filefunc.inc.php.patch 2011-09-03 02:32:48.666952000 +0200
|
||||
+++ htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200
|
||||
@@ -63,8 +63,8 @@
|
||||
@@ -128,8 +128,8 @@
|
||||
$conffile = "conf/conf.php";
|
||||
$conffiletoshow = "htdocs/conf/conf.php";
|
||||
$conffiletoshow = "htdocs/conf/conf.php"; // Used into the include
|
||||
// For debian/redhat like systems
|
||||
-//$conffile = "/etc/dolibarr/conf.php";
|
||||
-//$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||
|
|
|
|||
|
|
@ -189,7 +189,6 @@ done >>%{name}.lang
|
|||
%_datadir/dolibarr/htdocs/expedition
|
||||
%_datadir/dolibarr/htdocs/expensereport
|
||||
%_datadir/dolibarr/htdocs/exports
|
||||
%_datadir/dolibarr/htdocs/externalsite
|
||||
%_datadir/dolibarr/htdocs/fichinter
|
||||
%_datadir/dolibarr/htdocs/fourn
|
||||
%_datadir/dolibarr/htdocs/ftp
|
||||
|
|
|
|||
|
|
@ -270,7 +270,6 @@ done >>%{name}.lang
|
|||
%_datadir/dolibarr/htdocs/expedition
|
||||
%_datadir/dolibarr/htdocs/expensereport
|
||||
%_datadir/dolibarr/htdocs/exports
|
||||
%_datadir/dolibarr/htdocs/externalsite
|
||||
%_datadir/dolibarr/htdocs/fichinter
|
||||
%_datadir/dolibarr/htdocs/fourn
|
||||
%_datadir/dolibarr/htdocs/ftp
|
||||
|
|
|
|||
|
|
@ -187,7 +187,6 @@ done >>%{name}.lang
|
|||
%_datadir/dolibarr/htdocs/expedition
|
||||
%_datadir/dolibarr/htdocs/expensereport
|
||||
%_datadir/dolibarr/htdocs/exports
|
||||
%_datadir/dolibarr/htdocs/externalsite
|
||||
%_datadir/dolibarr/htdocs/fichinter
|
||||
%_datadir/dolibarr/htdocs/fourn
|
||||
%_datadir/dolibarr/htdocs/ftp
|
||||
|
|
|
|||
|
|
@ -197,7 +197,6 @@ done >>%{name}.lang
|
|||
%_datadir/dolibarr/htdocs/expedition
|
||||
%_datadir/dolibarr/htdocs/expensereport
|
||||
%_datadir/dolibarr/htdocs/exports
|
||||
%_datadir/dolibarr/htdocs/externalsite
|
||||
%_datadir/dolibarr/htdocs/fichinter
|
||||
%_datadir/dolibarr/htdocs/fourn
|
||||
%_datadir/dolibarr/htdocs/ftp
|
||||
|
|
|
|||
|
|
@ -33,11 +33,12 @@
|
|||
*/
|
||||
|
||||
|
||||
define('DOL_MINOR_VERSION', '0.0');
|
||||
|
||||
if (!defined('DOL_APPLICATION_TITLE')) {
|
||||
define('DOL_APPLICATION_TITLE', 'Dolibarr');
|
||||
}
|
||||
if (!defined('DOL_VERSION')) {
|
||||
define('DOL_VERSION', '23.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
|
||||
}
|
||||
|
||||
require_once 'version.inc.php'; // Define the DOL_VERSION
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ if (!defined('DOL_APPLICATION_TITLE')) {
|
|||
|
||||
// The major version of Dolibarr
|
||||
define('DOL_MAJOR_VERSION', '23');
|
||||
define('DOL_MINOR_VERSION', '0.0');
|
||||
|
||||
|
||||
define('DOL_VERSION', constant('DOL_MAJOR_VERSION').'.'.constant('DOL_MINOR_VERSION'));
|
||||
// DOL_VERSION is now a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
|
||||
|
|
|
|||
Loading…
Reference in a new issue