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

Timestamp:

Apr 29, 2016, 2:47:49 PM (8 years ago)

Author:

Bruno Cornec

Message:

• build and delivery directories renamed pbbuild and pbdelivery for consistency and to ease filtering (with git e.g.)

File:

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

devel/pb/bin/pb

@@ -567 +567 @@
  % pb -p $project -r $version cms2build
 
-To create the $pbdefdir/$project/delivery/$project-$version.{,pbconf}.tar.gz files, the $version-$projtag.pb and pbrc files in the same directory.
+To create the $pbdefdir/$project/pbdelivery/$project-$version.{,pbconf}.tar.gz files, the $version-$projtag.pb and pbrc files in the same directory.
 
 =back
@@ -587 +587 @@
  % pb -p $project -r $version build2pkg
 
-To create the files in $project/build that comprise your binary package(s).
+To create the files in $project/pbbuild that comprise your binary package(s).
 
 =back
@@ -618 +618 @@
 =item Run the cms2build command
 
-If you have deleted your $package/delivery directory, re-run the cms2build command as in the earlier step. This step is necessary to generate the I<package>/delivery/pbrc file.
+If you have deleted your $package/pbdelivery directory, re-run the cms2build command as in the earlier step. This step is necessary to generate the I<package>/pbdelivery/pbrc file.
 
 =item Create the new virtual environment
@@ -1828 +1828 @@
             # Will host resulting packages
             pb_mkdir_p("$pbos->{'type'}");
-            pb_mkdir_p("$pkgdestdir/delivery");
+            pb_mkdir_p("$pkgdestdir/pbdelivery");
             pb_system("tar xfz $src","Extracting sources under $ENV{'PBBUILDDIR'}");
             pb_system("tar xfz $src2","Extracting pbconf under $ENV{'PBBUILDDIR'}");
@@ -1843 +1843 @@
                 die "Unable to find pkginfo file in pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}" if (! -f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pkginfo");
                 # Build
-                pb_system("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbbuild $pkgdestdir/delivery","Building software and installing under $pkgdestdir/delivery");
+                pb_system("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbbuild $pkgdestdir/pbdelivery","Building software and installing under $pkgdestdir/pbdelivery");
                 # Copy complementary files
                 if (-f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/prototype") {
@@ -1852 +1852 @@
                     print PROTO "i pkginfo\n";
                     print PROTO "i depend\n" if (-f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/depend");
-                    $ENV{'PBSOLDESTDIR'} = "$pkgdestdir/delivery";
-                    find(\&create_solaris_prototype, "$pkgdestdir/delivery");
+                    $ENV{'PBSOLDESTDIR'} = "$pkgdestdir/pbdelivery";
+                    find(\&create_solaris_prototype, "$pkgdestdir/pbdelivery");
                 }
                 copy("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/depend", $pkgdestdir) if (-f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/depend");
                 copy("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pkginfo", $pkgdestdir);
-                pb_system("cd $pkgdestdir/delivery ; pkgmk -o -f ../prototype -r $pkgdestdir/delivery -d $ENV{'PBBUILDDIR'}/$pbos->{'type'}","Packaging $pbpkg","verbose");
+                pb_system("cd $pkgdestdir/pbdelivery ; pkgmk -o -f ../prototype -r $pkgdestdir/pbdelivery -d $ENV{'PBBUILDDIR'}/$pbos->{'type'}","Packaging $pbpkg","verbose");
                 pb_system("cd $ENV{'PBBUILDDIR'}/$pbos->{'type'} ;  echo \"\" | pkgtrans -o -n -s $ENV{'PBBUILDDIR'}/$pbos->{'type'} $ENV{'PBBUILDDIR'}/$pbpkg-$pbver-$pbtag.pkg all","Transforming $pbpkg","verbose");
                 pb_system("cd $ENV{'PBBUILDDIR'} ;  gzip -9f $pbpkg-$pbver-$pbtag.pkg","Compressing $pbpkg-$pbver-$pbtag.pkg","verbose");
@@ -2161 +2161 @@
         $tdir = "$remdir";
     } elsif ($cmt =~ /(V[EM]|RM)(build|test|prep)/) {
-        $tdir = $remdir."/$ENV{'PBPROJ'}/delivery";
-        $bdir = $remdir."/$ENV{'PBPROJ'}/build";
+        $tdir = $remdir."/$ENV{'PBPROJ'}/pbdelivery";
+        $bdir = $remdir."/$ENV{'PBPROJ'}/pbbuild";
         # Remove a potential $ENV{'HOME'} as bdir should be relative to pb's home
         $bdir =~ s|\$ENV.+\}/||;
@@ -3222 +3222 @@
     print SCRIPT "echo ... Execution needed\n";
     print SCRIPT "echo ==== Start of script for $vtype $v =====\n";
-    print SCRIPT "# This is in directory delivery\n";
+    print SCRIPT "# This is in directory pbdelivery\n";
     print SCRIPT "# Setup the variables required for building\n";
     print SCRIPT "export PBPROJ=$ENV{'PBPROJ'}\n";