Changeset 2084 in ProjectBuilder

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.)

Location:

devel

Files:

• pb-doc/NOTES (modified) (1 diff)
• pb-doc/README (modified) (1 diff)
• pb-doc/pb-demo (modified) (2 diffs)
• pb-doc/qemu.txt (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Env.pm (modified) (3 diffs)
• pb/bin/pb (modified) (8 diffs)
• pb/bin/pbg (modified) (1 diff)
• pb/bin/pbvi (modified) (1 diff)
• pbtest/bin/pbtest (modified) (1 diff)

devel/pb-doc/NOTES

@@ -19 +19 @@
 expect eof
 
-echo "xxxxxxxx" | setsid rpm --addsign /users/bruno/mondo/svn/build/RPMS/x86_64/mindi-1.2.5-1.mdv2007.1.x86_64.rpm
+echo "xxxxxxxx" | setsid rpm --addsign /users/bruno/mondo/svn/pbbuild/RPMS/x86_64/mindi-1.2.5-1.mdv2007.1.x86_64.rpm

devel/pb-doc/README

@@ -16 +16 @@
 $
 
-We indicate here that we use pb to build pb (heh !) and that our Subversion local instance is under $HOME/pb/svn. This is also where pb will put its temporary directory (such as build and delivery) and the important files pbrc*.
+We indicate here that we use pb to build pb (heh !) and that our Subversion local instance is under $HOME/pb/svn. This is also where pb will put its temporary directory (such as build and pbdelivery) and the important files pbrc*.
 
 When using SVN, please use version >= 1.2.1 as 1.1.4 for example doesn't know how to export files which is used by pb.

devel/pb-doc/pb-demo

@@ -19 +19 @@
 
 # Show the upstream part
-ls -altg /home/bruno/svn-git/pb/delivery/
-tar tvfz /home/bruno/svn-git/pb/delivery/project-builder-develXXX.tar.gz
+ls -altg /home/bruno/svn-git/pb/pbdelivery/
+tar tvfz /home/bruno/svn-git/pb/pbdelivery/project-builder-develXXX.tar.gz
 
 # Show the pb specific part
-tar tvfz /home/bruno/svn-git/pb/delivery/project-builder-develXXX.pbconf.tar.gz
+tar tvfz /home/bruno/svn-git/pb/pbdelivery/project-builder-develXXX.pbconf.tar.gz
 
 # Now make the packages
@@ -29 +29 @@
 
 # Look at the latest pckges created
-ls -altrg /home/bruno/svn-git/pb/build/RPMS/noarch
+ls -altrg /home/bruno/svn-git/pb/pbbuild/RPMS/noarch
 
 # Install the generated packages
-sudo urpmi /home/bruno/svn-git/pb/build/RPMS/noarch/*.rpm
+sudo urpmi /home/bruno/svn-git/pb/pbbuild/RPMS/noarch/*.rpm
 
 # Check that it's the right one

devel/pb-doc/qemu.txt

@@ -55 +55 @@
 rpm -ivh afio-2.4.7-1.src.rpm buffer-1.19-1.src.rpm
 mkdir -p build/BUILD build/RPMS/i386 build/SRPMS
-rpmbuild --define "_topdir $HOME/build" -ba build/SPECS/afio.spec
-rpmbuild --define "_topdir $HOME/build" -ba build/SPECS/buffer.spec
+rpmbuild --define "_topdir $HOME/pbbuild" -ba build/SPECS/afio.spec
+rpmbuild --define "_topdir $HOME/pbbuild" -ba build/SPECS/buffer.spec
 chmod 644 build/RPMS/i386/*
 scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* www.mondorescue.org:/mondo/ftp/rhel/3/
 
 root:
-rpm -ivh ~bruno/build/RPMS/i?86/afio-[0-9]* ~bruno/build/RPMS/i?86/buffer-[0-9]*
+rpm -ivh ~bruno/pbbuild/RPMS/i?86/afio-[0-9]* ~bruno/pbbuild/RPMS/i?86/buffer-[0-9]*
 
 # For RHAS 2.1 add grep-2.5.1

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -202 +202 @@
   ---------------------------------------------                ----------
   *      *        *       |        |          |                *        *
- tag    dev    pbconf    ...     build     delivery PBCONFDIR dev      tag                  
+ tag    dev    pbconf    ...    bpbuild  pbdelivery PBCONFDIR dev      tag                  
   |               |                           |     PBDESTDIR           |
   ---          ------                        pbrc   PBBUILDDIR       -------
@@ -263 +263 @@
 # Set delivery directory
 #
-$ENV{'PBDESTDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/delivery";
+$ENV{'PBDESTDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbdelivery";
 
 pb_log(2,"PBDESTDIR: $ENV{'PBDESTDIR'}\n");
@@ -289 +289 @@
 # Set build directory
 #
-$ENV{'PBBUILDDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/build";
+$ENV{'PBBUILDDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbbuild";
 if (! -d "$ENV{'PBBUILDDIR'}") {
     pb_mkdir_p($ENV{'PBBUILDDIR'});

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";

devel/pb/bin/pbg

@@ -1 +1 @@
 #!/bin/bash
 export LANGUAGE=C
-egrep -r $* . | egrep -v '\.svn|~:|Binary[ \t]|/CVS/|/tags$|No such' 
+egrep -r $* . | egrep -v '\.svn|~:|Binary[ \t]|/CVS/|[.]/tags$|No such|/pbbuild/|/pbdelivery/' 

devel/pb/bin/pbvi

@@ -1 +1 @@
 #!/bin/bash
 export LANGUAGE=C
-gvim `egrep -r $* . | egrep -v '\.svn|~:|^Binary[\t ]|/CVS/|/tags$|No such' | cut -d: -f1 | sort -u`
+gvim `egrep -r $* . | egrep -v '\.svn|~:|^Binary[\t ]|/CVS/|[.]/tags$|No such|/pbbuild/|/pbdelivery/' | cut -d: -f1 | sort -u`

devel/pbtest/bin/pbtest

@@ -277 +277 @@
 
 sudopbtest "pb sbx2pkg"
-rpm -qilvp $PBTEST/pb/afio/build/RPMS/x86_64/afio-2.5*
+rpm -qilvp $PBTEST/pb/afio/pbbuild/RPMS/x86_64/afio-2.5*
 
 cat > /tmp/pbtestcmd << EOF