Skip to content
Snippets Groups Projects
Commit 647f66a1 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: On désactive l'attente lors de la génération des packages en mode batch.

parent f3dcc80d
No related branches found
No related tags found
No related merge requests found
...@@ -90,12 +90,13 @@ $BUILDROOT="$TEMP/buildroot"; ...@@ -90,12 +90,13 @@ $BUILDROOT="$TEMP/buildroot";
my $copyalreadydone=0; my $copyalreadydone=0;
my $batch=0;
print "Makepack version $VERSION\n"; print "Makepack version $VERSION\n";
print "Building package for $PROJECT $MAJOR.$MINOR\n"; print "Building package for $PROJECT $MAJOR.$MINOR\n";
for (0..@ARGV-1) { for (0..@ARGV-1) {
if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; } if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; $batch=1; }
} }
# Choose package targets # Choose package targets
...@@ -177,7 +178,7 @@ print "\n"; ...@@ -177,7 +178,7 @@ print "\n";
# Check if there is at least on target to build # Check if there is at least on target to build
#---------------------------------------------- #----------------------------------------------
$nboftargetok=0; $nboftargetok=0;
foreach $target (keys %CHOOSEDTARGET) { foreach my $target (keys %CHOOSEDTARGET) {
if ($CHOOSEDTARGET{$target} < 0) { next; } if ($CHOOSEDTARGET{$target} < 0) { next; }
$nboftargetok++; $nboftargetok++;
} }
...@@ -205,7 +206,7 @@ if ($nboftargetok) { ...@@ -205,7 +206,7 @@ if ($nboftargetok) {
# Build package for each target # Build package for each target
#------------------------------ #------------------------------
foreach $target (keys %CHOOSEDTARGET) { foreach my $target (keys %CHOOSEDTARGET) {
if ($CHOOSEDTARGET{$target} < 0) { next; } if ($CHOOSEDTARGET{$target} < 0) { next; }
print "\nBuild package for target $target\n"; print "\nBuild package for target $target\n";
...@@ -278,7 +279,7 @@ if ($nboftargetok) { ...@@ -278,7 +279,7 @@ if ($nboftargetok) {
} }
print "\n----- Summary -----\n"; print "\n----- Summary -----\n";
foreach $target (keys %CHOOSEDTARGET) { foreach my $target (keys %CHOOSEDTARGET) {
if ($CHOOSEDTARGET{$target} < 0) { if ($CHOOSEDTARGET{$target} < 0) {
print "Package $target not built (bad requirement).\n"; print "Package $target not built (bad requirement).\n";
} else { } else {
...@@ -286,7 +287,9 @@ foreach $target (keys %CHOOSEDTARGET) { ...@@ -286,7 +287,9 @@ foreach $target (keys %CHOOSEDTARGET) {
} }
} }
if (! $btach) {
print "\nPress key to finish..."; print "\nPress key to finish...";
my $WAITKEY=<STDIN>; my $WAITKEY=<STDIN>;
}
0; 0;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment