Debug v23
This commit is contained in:
parent
79d5c0c418
commit
d378d1f8cc
11 changed files with 44 additions and 38 deletions
2
dev/build/.gitignore
vendored
2
dev/build/.gitignore
vendored
|
|
@ -7,4 +7,4 @@
|
|||
/dolibarr-*.zip
|
||||
/*.exe
|
||||
/html
|
||||
/makepack-dolibarr.pl.bak
|
||||
/*.bak
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||
|
||||
define('DOL_DOCUMENT_ROOT', dirname(dirname($path)).'/htdocs');
|
||||
|
||||
//$algo = 'md5'; // Old algorithm
|
||||
$algo = 'sha256';
|
||||
|
||||
require_once $path."../../htdocs/master.inc.php";
|
||||
|
|
@ -182,6 +183,7 @@ if ($checklock && empty($checksource)) {
|
|||
if ($release) {
|
||||
print "Working on files into : ".DOL_DOCUMENT_ROOT."\n";
|
||||
print "Version of target release : ".$release."\n";
|
||||
print "Algo : ".$algo."\n";
|
||||
print "Include custom dir in signature : ".(empty($includecustom) ? 'no' : 'yes')."\n";
|
||||
print "Include constants in signature : ".(empty($includeconstants) ? 'none' : '');
|
||||
foreach ($includeconstants as $countrycode => $tmp) {
|
||||
|
|
@ -190,6 +192,7 @@ if ($release) {
|
|||
}
|
||||
}
|
||||
print "\n";
|
||||
print "\n";
|
||||
}
|
||||
if ($checklock) {
|
||||
print "Working on files into : ".DOL_DOCUMENT_ROOT."\n";
|
||||
|
|
|
|||
|
|
@ -20,27 +20,28 @@ use Cwd;
|
|||
use Term::ANSIColor;
|
||||
|
||||
# Change this to defined target for option 98 and 99
|
||||
$PROJECT = "dolibarr";
|
||||
my $PROJECT = "dolibarr";
|
||||
|
||||
$PUBLISHBETARC =
|
||||
my $PUBLISHBETARC =
|
||||
"$ENV{'DESTIASSOLOGIN'}\@vmprod1.dolibarr.org:/home/dolibarr/asso.dolibarr.org/dolibarr_documents/website/www.dolibarr.org/files";
|
||||
$PUBLISHSTABLE =
|
||||
my $PUBLISHSTABLE =
|
||||
"$ENV{'DESTISFLOGIN'}\@frs.sourceforge.net:/home/frs/project/dolibarr";
|
||||
|
||||
# due to implicit origin on git commands, example: implicit origin, lionel upstream, eric dolibarr
|
||||
$GITREMOTENAME = "$ENV{'GITREMOTENAME'}";
|
||||
my $GITREMOTENAME = "$ENV{'GITREMOTENAME'}";
|
||||
|
||||
#@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
|
||||
@LISTETARGET = (
|
||||
my @LISTETARGET = (
|
||||
"TGZ", "ZIP", "RPM_GENERIC", "RPM_FEDORA",
|
||||
"RPM_MANDRIVA", "RPM_OPENSUSE", "DEB", "EXEDOLIWAMP",
|
||||
"SNAPSHOT"
|
||||
); # Possible packages
|
||||
%REQUIREMENTPUBLISH = (
|
||||
my %REQUIREMENTPUBLISH = (
|
||||
"SF" => "git ssh rsync",
|
||||
"ASSO" => "git ssh rsync"
|
||||
);
|
||||
%REQUIREMENTTARGET = ( # Tool requirement for each package
|
||||
my %REQUIREMENTTARGET = ( # Tool requirement for each package
|
||||
"-CHKSUM" => "",
|
||||
"TGZ" => "tar",
|
||||
"ZIP" => "7z",
|
||||
"XZ" => "xz",
|
||||
|
|
@ -53,18 +54,18 @@ $GITREMOTENAME = "$ENV{'GITREMOTENAME'}";
|
|||
"EXEDOLIWAMP" => "ISCC.exe",
|
||||
"SNAPSHOT" => "tar"
|
||||
);
|
||||
%ALTERNATEPATH = (
|
||||
my %ALTERNATEPATH = (
|
||||
"7z" => "7-ZIP",
|
||||
"makensis.exe" => "NSIS"
|
||||
);
|
||||
|
||||
$RPMSUBVERSION = "auto"; # auto use value found into BUILD
|
||||
my $RPMSUBVERSION = "auto"; # auto use value found into BUILD
|
||||
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
|
||||
|
||||
use vars qw/ $REVISION $VERSION /;
|
||||
$VERSION = "4.0";
|
||||
my $VERSION = "4.0";
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# MAIN
|
||||
|
|
@ -198,7 +199,7 @@ open( my $IN, "<", $SOURCE . "/htdocs/version.inc.php" )
|
|||
while (<$IN>) {
|
||||
if ( $_ =~ /define\('DOL_MAJOR_VERSION',\s*'([\d\.a-z\-]+)'\)/ ) {
|
||||
$MAJORVERSION = $1;
|
||||
break;
|
||||
last;
|
||||
}
|
||||
}
|
||||
close $IN;
|
||||
|
|
@ -209,7 +210,7 @@ open( my $IN2, "<", $SOURCE . "/htdocs/filefunc.inc.php" )
|
|||
while (<$IN2>) {
|
||||
if ( $_ =~ /define\('DOL_MINOR_VERSION',\s*'([\d\.a-z\-]+)'\)/ ) {
|
||||
$MINORVERSION = $1;
|
||||
break;
|
||||
last;
|
||||
}
|
||||
}
|
||||
close $IN2;
|
||||
|
|
@ -395,6 +396,7 @@ foreach my $target ( sort keys %CHOOSEDTARGET ) {
|
|||
}
|
||||
$atleastonerpm = 1;
|
||||
}
|
||||
|
||||
foreach my $req ( split( /[,\s]/, $REQUIREMENTTARGET{$target} ) ) {
|
||||
|
||||
# Test
|
||||
|
|
|
|||
|
|
@ -7,24 +7,24 @@
|
|||
#----------------------------------------------------------------------------
|
||||
## no critic (InputOutput::ProhibitExplicitStdin,InputOutput::RequireBriefOpen)
|
||||
|
||||
use strict;
|
||||
#use strict;
|
||||
use warnings;
|
||||
use Cwd;
|
||||
use Term::ANSIColor;
|
||||
|
||||
$OWNER = "ldestailleur";
|
||||
$GROUP = "ldestailleur";
|
||||
my $OWNER = "ldestailleur";
|
||||
my $GROUP = "ldestailleur";
|
||||
|
||||
@LISTETARGET = ("ZIP"); # Possible packages
|
||||
%REQUIREMENTTARGET = ( # Tool requirement for each package
|
||||
my @LISTETARGET = ("ZIP"); # Possible packages
|
||||
my %REQUIREMENTTARGET = ( # Tool requirement for each package
|
||||
"TGZ" => "tar",
|
||||
"ZIP" => "7z"
|
||||
);
|
||||
%ALTERNATEPATH = ();
|
||||
my %ALTERNATEPATH = ();
|
||||
|
||||
use vars qw/ $REVISION $VERSION /;
|
||||
$REVISION = '1.0';
|
||||
$VERSION = "3.5 (build $REVISION)";
|
||||
my $REVISION = '1.0';
|
||||
my $VERSION = "3.5 (build $REVISION)";
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# MAIN
|
||||
|
|
@ -184,7 +184,7 @@ foreach my $PROJECT (@PROJECTLIST) {
|
|||
while (<$IN>) {
|
||||
if ( $_ =~ /this->version\s*=\s*'([\d\.]+)'/ ) {
|
||||
$PROJVERSION = $1;
|
||||
break;
|
||||
last;
|
||||
}
|
||||
}
|
||||
close $IN;
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ if (isModEnabled('blockedlog')) {
|
|||
$s = str_replace('{s}', DOL_URL_ROOT.'/blockedlog/admin/blockedlog_list.php', $s);
|
||||
print '<br>'.$s;
|
||||
}
|
||||
print'</div><br><br>';
|
||||
print'</div><br>';
|
||||
|
||||
// Version
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
|
|
@ -95,7 +95,7 @@ print ' '.$form->textwithpicto('', $htmltooltip);
|
|||
print '</td></tr>'."\n";
|
||||
print '</table>';
|
||||
print '</div>';
|
||||
print '<br>';
|
||||
print '<br><br>';
|
||||
|
||||
|
||||
// Modified or missing files
|
||||
|
|
|
|||
|
|
@ -630,7 +630,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
|
|||
}
|
||||
|
||||
// print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '');
|
||||
print $menu_array[$i]['titre'];
|
||||
print ucfirst($menu_array[$i]['titre']);
|
||||
if ($shorturlwithoutparam) {
|
||||
print '</a>';
|
||||
} else {
|
||||
|
|
@ -644,7 +644,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
|
|||
if (!empty($menu_array[$i]['prefix'])) {
|
||||
print $menu_array[$i]['prefix'];
|
||||
}
|
||||
print $menu_array[$i]['titre'];
|
||||
print ucfirst($menu_array[$i]['titre']);
|
||||
print '</span>';
|
||||
print '</div>'."\n";
|
||||
$lastlevel0 = 'greyed';
|
||||
|
|
@ -672,7 +672,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
|
|||
} else {
|
||||
print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
|
||||
}
|
||||
print $menu_array[$i]['titre'];
|
||||
print ucfirst($menu_array[$i]['titre']);
|
||||
if ($shorturlwithoutparam) {
|
||||
print '</a>';
|
||||
} else {
|
||||
|
|
@ -687,7 +687,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
|
|||
// Not enabled but visible (so greyed), except if parent was not enabled.
|
||||
print '<div class="menu_contenu'.$cssmenu.'">';
|
||||
print $tabstring;
|
||||
print '<span class="spanlilevel0 vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</span><br>';
|
||||
print '<span class="spanlilevel0 vsmenudisabled vsmenudisabledmargin">'.ucfirst($menu_array[$i]['titre']).'</span><br>';
|
||||
print '</div>'."\n";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ class MenuManager
|
|||
}
|
||||
}
|
||||
|
||||
print $val['titre'];
|
||||
print ucfirst($val['titre']);
|
||||
print '</a>'."\n";
|
||||
|
||||
// Search submenu for this mainmenu entry
|
||||
|
|
|
|||
|
|
@ -1051,7 +1051,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
|
|||
print $menu_array[$i]['prefix'];
|
||||
}
|
||||
}
|
||||
print $menu_array[$i]['titre'];
|
||||
print ucfirst($menu_array[$i]['titre']);
|
||||
if ($shorturlwithoutparam) {
|
||||
print '</a>';
|
||||
} else {
|
||||
|
|
@ -1065,7 +1065,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
|
|||
if (!empty($menu_array[$i]['prefix'])) {
|
||||
print $menu_array[$i]['prefix'];
|
||||
}
|
||||
print $menu_array[$i]['titre'];
|
||||
print ucfirst($menu_array[$i]['titre']);
|
||||
print '</span>';
|
||||
print '</div>'."\n";
|
||||
$lastlevel0 = 'greyed';
|
||||
|
|
@ -1093,7 +1093,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
|
|||
} else {
|
||||
print '<span class="vsmenu" title="'.dolPrintHTMLForAttribute($menu_array[$i]['titre']).'">';
|
||||
}
|
||||
print $menu_array[$i]['titre'];
|
||||
print ucfirst($menu_array[$i]['titre']);
|
||||
if ($shorturlwithoutparam) {
|
||||
print '</a>';
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ class MenuManager
|
|||
print str_replace('<span class="', '<span class="paddingright pictofixedwidth ', $val['prefix']);
|
||||
}
|
||||
}
|
||||
print $val['titre'];
|
||||
print ucfirst($val['titre']);
|
||||
print '</a>'."\n";
|
||||
|
||||
// Search submenu for this mainmenu entry
|
||||
|
|
@ -354,7 +354,7 @@ class MenuManager
|
|||
print '<i class="fa fa-does-not-exists fa-fw paddingright pictofixedwidth level'.($val2['level'] + 1).'"></i>';
|
||||
}
|
||||
|
||||
print $val2['titre'];
|
||||
print ucfirst($val2['titre']);
|
||||
if ($relurl2) {
|
||||
print '</a>';
|
||||
}
|
||||
|
|
@ -394,7 +394,7 @@ class MenuManager
|
|||
print $val['prefix'];
|
||||
}
|
||||
|
||||
print $val['titre'];
|
||||
print ucfirst($val['titre']);
|
||||
print '</span>';
|
||||
|
||||
print '</li>'."\n"; // close entry level 0
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ class MenuManager
|
|||
print '<span class="fas fa-home fa-fw paddingright" aria-hidden="true"></span>';
|
||||
}
|
||||
|
||||
print $val['titre'];
|
||||
print ucfirst($val['titre']);
|
||||
print '</a>'."\n";
|
||||
|
||||
// Search submenu for this mainmenu entry
|
||||
|
|
@ -357,7 +357,7 @@ class MenuManager
|
|||
print $val['prefix'];
|
||||
}
|
||||
|
||||
print $val['titre'];
|
||||
print ucfirst($val['titre']);
|
||||
print '</span>';
|
||||
}
|
||||
print '</li>';
|
||||
|
|
@ -468,7 +468,7 @@ class MenuManager
|
|||
print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
|
||||
}
|
||||
if ($menu_array[$i]['url']) {
|
||||
print $menu_array[$i]['titre'].'</a>';
|
||||
print ucfirst($menu_array[$i]['titre']).'</a>';
|
||||
} else {
|
||||
print '</span>';
|
||||
}
|
||||
|
|
|
|||
1
htdocs/install/.gitignore
vendored
1
htdocs/install/.gitignore
vendored
|
|
@ -1 +1,2 @@
|
|||
/filelist*.xml
|
||||
/md5-*.xml
|
||||
|
|
|
|||
Loading…
Reference in a new issue