Changeset 1432 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Changelog.pm

Timestamp:

Mar 12, 2012, 10:24:41 PM (12 years ago)

Author:

Bruno Cornec

Message:

r4556@localhost: bruno | 2012-03-08 22:31:12 +0100

• Adds a new extdir member to the pb structure, in order to manage the timestamp tag added in version name for test versions and have a complete correspondance between the tar file content, and the names. Should fix #99. This modification creates an incompatibility in the build part of pb, so requires that the build environment be updated before it's usable (with setupve|vm or sbx2setupve|vm)
• This patch has been tested with .rpm and .deb test packages successfully. ebuild and solaris are to be tested.
• Use the new extdir member to update existing projects filter

File:

• devel/pb/lib/ProjectBuilder/Changelog.pm (modified) (4 diffs)

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -66 +66 @@
 my $pbver = $pb->{'ver'};
 my $pbtag = $pb->{'tag'};
+my $pbextdir = $pb->{'extdir'};
 my $pbsuf = $pb->{'pbos'}->{'suffix'};
 my $OUTPUT = shift;
@@ -109 +110 @@
     $ndate = &UnixDate($date,"%a", "%b", "%d", "%Y");
     $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
+    # usefule mostly for test versions
+    $pbver .= $pbextdir;
     if ($dtype eq "rpm") {
         $ver2 = "$pbver-$pbtag";
@@ -151 +154 @@
 while (<INPUT>) {
     ($ver, $date) = split(/ /);
+    # In case there is a v before the real version string
     $ver =~ s/^v//;
     chomp($date);
@@ -162 +166 @@
     if ($ver !~ /-/) {
         if ($first eq 1) {
-            $ver2 = "$ver-$pbtag";
+            $ver2 = "$ver$pbextdir-$pbtag";
             $first = 0;
         } else {