Changeset 105 in ProjectBuilder

Timestamp:

Sep 4, 2007, 10:14:02 AM (18 years ago)

Author:

Bruno Cornec

Message:

Preparing work on VM

Location:

devel

Files:

• pb/bin/pb (modified) (6 diffs)
• pb/lib/ProjectBuilder/Base.pm (modified) (3 diffs)
• pbconf/TAG (deleted)
• pbconf/VERSION (deleted)

devel/pb/bin/pb

@@ -112 +112 @@
     pb_cms2build();
     pb_build2vm();
+} elsif ($action =~ /^cms2ssh$/) {
+    pb_cms2build();
+    pb_build2vm();
+    pb_build2ssh();
+    pb_pkg2ssh();
 } else {
     print $LOG "'$action' is not available\n";
@@ -401 +406 @@
 }
 
+sub pb_build2vm {
+    my ($vm,$all) = pb_get_vm();
+}
+
 sub pb_get_pkg {
 
@@ -423 +432 @@
 }
 
+#
+# Return the list of VMs we are working on
+# $all is a flag to know if we return all of them 
+# or only some (if all we publish also tar files in addition to pkgs
+#
 sub pb_get_vm {
 
 my @vm;
+my $all = 0;
 
 # 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'};
-}
+if ((not defined $ENV{'PBVM'}) || ($ENV{'PBVM'} =~ /^all$/)) {
+    my $ptr = pb_conf_get("vmlist");
+    $ENV{'PBVM'} = $ptr->{$ENV{'PBPROJ'}};
+    $all = 1;
+}
+@vm = split(/,/,$ENV{'PBVM'});
 print $LOG "VMs: ".join(',',@vm)."\n" if ($debug >= 0);
-return(\@vm);
+return(\@vm,$all);
 }
 
@@ -470 +478 @@
     print "pb (aka project-builder) Version $projectbuilderver-$projectbuilderrev\n";
     print "\n";
-    print "Syntax: pb [-vhqt][-r pbroot][-p project][-m \"mach-1...\"] <action> [<pkg1>...]\n";
+    print "Syntax: pb [-vhqt][-r pbroot][-p project][-m \"mach-1[,...]\"] <action> [<pkg1>...]\n";
     print "\n";
     print "-h : This help file\n";
@@ -487 +495 @@
     print "             (or use the env variable PBROOT)   \n";
     print "\n";
+    print "<params> can be the name of packages\n";
     print "<action> can be:\n";
     print "\n";
-    print "\tcms2build: Create a tar file of the project under your CMS\n";
+    print "\tcms2build: Create tar files for the project under your CMS\n";
     print "\t           CMS supported are SVN and CVS\n";
     print "\t           parameters are packages to build\n";
@@ -500 +509 @@
     print "\t           if not using default list\n";
     print "\n";
+    print "\tbuild2ssh: Send the tar files to a SSH host               \n";
+    print "\n";
+    print "\tpkg2ssh:   Send the packages built to a SSH host          \n";
+    print "\n";
     print "\tcms2pkg:   cms2build + build2pkg\n";
     print "\n";

devel/pb/lib/ProjectBuilder/Base.pm

@@ -82 +82 @@
     # Valid version names (optional)
     # List of files to filter (optional)
-    my ($defpkgdir, $extpkgdir, $version, $filteredfiles) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles");
+    my ($defpkgdir, $extpkgdir, $version, $filteredfiles, $pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles","projver","projtag");
     print "DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n" if ($debug >= 1);
     print "DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n" if ($debug >= 1);
@@ -103 +103 @@
 
 #
-# Set temp directory
-#
-if (not defined $ENV{'TMPDIR'}) {
-    $ENV{'TMPDIR'}="/tmp";
-}
-$ENV{'PBTMP'} = tempdir( "pb.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1 );
-
-#
 # Get global Version/Tag
 #
-my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","projver","projtag");
 
 if (not defined $ENV{'PBVER'}) {
@@ -132 +123 @@
 }
 die "Invalid tag name $ENV{'PBTAG'} in $ENV{'PBCONF'}/$proj.pb" if ($ENV{'PBTAG'} !~ /[0-9.]+/);
+
+#
+# Set temp directory
+#
+if (not defined $ENV{'TMPDIR'}) {
+    $ENV{'TMPDIR'}="/tmp";
+}
+$ENV{'PBTMP'} = tempdir( "pb.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1 );
 
 #