Changeset 2100 in ProjectBuilder for devel/pb

Timestamp:

Jul 20, 2016, 3:56:50 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Fix tag name for test versions for rpm (0.date.letter.rev)
• Fix tar file names for test versions and their usage in the setup macro and adapt PBSRC
• Fix #136 for rpm packages
• Simplify target dir setup

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -1072 +1072 @@
 
     # If we deal with a test dir, we want to keep the date in tar file and dir name
-    my $pbextdir = "";
+    my $pbextdirpkg = "";
         if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
-            $pbextdir = strftime("%Y%m%d%H%M%S", @date);
-    }
+            $pbextdirpkg = strftime("%Y%m%d%H%M%S", @date);
+    }
+    my $pbextdir = ".0.".$pbextdirpkg;
 
     foreach my $pbpkg (@pkgs) {
@@ -1102 +1103 @@
                 $letter = "f";
             }
-            $pbtag = "0.$pbextdir.$letter$pbrev";
+            $pbtag = "0.$pbextdirpkg.$letter$pbrev";
             $ENV{'PBPROJTAG'} = $pbtag;
         } elsif ((defined $pkgt) && (defined $pkgt->{$pbpkg})) {
@@ -2585 +2586 @@
             # Nothing to do here
         } else {
-            pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done ; $cmd\' | bash -e\"","Preparing $tdir on $cptarget");
+            pb_system("$shcmd \"rm -rf $tdir ; mkdir -p $tdir ; $cmd\' | bash -e\"","Preparing $tdir on $cptarget");
         }
     } else {