Changeset 1066

Timestamp:

06/27/10 15:27:20 (3 years ago)

Author:

bruno

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

Location:

devel

Files:

• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb/bin/pb (modified) (5 diffs)
• pb/lib/ProjectBuilder/Env.pm (modified) (1 diff)

devel/pb-modules/etc/pb.conf.pod

@@ -30 +30 @@
  Conffile: project
  Example: defpkgdir mondorescue = mondo,mindi NB: a default value is not really meaningful.
+
+=item B<delivery>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: directory where to deliver packages once built for ftp/web access.
+ Conffile: project
+ Example: delivery mondorescue = prod
 
 =item B<extpkgdir>

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

devel/pb/lib/ProjectBuilder/Env.pm

@@ -478 +478 @@
 
 # Additional repository to add at build time
-# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/5/pb.repo
-# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/5/pb.repo
+# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/centos/5/pb.repo
+# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/centos/5/pb.repo
 #version $ENV{'PBPROJ'} = devel,stable
 
 # Is it a test version or a production version
 testver $ENV{'PBPROJ'} = true
+# Which upper target dir for delivery
+delivery $ENV{'PBPROJ'} = test
 
 # Additional repository to add at build time
-# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/5/pb.repo
-# addrepo centos-4-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el4.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/4/pb.repo
+# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/centos/5/pb.repo
+# addrepo centos-4-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el4.rf.x86_64.rpm,ftp://ftp.project-builder.org/centos/4/pb.repo
 
 # Adapt to your needs: