From 647f66a13dc093f93018927a465d0637c97ee4f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 3 Jan 2005 19:40:07 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20On=20d=E9sactive=20l'attente=20lors=20de?=
=?UTF-8?q?=20la=20g=E9n=E9ration=20des=20packages=20en=20mode=20batch.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
build/makepack-dolibarr.pl | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 7ea0c08f9a4..043d1e74ef8 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -90,12 +90,13 @@ $BUILDROOT="$TEMP/buildroot";
my $copyalreadydone=0;
+my $batch=0;
print "Makepack version $VERSION\n";
print "Building package for $PROJECT $MAJOR.$MINOR\n";
for (0..@ARGV-1) {
- if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; }
+ if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; $batch=1; }
}
# Choose package targets
@@ -177,7 +178,7 @@ print "\n";
# Check if there is at least on target to build
#----------------------------------------------
$nboftargetok=0;
-foreach $target (keys %CHOOSEDTARGET) {
+foreach my $target (keys %CHOOSEDTARGET) {
if ($CHOOSEDTARGET{$target} < 0) { next; }
$nboftargetok++;
}
@@ -205,7 +206,7 @@ if ($nboftargetok) {
# Build package for each target
#------------------------------
- foreach $target (keys %CHOOSEDTARGET) {
+ foreach my $target (keys %CHOOSEDTARGET) {
if ($CHOOSEDTARGET{$target} < 0) { next; }
print "\nBuild package for target $target\n";
@@ -278,7 +279,7 @@ if ($nboftargetok) {
}
print "\n----- Summary -----\n";
-foreach $target (keys %CHOOSEDTARGET) {
+foreach my $target (keys %CHOOSEDTARGET) {
if ($CHOOSEDTARGET{$target} < 0) {
print "Package $target not built (bad requirement).\n";
} else {
@@ -286,7 +287,9 @@ foreach $target (keys %CHOOSEDTARGET) {
}
}
-print "\nPress key to finish...";
-my $WAITKEY=<STDIN>;
+if (! $btach) {
+ print "\nPress key to finish...";
+ my $WAITKEY=<STDIN>;
+}
0;
--
GitLab