Changeset 2084


Ignore:
Timestamp:
Apr 29, 2016, 2:47:49 PM (19 months ago)
Author:
bruno
Message:
  • build and delivery directories renamed pbbuild and pbdelivery for consistency and to ease filtering (with git e.g.)
Location:
devel
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-doc/NOTES

    r981 r2084  
    1919expect eof
    2020
    21 echo "xxxxxxxx" | setsid rpm --addsign /users/bruno/mondo/svn/build/RPMS/x86_64/mindi-1.2.5-1.mdv2007.1.x86_64.rpm
     21echo "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

    r267 r2084  
    1616$
    1717
    18 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*.
     18We 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*.
    1919
    2020When 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

    r2079 r2084  
    1919
    2020# Show the upstream part
    21 ls -altg /home/bruno/svn-git/pb/delivery/
    22 tar tvfz /home/bruno/svn-git/pb/delivery/project-builder-develXXX.tar.gz
     21ls -altg /home/bruno/svn-git/pb/pbdelivery/
     22tar tvfz /home/bruno/svn-git/pb/pbdelivery/project-builder-develXXX.tar.gz
    2323
    2424# Show the pb specific part
    25 tar tvfz /home/bruno/svn-git/pb/delivery/project-builder-develXXX.pbconf.tar.gz
     25tar tvfz /home/bruno/svn-git/pb/pbdelivery/project-builder-develXXX.pbconf.tar.gz
    2626
    2727# Now make the packages
     
    2929
    3030# Look at the latest pckges created
    31 ls -altrg /home/bruno/svn-git/pb/build/RPMS/noarch
     31ls -altrg /home/bruno/svn-git/pb/pbbuild/RPMS/noarch
    3232
    3333# Install the generated packages
    34 sudo urpmi /home/bruno/svn-git/pb/build/RPMS/noarch/*.rpm
     34sudo urpmi /home/bruno/svn-git/pb/pbbuild/RPMS/noarch/*.rpm
    3535
    3636# Check that it's the right one
  • devel/pb-doc/qemu.txt

    r748 r2084  
    5555rpm -ivh afio-2.4.7-1.src.rpm buffer-1.19-1.src.rpm
    5656mkdir -p build/BUILD build/RPMS/i386 build/SRPMS
    57 rpmbuild --define "_topdir $HOME/build" -ba build/SPECS/afio.spec
    58 rpmbuild --define "_topdir $HOME/build" -ba build/SPECS/buffer.spec
     57rpmbuild --define "_topdir $HOME/pbbuild" -ba build/SPECS/afio.spec
     58rpmbuild --define "_topdir $HOME/pbbuild" -ba build/SPECS/buffer.spec
    5959chmod 644 build/RPMS/i386/*
    6060scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* www.mondorescue.org:/mondo/ftp/rhel/3/
    6161
    6262root:
    63 rpm -ivh ~bruno/build/RPMS/i?86/afio-[0-9]* ~bruno/build/RPMS/i?86/buffer-[0-9]*
     63rpm -ivh ~bruno/pbbuild/RPMS/i?86/afio-[0-9]* ~bruno/pbbuild/RPMS/i?86/buffer-[0-9]*
    6464
    6565# For RHAS 2.1 add grep-2.5.1
  • devel/pb-modules/lib/ProjectBuilder/Env.pm

    r2032 r2084  
    202202  ---------------------------------------------                ----------
    203203  *      *        *       |        |          |                *        *
    204  tag    dev    pbconf    ...     build     delivery PBCONFDIR dev      tag                 
     204 tag    dev    pbconf    ...    bpbuild  pbdelivery PBCONFDIR dev      tag                 
    205205  |               |                           |     PBDESTDIR           |
    206206  ---          ------                        pbrc   PBBUILDDIR       -------
     
    263263# Set delivery directory
    264264#
    265 $ENV{'PBDESTDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/delivery";
     265$ENV{'PBDESTDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbdelivery";
    266266
    267267pb_log(2,"PBDESTDIR: $ENV{'PBDESTDIR'}\n");
     
    289289# Set build directory
    290290#
    291 $ENV{'PBBUILDDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/build";
     291$ENV{'PBBUILDDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbbuild";
    292292if (! -d "$ENV{'PBBUILDDIR'}") {
    293293    pb_mkdir_p($ENV{'PBBUILDDIR'});
  • devel/pb/bin/pb

    r2053 r2084  
    567567 % pb -p $project -r $version cms2build
    568568
    569 To create the $pbdefdir/$project/delivery/$project-$version.{,pbconf}.tar.gz files, the $version-$projtag.pb and pbrc files in the same directory.
     569To create the $pbdefdir/$project/pbdelivery/$project-$version.{,pbconf}.tar.gz files, the $version-$projtag.pb and pbrc files in the same directory.
    570570
    571571=back
     
    587587 % pb -p $project -r $version build2pkg
    588588
    589 To create the files in $project/build that comprise your binary package(s).
     589To create the files in $project/pbbuild that comprise your binary package(s).
    590590
    591591=back
     
    618618=item Run the cms2build command
    619619
    620 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.
     620If 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.
    621621
    622622=item Create the new virtual environment
     
    18281828            # Will host resulting packages
    18291829            pb_mkdir_p("$pbos->{'type'}");
    1830             pb_mkdir_p("$pkgdestdir/delivery");
     1830            pb_mkdir_p("$pkgdestdir/pbdelivery");
    18311831            pb_system("tar xfz $src","Extracting sources under $ENV{'PBBUILDDIR'}");
    18321832            pb_system("tar xfz $src2","Extracting pbconf under $ENV{'PBBUILDDIR'}");
     
    18431843                die "Unable to find pkginfo file in pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}" if (! -f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pkginfo");
    18441844                # Build
    1845                 pb_system("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbbuild $pkgdestdir/delivery","Building software and installing under $pkgdestdir/delivery");
     1845                pb_system("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbbuild $pkgdestdir/pbdelivery","Building software and installing under $pkgdestdir/pbdelivery");
    18461846                # Copy complementary files
    18471847                if (-f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/prototype") {
     
    18521852                    print PROTO "i pkginfo\n";
    18531853                    print PROTO "i depend\n" if (-f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/depend");
    1854                     $ENV{'PBSOLDESTDIR'} = "$pkgdestdir/delivery";
    1855                     find(\&create_solaris_prototype, "$pkgdestdir/delivery");
     1854                    $ENV{'PBSOLDESTDIR'} = "$pkgdestdir/pbdelivery";
     1855                    find(\&create_solaris_prototype, "$pkgdestdir/pbdelivery");
    18561856                }
    18571857                copy("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/depend", $pkgdestdir) if (-f "pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/depend");
    18581858                copy("pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pkginfo", $pkgdestdir);
    1859                 pb_system("cd $pkgdestdir/delivery ; pkgmk -o -f ../prototype -r $pkgdestdir/delivery -d $ENV{'PBBUILDDIR'}/$pbos->{'type'}","Packaging $pbpkg","verbose");
     1859                pb_system("cd $pkgdestdir/pbdelivery ; pkgmk -o -f ../prototype -r $pkgdestdir/pbdelivery -d $ENV{'PBBUILDDIR'}/$pbos->{'type'}","Packaging $pbpkg","verbose");
    18601860                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");
    18611861                pb_system("cd $ENV{'PBBUILDDIR'} ;  gzip -9f $pbpkg-$pbver-$pbtag.pkg","Compressing $pbpkg-$pbver-$pbtag.pkg","verbose");
     
    21612161        $tdir = "$remdir";
    21622162    } elsif ($cmt =~ /(V[EM]|RM)(build|test|prep)/) {
    2163         $tdir = $remdir."/$ENV{'PBPROJ'}/delivery";
    2164         $bdir = $remdir."/$ENV{'PBPROJ'}/build";
     2163        $tdir = $remdir."/$ENV{'PBPROJ'}/pbdelivery";
     2164        $bdir = $remdir."/$ENV{'PBPROJ'}/pbbuild";
    21652165        # Remove a potential $ENV{'HOME'} as bdir should be relative to pb's home
    21662166        $bdir =~ s|\$ENV.+\}/||;
     
    32223222    print SCRIPT "echo ... Execution needed\n";
    32233223    print SCRIPT "echo ==== Start of script for $vtype $v =====\n";
    3224     print SCRIPT "# This is in directory delivery\n";
     3224    print SCRIPT "# This is in directory pbdelivery\n";
    32253225    print SCRIPT "# Setup the variables required for building\n";
    32263226    print SCRIPT "export PBPROJ=$ENV{'PBPROJ'}\n";
  • devel/pb/bin/pbg

    r1951 r2084  
    11#!/bin/bash
    22export LANGUAGE=C
    3 egrep -r $* . | egrep -v '\.svn|~:|Binary[ \t]|/CVS/|/tags$|No such'
     3egrep -r $* . | egrep -v '\.svn|~:|Binary[ \t]|/CVS/|[.]/tags$|No such|/pbbuild/|/pbdelivery/'
  • devel/pb/bin/pbvi

    r1951 r2084  
    11#!/bin/bash
    22export LANGUAGE=C
    3 gvim `egrep -r $* . | egrep -v '\.svn|~:|^Binary[\t ]|/CVS/|/tags$|No such' | cut -d: -f1 | sort -u`
     3gvim `egrep -r $* . | egrep -v '\.svn|~:|^Binary[\t ]|/CVS/|[.]/tags$|No such|/pbbuild/|/pbdelivery/' | cut -d: -f1 | sort -u`
  • devel/pbtest/bin/pbtest

    r2032 r2084  
    277277
    278278sudopbtest "pb sbx2pkg"
    279 rpm -qilvp $PBTEST/pb/afio/build/RPMS/x86_64/afio-2.5*
     279rpm -qilvp $PBTEST/pb/afio/pbbuild/RPMS/x86_64/afio-2.5*
    280280
    281281cat > /tmp/pbtestcmd << EOF
Note: See TracChangeset for help on using the changeset viewer.