Changeset 88 in ProjectBuilder for devel/pb/bin

Timestamp:

Sep 3, 2007, 4:36:22 PM (18 years ago)

Author:

Bruno Cornec

Message:

Prepare for new actions on delivery on SSH

File:

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

devel/pb/bin/pb

@@ -29 +29 @@
 use ProjectBuilder::Changelog qw (pb_changelog);
 use ProjectBuilder::Version qw (pb_version_init);
-use ProjectBuilder::Base qw (pb_conf_read pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb);
+use ProjectBuilder::Base qw (pb_conf_read pb_conf_get pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb);
 
 my %opts;                   # CLI Options
@@ -99 +99 @@
     pb_cms2build();
     pb_build2pkg();
-} elsif ($action =~ /^build2ftp$/) {
-    pb_build2ftp();
-} elsif ($action =~ /^pkg2ftp$/) {
-    pb_pkg2ftp();
+} elsif ($action =~ /^build2ssh$/) {
+    pb_build2ssh();
+} elsif ($action =~ /^pkg2ssh$/) {
+    pb_pkg2ssh();
 } else {
     print $LOG "'$action' is not available\n";
@@ -263 +263 @@
         my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
         $pkg = { } if (not defined $pkg);
-        my %pkg = %$pkg;
-        if ((not defined $pkg{$pbpkg}) || ($pkg{$pbpkg} ne "$pbver-$pbtag")) {
-            $pkg{$pbpkg} = "$pbver-$pbtag";
-        }
-
-        print $LOG "DEBUG pkg: ".Dumper(\%pkg)."\n" if ($debug >= 1);
+        if ((not defined $pkg->{$pbpkg}) || ($pkg->{$pbpkg} ne "$pbver-$pbtag")) {
+            $pkg->{$pbpkg} = "$pbver-$pbtag";
+        }
+
+        print $LOG "DEBUG pkg: ".Dumper($pkg)."\n" if ($debug >= 1);
         open(PKG,"> $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb") || die "Unable to create $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb";
-        foreach my $p (keys %pkg) {
-            print PKG "pbpkg $p = $pkg{$p}\n";
+        foreach my $p (keys %$pkg) {
+            print PKG "pbpkg $p = $pkg->{$p}\n";
         }
         close(PKG);
@@ -290 +289 @@
     my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
     $pkg = { } if (not defined $pkg);
-    my %pkg = %$pkg;
 
     chdir "$ENV{'PBBUILDDIR'}";
     foreach my $pbpkg (@pkgs) {
-        my $vertag = $pkg{$pbpkg};
+        my $vertag = $pkg->{$pbpkg};
         # get the version of the current package - maybe different
         ($pbver,$pbtag) = split(/-/,$vertag);
@@ -337 +335 @@
 }
 
-sub pb_build2ftp {
+sub pb_build2ssh {
+
+    my @src;
 
     # Get list of packages to build
@@ -350 +350 @@
     my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
     $pkg = { } if (not defined $pkg);
-    my %pkg = %$pkg;
 
     chdir "$ENV{'PBBUILDDIR'}";
     foreach my $pbpkg (@pkgs) {
-        my $vertag = $pkg{$pbpkg};
+        my $vertag = $pkg->{$pbpkg};
         # get the version of the current package - maybe different
         ($pbver,$pbtag) = split(/-/,$vertag);
@@ -360 +359 @@
         my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
         print $LOG "Source file: $src\n" if ($debug >= 0);
-
+        push @src, $src;
     }
-}
-sub pb_pkg2ftp {
+    my $pt = pb_conf_get("sshhost", "sshlogin", "sshdir");
+    my ($sshhost,$sshlogin,$sshdir) = @$pt;
+    my $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
+    my $dir = "$sshdir->{$ENV{'PBPROJ'}}/src";
+    pb_system("ssh -q $mac \"mkdir -p $dir","Preparing $dir on $mac");
+    pb_system("scp -p ".join(' ',@src)." $mac:$dir","Source delivery in $dir on $mac");
+}
+
+sub pb_pkg2ssh {
 
     # Get list of packages to build
@@ -376 +382 @@
     my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
     $pkg = { } if (not defined $pkg);
-    my %pkg = %$pkg;
 
     chdir "$ENV{'PBBUILDDIR'}";
     foreach my $pbpkg (@pkgs) {
-        my $vertag = $pkg{$pbpkg};
+        my $vertag = $pkg->{$pbpkg};
         # get the version of the current package - maybe different
         ($pbver,$pbtag) = split(/-/,$vertag);