Changeset 90 in ProjectBuilder for devel

Timestamp:

Sep 3, 2007, 5:27:15 PM (17 years ago)

Author:

Bruno Cornec

Message:

First version for pkg2ssh

File:

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

devel/pb/bin/pb

@@ -336 +336 @@
 
 sub pb_build2ssh {
+    pb_send2ssh("Sources");
+}
+
+sub pb_pkg2ssh {
+    pb_send2ssh("Packages");
+}
+
+sub pb_send2ssh {
+
+    my $cmt = shift;
 
     my @src;
@@ -352 +362 @@
 
     chdir "$ENV{'PBBUILDDIR'}";
+    my $src;
     foreach my $pbpkg (@pkgs) {
         my $vertag = $pkg->{$pbpkg};
@@ -357 +368 @@
         ($pbver,$pbtag) = split(/-/,$vertag);
 
-        my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
-        print $LOG "Source file: $src\n" if ($debug >= 0);
+        if ($cmt eq "Sources") {
+            $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+        } elsif ($cmt eq "Packages") {
+            if ($dtype eq "rpm") {
+                $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"
+            } elsif ($dtype eq "ebuild") {
+                $src="$ENV{'PBBUILDDIR'}/portage/*/$pbpkg/$pbpkg$pbver.ebuild"
+            } elsif ($dtype eq "slackware") {
+                $src="$ENV{'PBBUILDDIR'}/build-$pbpkg/$pbpkg$pbver-*-$pbtag.tgz"
+            } else {
+                die "Unknown dtype format $dtype";
+            }
+        }
+        print $LOG "$cmt: $src\n" if ($debug >= 0);
         push @src, $src;
     }
@@ -364 +389 @@
     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
-    my $ptr = pb_get_pkg();
-    @pkgs = @$ptr;
-
-    # Get the running distro to build on
-    my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init();
-    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n" if ($debug >= 1);
-
-    # Get content saved in cms2build
-    my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$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);
-
-        my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
-        print $LOG "Source file: $src\n" if ($debug >= 0);
-
-        if ($dtype eq "rpm") {
-            # rpm has its own standard build directory
-            my $tmp=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
-            chomp($tmp);
-            $ENV{'PBBUILDDIR'}=$tmp;
-            print $LOG "Working under $ENV{'PBBUILDDIR'}\n" if ($debug >= 0);
-            foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
-                if (! -d "$ENV{'PBBUILDDIR'}/$d") {
-                pb_mkdir_p("$ENV{'PBBUILDDIR'}/$d") || die "Please ensure that you can write into $ENV{'PBBUILDDIR'} to create $d\nSolution: setup _topdir in your ~/.rpmmacros or\nchown the $ENV{'PBBUILDDIR'} directory to your uid";
-                }
-            }
-
-            # We need to first extract the spec file
-            symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
-            my @specfile;
-            @specfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
-
-            print $LOG "specfile: ".Dumper(\@specfile)."\n" if ($debug >= 1);
-            # set LANGUAGE to check for correct log messages
-            $ENV{'LANGUAGE'}="C";
-            #system("ls -R $ENV{'PBBUILDDIR'}") if ($debug >= 1);
-            foreach my $f (@specfile) {
-                if ($f =~ /\.spec$/) {
-                    pb_system("rpmbuild -ba $f","Building package with $f");
-                    last;
-                }
-            }
-        } elsif ($dtype eq "tgz") {
-            pb_mkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
-        } elsif ($dtype eq "ebuild") {
-            pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
-        } else {
-        }
-    }
+    my $dir;
+    if ($cmt eq "Sources") {
+        $dir = "$sshdir->{$ENV{'PBPROJ'}}/src";
+    } elsif ($cmt eq "Packages") {
+        $dir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
+    } else {
+        return;
+    }
+    $src = join(' ',@src);
+    pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src\"","Preparing $dir on $mac");
+    pb_system("scp -p $src $mac:$dir","$cmt delivery in $dir on $mac");
 }