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

Timestamp:

Feb 15, 2017, 9:25:39 PM (7 years ago)

Author:

Bruno Cornec

Message:

Improved build procedure

build is now calling back prep first in order to speed up the debug of
packages dependencies, so with docker you don't have to prep before (which can
takes a lot of time) before using that result

File:

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

devel/pb/bin/pb

@@ -1669 +1669 @@
     my $do_install = shift;
 
+        # Call build2prep in case we have new deps we want to take in account
+        # without redoing the prep phase (can be long and that helps debugging
+        # build dependencies issues
+    pb_build2prep();
     pb_log(0,"INFO: ------ Starting to build package ------\n");
     # Get the running distro to build on
@@ -1726 +1730 @@
             symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
             # We need to first extract the spec file
-            my @specfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBBUILDDIR'}/SPECS","spec");
+            my @buildfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBBUILDDIR'}/SPECS","spec");
 
             # We need to handle potential patches to upstream sources
@@ -1734 +1738 @@
             pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbsrc/","$ENV{'PBBUILDDIR'}/SOURCES","src");
 
-            pb_log(2,"specfile: ".Dumper(\@specfile)."\n");
+            pb_log(2,"buildfile: ".Dumper(\@buildfile)."\n");
             # set LANGUAGE to check for correct log messages
             $ENV{'LANGUAGE'}="C";
@@ -1747 +1751 @@
             }
 
-            foreach my $f (@specfile) {
+            foreach my $f (@buildfile) {
                 if ($f =~ /\.spec$/) {
                     pb_system("$buildcmd $specialdef --define \"packager $ENV{'PBPACKAGER'}\" --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}","verbose");