Changeset 1066 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Jun 27, 2010, 3:27:20 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3935@dhcp184-49-175-19: bruno | 2010-06-26 08:40:49 +0200

• Adds new "Walt Disney" feature: possibility to deliver in multiple variable dirs, and not just / and test

File:

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

devel/pb/bin/pb

@@ -1250 +1250 @@
     my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
     # Not mandatory...
-    my ($rbsconf,$testver) = pb_conf_get_if($conf,"testver");
+    my ($rbsconf,$testver,$delivery) = pb_conf_get_if($conf,"testver","delivery");
     my ($vtmout,$vepath);
     # ...Except those in virtual context
@@ -1277 +1277 @@
     my $bdir;
     if (($cmt eq "Sources") || ($cmt =~ /V[EM]Script/)) {
-        $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'}}/$delivery/src";
     } elsif (($cmt =~ /V[EM]build/)  || ($cmt =~ /V[EM]test/)) {
         $tdir = $sshdir->{$ENV{'PBPROJ'}}."/$ENV{'PBPROJ'}/delivery";
@@ -1288 +1284 @@
         $bdir =~ s|\$ENV.+\}/||;
     } 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";
-        }
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery";
     } elsif ($cmt eq "Web") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}";
-        if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
-            # This is a test website => target dir is under test
-            $tdir = $sshdir->{$ENV{'PBPROJ'}}."/../test";
-        }
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery";
     } 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";
-        }
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery/$ddir/$dver";
 
         my $repodir = $tdir;
@@ -2134 +2117 @@
         s/^testver/#testver/;
         print OUT $_;
+        pb_log(0,"Please check delivery ($_) in $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb\n") if (/^delivery/);
     }
     close(FILE);
@@ -2651 +2635 @@
     }
     $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