Changeset 91 in ProjectBuilder for devel/pb

Timestamp:

Sep 3, 2007, 6:50:38 PM (17 years ago)

Author:

Bruno Cornec

Message:

Remove DISTROS from pbconf and use .pbrc instead
Adds pbvi and pbg

Location:

devel/pb

Files:

• Makefile.PL (modified) (1 diff)
• bin/pb (modified) (10 diffs)
• bin/pbg (added)
• bin/pbvi (added)

devel/pb/Makefile.PL

@@ -16 +16 @@
     #ABSTRACT_FROM => 'bin/pb',   # retrieve abstract from module
     AUTHOR        => 'Bruno Cornec <bruno#project-builder.org>',
-    EXE_FILES     => [ qw( bin/pb ) ],
+    EXE_FILES     => [ qw( bin/pb bin/pbg bin/pbvi ) ],
 );

devel/pb/bin/pb

@@ -44 +44 @@
 my $pbdate = strftime("%Y-%m-%d", @date);
 
-getopts('hl:p:qr:tv',\%opts);
+getopts('hl:m:p:qr:tv',\%opts);
 
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
@@ -77 +77 @@
     $ENV{'PBROOT'} = $opts{'r'};
 }
+# Handle virtual machines if any
+if (defined $opts{'m'}) {
+    $ENV{'PBVM'} = $opts{'m'};
+}
 # Handles project name if any
 if (defined $opts{'p'}) {
@@ -87 +91 @@
 print $LOG "Action: $action\n" if ($debug >= 0);
 
-# Keeps those project value to store at end each time
+# Keep those project values to store them at the end each time
 my $pbprojtag = $ENV{'PBTAG'};
 my $pbprojver = $ENV{'PBVER'};
@@ -103 +107 @@
 } elsif ($action =~ /^pkg2ssh$/) {
     pb_pkg2ssh();
+} elsif ($action =~ /^build2vm$/) {
+    pb_build2vm();
+} elsif ($action =~ /^cms2vm$/) {
+    pb_cms2build();
+    pb_build2vm();
 } else {
     print $LOG "'$action' is not available\n";
@@ -158 +167 @@
 
         my %build;
-        open(D,"$ENV{'PBCONF'}/DISTROS") || die "Unable to find $ENV{'PBCONF'}/DISTROS\n";
-        while (<D>) {
-            my $d = $_;
-            my ($ndir,$ver) = split(/_/,$d);
+
+        my ($ptr) = pb_conf_get("vmlist");
+        foreach my $d (split(/,/,$ptr->{$ENV{'PBPROJ'}})) {
+            my ($name,$ver) = split(/_/,$d);
             chomp($ver);
-            my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init($ndir,$ver);
+            my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init($name,$ver);
             print $LOG "DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $dsuf)."\n" if ($debug >= 1);
             print $LOG "DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n" if ($debug >= 1);
@@ -238 +247 @@
             print $LOG "No Build files found for ".join(',',@notfound)."\n";
         }
-        close(D);
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBCONF'}/$pbpkg/pbinit") {
@@ -374 +382 @@
                 $src="$ENV{'PBBUILDDIR'}/RPMS/*/$pbpkg$pbver-$pbtag$dsuf.*.rpm $ENV{'PBBUILDDIR'}/SRPMS/$pbpkg$pbver-$pbtag$dsuf.src.rpm"
             } elsif ($dtype eq "deb") {
-                $src="$ENV{'PBBUILDDIR'}/$pbpkg_*.deb $ENV{'PBBUILDDIR'}/$pbpkg_*.dsc $ENV{'PBBUILDDIR'}/$pbpkg_*.tag.gz"
+                my $tmp = "$ENV{'PBBUILDDIR'}/$pbpkg";
+                $src="$tmp"."_*.deb $tmp"."_*.dsc $tmp"."_*.tar.gz"
             } elsif ($dtype eq "ebuild") {
                 $src="$ENV{'PBBUILDDIR'}/portage/*/$pbpkg/$pbpkg$pbver.ebuild"
@@ -424 +433 @@
 }
 
+sub pb_get_vm {
+
+my @vm;
+
+# Get VM list
+if (not defined $ENV{'PBVM'}) {
+    @vm = keys %defpkgdir;
+} elsif ($ENV{'PBVM'} =~ /^all$/) {
+    @vm = keys %defpkgdir;
+    if (defined %extpkgdir) {
+        my $k = keys %extpkgdir;
+        if (defined $k) {
+            push(@vm, keys %extpkgdir);
+        }
+    }
+} else {
+    @vm = $ENV{'PBVM'};
+}
+print $LOG "VMs: ".join(',',@vm)."\n" if ($debug >= 0);
+return(\@vm);
+}
+
 sub pb_extract_build_files {
 
@@ -449 +480 @@
     print "pb (aka project-builder) Version $projectbuilderver-$projectbuilderrev\n";
     print "\n";
-    print "Syntax: pb [-vhqt][-r pbroot][-p project] <action> [<params>...]\n";
+    print "Syntax: pb [-vhqt][-r pbroot][-p project][-m \"mach-1...\"] <action> [<pkg1>...]\n";
     print "\n";
     print "-h : This help file\n";
@@ -456 +487 @@
     print "-v : Verbose mode\n";
     print "\n";
+    print "-m machine : Name of the virtual Machines you want\n";
+    print "             to build on (space separated)        \n";
+    print "             (or use the env variable PBVM)       \n";
+    print "\n";
+    print "-p project : Name of the project you're working on\n";
+    print "             (or use the env variable PBPROJ)     \n";
+    print "\n";
     print "-r pbroot  : Path Name of project under the CMS \n";
     print "             (or use the env variable PBROOT)   \n";
-    print "\n";
-    print "-p project : Name of the project you're working on\n";
-    print "             (or use the env variable PBPROJ)     \n";
     print "\n";
     print "<action> can be:\n";