Changeset 328 in ProjectBuilder

Timestamp:

Feb 22, 2008, 12:00:13 PM (17 years ago)

Author:

Bruno Cornec

Message:

• pb_changelog back in Base.pm (removal of Changelog.pm)
• cms2build begins to work for pb

Files:

• devel/pb/bin/pb (modified) (3 diffs)
• devel/pb/lib/ProjectBuilder/Base.pm (modified) (4 diffs)
• devel/pb/lib/ProjectBuilder/Changelog.pm (deleted)
• pbconf/devel/pb.pb (modified) (1 diff)
• pbconf/devel/pbcl (added)

devel/pb/bin/pb

@@ -229 +229 @@
 
         # Get project info on authors and log file
-        my $chglog = "$ENV{'PBCONF'}/$pbpkg/pbcl";
-        $chglog = "$ENV{'PBCONF'}/pbcl" if (! -f $chglog);
+        my $chglog = "$ENV{'PBROOT'}/$pbpkg/pbcl";
+        $chglog = "$ENV{'PBROOT'}/pbcl" if (! -f $chglog);
         $chglog = undef if (! -f $chglog);
 
-        my $authors = "$ENV{'PBCONF'}/$pbpkg/pbauthors";
-        $authors = "$ENV{'PBCONF'}/pbauthors" if (! -f $authors);
+        my $authors = "$ENV{'PBROOT'}/$pbpkg/pbauthors";
+        $authors = "$ENV{'PBROOT'}/pbauthors" if (! -f $authors);
         $authors = "/dev/null" if (! -f $authors);
 
@@ -242 +242 @@
             copy($chglog,"$dest/NEWS") || die "Unable to create $dest/NEWS";
         }
-        pb_cms_log($scheme,$dir,$dest,$chglog,$authors);
+        pb_cms_log($scheme,"$ENV{'PBDIR'}/$pbprojver/$dir",$dest,$chglog,$authors);
 
         my %build;
 
-        my ($ptr) = pb_conf_get_if("vmlist","velist");
-        foreach my $d (split(/,/,$ptr->{$ENV{'PBPROJ'}})) {
+        my @pt;
+        @pt = pb_conf_get_if("vmlist","velist");
+        foreach my $d (split(/,/,$pt[0]->{$ENV{'PBPROJ'}}),split(/,/,$pt[1]->{$ENV{'PBPROJ'}})) {
             my ($name,$ver,$arch) = split(/-/,$d);
             chomp($arch);
@@ -261 +262 @@
             my %bfiles = ();
             my %pkgfiles = ();
-            pb_log(2,"DEBUG dir: $ENV{'PBCONF'}/$pbpkg\n");
             $build{"$ddir-$dver"} = "yes";
 

devel/pb/lib/ProjectBuilder/Base.pm

@@ -18 +18 @@
 use POSIX qw(strftime);
 use Time::localtime qw(localtime);
-
-use ProjectBuilder::Changelog qw (pb_changelog);
+use Date::Manip;
+use English;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -889 +889 @@
     if (not defined $p2) {
         # No ref in CMS project conf file so use the home dir one.
-        $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if (not defined $p1->{$ENV{'PBPROJ'}});
+        $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if ((not defined $p1->{$ENV{'PBPROJ'}}) && (defined $p1->{'default'}));
     } else {
         # Ref found in CMS project conf file
         if (not defined $p1) {
             # No ref in home dir project conf file so use the CMS one.
-            $p2->{$ENV{'PBPROJ'}} = $p2->{'default'} if (not defined $p2->{$ENV{'PBPROJ'}});
+            $p2->{$ENV{'PBPROJ'}} = $p2->{'default'} if ((not defined $p2->{$ENV{'PBPROJ'}}) && (defined $p2->{'default'}));
             $p1 = $p2;
         } else {
@@ -906 +906 @@
             if (not defined $p1->{$ENV{'PBPROJ'}}) {
                 if (defined $p2->{$ENV{'PBPROJ'}}) {
-                    $p1->{$ENV{'PBPROJ'}} = $p2->{$ENV{'PBPROJ'}};
+                    $p1->{$ENV{'PBPROJ'}} = $p2->{$ENV{'PBPROJ'}} if (defined $p2->{$ENV{'PBPROJ'}});
                 } else {
-                    $p1->{$ENV{'PBPROJ'}} = $p1->{'default'};
+                    $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if (defined $p1->{'default'});
                 }
             }
@@ -1544 +1544 @@
 }
 
+sub pb_changelog {
+
+my $dtype = shift;
+my $pkg = shift;
+my $pbver = shift;
+my $pbtag = shift;
+my $dsuf = shift;
+my $path = shift;
+my $OUTPUT = shift;
+my $doit = shift;
+my $chglog = shift || undef;
+
+my $log = "";
+
+# For date handling
+$ENV{LANG}="C";
+
+if ((not (defined $dtype)) || ($dtype eq "") || 
+        (not (defined $pkg)) || ($pkg eq "") || 
+        (not (defined $pbver)) || ($pbver eq "") || 
+        (not (defined $pbtag)) || ($pbtag eq "") || 
+        (not (defined $dsuf)) || ($dsuf eq "") || 
+        (not (defined $path)) || ($path eq "") || 
+        (not (defined $OUTPUT)) || ($OUTPUT eq "") ||
+        (not (defined $doit)) || ($doit eq "")) {
+    print $OUTPUT "\n";
+    return;
+}
+
+if (((not defined $chglog) || (! -f $chglog)) && ($doit eq "yes")) {
+    #pb_log(2,"No ChangeLog file ($chglog) for $pkg\n";
+    print $OUTPUT "\n";
+    return;
+}
+
+my $date;
+my $ndate;
+my $n2date;
+my $ver;
+my $ver2;
+my ($packager) = pb_conf_get("pbpackager");
+
+# If we don't need to do it, or don't have it fake something
+if (((not defined $chglog) || (! -f $chglog)) && ($doit ne "yes")) {
+    my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
+    $date = strftime("%Y-%m-%d", @date);
+    $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");
+    $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
+    if (($dtype eq "rpm") || ($dtype eq "fc")) {
+        $ver2 = "$pbver-$pbtag$dsuf";
+        print $OUTPUT "* $ndate $packager->{$ENV{'PBPROJ'}} $ver2\n";
+        print $OUTPUT "- Updated to $pbver\n";
+        }
+    if ($dtype eq "deb") {
+        print $OUTPUT "$pkg ($pbver) unstable; urgency=low\n";
+        print $OUTPUT "\n";
+        print $OUTPUT " -- $packager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
+        }
+    return;
+}
+
+open(INPUT,"$chglog") || die "Unable to open $chglog (read)";
+
+# Skip first 4 lines
+my $tmp = <INPUT>;
+$tmp = <INPUT>;
+$tmp = <INPUT>;
+if ($dtype eq "announce") {
+    print $OUTPUT $tmp;
+}
+$tmp = <INPUT>;
+if ($dtype eq "announce") {
+    print $OUTPUT $tmp;
+}
+
+my $first=1;
+
+# Handle each block separated by newline
+while (<INPUT>) {
+    ($ver, $date) = split(/ /);
+    $ver =~ s/^v//;
+    chomp($date);
+    $date =~ s/\(([0-9-]+)\)/$1/;
+    #pb_log(2,"**$date**\n";
+    $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");
+    $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
+    #pb_log(2,"**$ndate**\n";
+
+    if (($dtype eq "rpm") || ($dtype eq "fc")) {
+        if ($ver !~ /-/) {
+            if ($first eq 1) {
+                $ver2 = "$ver-$pbtag$dsuf";
+                $first=0;
+            } else {
+                $ver2 = "$ver-1$dsuf";
+            }
+        } else {
+            $ver2 = "$ver$dsuf";
+        }
+        print $OUTPUT "* $ndate $packager->{$ENV{'PBPROJ'}} $ver2\n";
+        print $OUTPUT "- Updated to $ver\n";
+        }
+    if ($dtype eq "deb") {
+        print $OUTPUT "$pkg ($ver) unstable; urgency=low\n";
+        print $OUTPUT "\n";
+        }
+
+    $tmp = <INPUT>; 
+    while ($tmp !~ /^$/) {
+        if ($dtype eq "deb") {
+            $tmp =~ s/^- //;
+            print $OUTPUT "  * $tmp";
+        } elsif ($dtype eq "rpm") {
+            print $OUTPUT "$tmp";
+        } else {
+            print $OUTPUT "$tmp";
+        }
+        last if (eof(INPUT));
+        $tmp = <INPUT>;
+    }
+    print $OUTPUT "\n";
+
+    if ($dtype eq "deb") {
+        # Cf: http://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog
+        print $OUTPUT " -- $packager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
+        }
+
+    last if (eof(INPUT));
+    last if ($dtype eq "announce");
+}
+close(INPUT);
+}
 1;

pbconf/devel/pb.pb

@@ -32 +32 @@
 # a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
 #
-vmlist collectl = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
+vmlist pb = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
 
 velist pb = fedora-7-i386