Changeset 471 for devel/pb/bin/pb

Timestamp:

06/03/08 02:49:42 (5 years ago)

Author:

bruno

Message:

announce function - begining of coding

File:

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

devel/pb/bin/pb

@@ -220 +220 @@
 Create a new project and a template set of
 configuration files under pbconf
+
+=item B<announce>
+
+Announce the availability of the project through various means
 
 =back 
@@ -431 +435 @@
     # Nothing to do - already done in pb_env_init
 } elsif ($action =~ /^clean$/) {
+    # TBC
+} elsif ($action =~ /^announce$/) {
+    pb_announce();
 } else {
     pb_log(0,"\'$action\' is not available\n");
@@ -679 +686 @@
             $made="$made RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm SRPMS/$pbpkg-$pbver-$pbtag$pbsuf.src.rpm";
             if (-f "/usr/bin/rpmlint") {
-                pb_system("rpmlint $made","Checking validity of rpms with rpmlint");
+                pb_system("rpmlint $made","Checking validity of rpms with rpmlint","verbose");
             }
         } elsif ($dtype eq "deb") {
@@ -814 +821 @@
     }
     my $cmd = "";
-
-    my $ptr = pb_get_pkg();
-    @pkgs = @$ptr;
-
-    # Get the running distro to consider
+    my $src = "";
     my ($odir,$over,$oarch) = (undef, undef, undef);
-    if (defined $v) {
-        ($odir,$over,$oarch) = split(/-/,$v);
-    }
-    my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over);
-    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
-
-    # Get list of packages to build
-    # Get content saved in cms2build
-    my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
-    $pkg = { } if (not defined $pkg);
-
-    my $src = "";
-    chdir "$ENV{'PBBUILDDIR'}";
-    foreach my $pbpkg (@pkgs) {
-        my $vertag = $pkg->{$pbpkg};
-        # get the version of the current package - maybe different
-        ($pbver,$pbtag) = split(/-/,$vertag);
-
-        if (($cmt eq "Sources") || ($cmt eq "vm") || ($cmt eq "ve")) {
-            $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
-            if ($cmd eq "") {
-                $cmd = "ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";
-            } else {
-                $cmd = "$cmd ; ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";
-            }
-        }
-    }
-    # Adds conf file for availability of conf elements
-    pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
+    my ($ddir, $dver, $dfam, $dtype, $pbsuf);
+
+    if ($cmt ne "Announce") {
+        my $ptr = pb_get_pkg();
+        @pkgs = @$ptr;
+
+        # Get the running distro to consider
+        if (defined $v) {
+            ($odir,$over,$oarch) = split(/-/,$v);
+        }
+        ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over);
+        pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
+
+        # Get list of packages to build
+        # Get content saved in cms2build
+        my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
+        $pkg = { } if (not defined $pkg);
+
+        chdir "$ENV{'PBBUILDDIR'}";
+        foreach my $pbpkg (@pkgs) {
+            my $vertag = $pkg->{$pbpkg};
+            # get the version of the current package - maybe different
+            ($pbver,$pbtag) = split(/-/,$vertag);
+
+            if (($cmt eq "Sources") || ($cmt eq "vm") || ($cmt eq "ve")) {
+                $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+                if ($cmd eq "") {
+                    $cmd = "ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";
+                } else {
+                    $cmd = "$cmd ; ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";
+                }
+            }
+        }
+        # Adds conf file for availability of conf elements
+        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
+    }
 
     if (($cmt eq "vm") || ($cmt eq "ve")) {
         $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $ENV{'PBDESTDIR'}/pbscript";
-    } elsif ($cmt eq "Script") {
-        $src="$src $ENV{'PBDESTDIR'}/pbscript";
+    } elsif (($cmt eq "Script") || ($cmt eq "Announce")) {
+        $src="$src $ENV{'PBTMP'}/pbscript";
     } elsif ($cmt eq "Packages") {
         # Get package list from file made during build2pkg
@@ -889 +899 @@
     my $bdir;
     if (($cmt eq "Sources") || ($cmt eq "Script")) {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/src";
+        $tdir = $sshdir->{$ENV{'PBPROJ'}}."/src";
         if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
             # This is a test pkg => target dir is under test
-            $tdir = "$sshdir->{$ENV{'PBPROJ'}}/test/src";
+            $tdir = $sshdir->{$ENV{'PBPROJ'}}."/test/src";
         }
     } elsif (($cmt eq "vm") || ($cmt eq "ve")) {
@@ -899 +909 @@
         # Remove a potential $ENV{'HOME'} as bdir should be relative to pb's home
         $bdir =~ s|\$ENV.+\}/||;
-    } elsif ($cmt eq "Packages") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
-
+    } elsif ($cmt eq "Announce") {
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}";
         if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
             # This is a test pkg => target dir is under test
-            $tdir = "$sshdir->{$ENV{'PBPROJ'}}/test/$ddir/$dver";
+            $tdir = $sshdir->{$ENV{'PBPROJ'}}."/test";
+        }
+    } elsif ($cmt eq "Packages") {
+        $tdir = $sshdir->{$ENV{'PBPROJ'}}."/$ddir/$dver";
+
+        if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
+            # This is a test pkg => target dir is under test
+            $tdir = $sshdir->{$ENV{'PBPROJ'}}."/test/$ddir/$dver";
         }
 
@@ -1005 +1021 @@
     }
 
-    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\"","Preparing $tdir on $cptarget");
+    my $logres = "";
+    # Do not touch when just announcing
+    if ($cmt ne "Announce") {
+        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\"","Preparing $tdir on $cptarget");
+    } else {
+        $logres = "> ";
+    }
     pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $src $cptarget 2> /dev/null","$cmt delivery in $cptarget");
 
@@ -1688 +1710 @@
 }
 
+sub pb_announce {
+
+    die "-V Version parameter needed" if ((not defined $newver) || ($newver eq ""));
+
+    my ($pbrepo) = pb_conf_get("pbrepo");
+    my ($pkgv, $pkgt, $testver) = pb_conf_get_if("pkgver","pkgtag","testver");
+    my $pkg = pb_cms_get_pkg($defpkgdir,$extpkgdir);
+    my @pkgs = @$pkg;
+    my %pkgs;
+    my $first = 0;
+
+    my $findstr = "find . ";
+
+    foreach my $pbpkg (@pkgs) {
+        if ($first != 0) {
+            $findstr .= "-o ";
+        }
+        $first++;
+        if ((defined $pkgv) && (defined $pkgv->{$pbpkg})) {
+            $pbver = $pkgv->{$pbpkg};
+        } else {
+            $pbver = $ENV{'PBPROJVER'};
+        }
+        if ((defined $pkgt) && (defined $pkgt->{$pbpkg})) {
+            $pbtag = $pkgt->{$pbpkg};
+        } else {
+            $pbtag = $ENV{'PBPROJTAG'};
+        }
+
+        $findstr .= "-name \'$pbpkg-$pbver-$pbtag\.*.rpm\' -o -name \'$pbpkg"."_$pbver*\.deb\' -o -name \'$pbpkg-$pbver\.ebuild\' ";
+    }
+    $findstr .= " | grep -Ev \'src.rpm\'";
+    if ((not defined $testver) || (not defined $testver->{$ENV{'PBPROJ'}}) || ($testver->{$ENV{'PBPROJ'}} !~ /true/i)) {
+        $findstr .= " | grep -v ./test/";
+    }
+
+    # Prepare the command to run and execute it
+    open(PBS,"> $ENV{'PBTMP'}/pbscript") || die "Unable to create $ENV{'PBTMP'}/pbscript";
+    print PBS "$findstr\n";
+    close(PBS);
+    chmod 0755,"$ENV{'PBTMP'}/pbscript";
+    pb_send2target("Announce");
+
+    # Prepare a template of announce
+    open(ANN,"> $ENV{'PBTMP'}/pbannounce") || die "Unable to create $ENV{'PBTMP'}/pbannounce: $!";
+    print ANN << "EOF";
+Project $ENV{'PBPROJ'} version $newver is now available</p>
+
+<p>The project team is happy to announce the availability of a newest version of $ENV{'PBPROJ'} $newver. Enjoy it as usual!</p>
+<p>
+Now available at <a href="$pbrepo->{$ENV{'PBPROJ'}}">$pbrepo->{$ENV{'PBPROJ'}}</a>
+</p>
+<p>
+EOF
+    open(LOG,"$ENV{'PBTMP'}/system.log") || die "Unable to read $ENV{'PBTMP'}/system.log: $!";
+    while (<LOG>) {
+        print ANN $_;
+    }
+    close(LOG);
+
+    close(ANN);
+    pb_display_file("$ENV{'PBTMP'}/pbannounce");
+}
+
 # Return the SSH key file to use
 # Potentially create it if needed