Changeset 2186 in ProjectBuilder

Timestamp:

Mar 3, 2017, 4:07:30 AM (7 years ago)

Author:

Bruno Cornec

Message:

Use the build keyword instead of spec to be more neutral in messages

File:

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

devel/pb/bin/pb

@@ -1659 +1659 @@
         }
 
-        @buildfiles = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBTMP'}","spec");
+        @buildfiles = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBTMP'}","build");
         pb_log(2,"buildfiles ".Dumper(\@buildfiles)."\n");
         foreach my $f (@buildfiles) {
@@ -1735 +1735 @@
             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 @buildfile = 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","build");
 
             # We need to handle potential patches to upstream sources
@@ -1875 +1875 @@
 
             # We need to first extract the ebuild file 
-            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$tmpe","ebuild");
+            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$tmpe","build");
 
             # Prepare the build env for gentoo
@@ -4694 +4694 @@
 my $dir=shift;
 my $ddir=shift;
-my $mandatory=shift || "spec";
+my $mandatory=shift || "build";
 
 my $flag = "mayfail" if (($mandatory eq "patch") || ($mandatory eq "src"));