Changeset 1219 in ProjectBuilder

Timestamp:

Feb 24, 2011, 11:14:27 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix #87. This requires to update pb in the VM|RM|VE in order to work correctly.

File:

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

devel/pb/bin/pb

@@ -1230 +1230 @@
             pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbpatch/","$ENV{'PBBUILDDIR'}/SOURCES","patch");
 
+            # We need to handle potential additional sources to upstream sources
+            pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbsrc/","$ENV{'PBBUILDDIR'}/SOURCES","src");
+
             pb_log(2,"specfile: ".Dumper(\@specfile)."\n");
             # set LANGUAGE to check for correct log messages
@@ -3555 +3558 @@
 my @files;
 
-my $flag = "mayfail" if ($mandatory eq "patch");
+my $flag = "mayfail" if (($mandatory eq "patch") || ($mandatory eq "src"));
 my $res;
 
@@ -3566 +3569 @@
 }
 # If not mandatory return now
-return() if (($res != 0) and ($mandatory eq "patch"));
+return() if (($res != 0) and (($mandatory eq "patch") || ($mandatory eq "src"));
 opendir(DIR,"$dir") || die "Unable to open directory $dir";
 foreach my $f (readdir(DIR)) {
@@ -3572 +3575 @@
     # Skip potential patch dir
     next if ($f =~ /^pbpatch/);
+    # Skip potential source dir
+    next if ($f =~ /^pbsrc/);
     move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir";
     pb_log(2,"mv $dir/$f $ddir\n");