From 490d5cef556ec33e0f88f92f4332a0f92a1c8ed4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 19 Jun 2011 22:06:38 +0000
Subject: [PATCH] Packager can now build different packages into one launch.
---
build/makepack-dolibarr.pl | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 74a998bd9c9..35e266181f2 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -301,7 +301,7 @@ if ($nboftargetok) {
if ($target eq 'TGZ') {
print "Remove target $FILENAMETGZ.tgz...\n";
- unlink("$FILENAMETGZ.tgz");
+ unlink("$DESTI/$FILENAMETGZ.tgz");
rmdir "$BUILDROOT/$FILENAMETGZ";
print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n";
@@ -370,7 +370,7 @@ if ($nboftargetok) {
$FILENAMETGZ2="$PROJECT-$MAJOR.$MINOR.$REL1";
print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm...\n";
- unlink("$DESTI/$FILENAMETGZ2.tgz");
+ unlink("$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm");
rmdir "$BUILDROOT/$FILENAMETGZ2";
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
@@ -414,10 +414,9 @@ if ($nboftargetok) {
print "Remove target $FILENAMEDEB.deb...\n";
unlink("$DESTI/$FILENAMEDEB.deb");
+ rmdir "$BUILDROOT/$PROJECT.tmp";
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`;
-
- mkdir "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT" or die $!;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\"";
$ret=`$cmd`;
--
GitLab