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

Timestamp:

Jun 29, 2008, 1:21:30 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Split the pbconf dir content in a seaparate tar file to allow for matching upstream tar files. this should permit to handle patches more easily now.

File:

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

devel/pb/bin/pb

@@ -606 +606 @@
         chdir "$ENV{'PBDESTDIR'}" || die "Unable to change dir to $ENV{'PBDESTDIR'}";
         # Possibility to look at PBSRC to guess more the filename
-        pb_system("tar cfz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files compressed");
+        pb_system("tar cfz $pbpkg-$pbver.tar.gz --exclude=$pbpkg-$pbver/pbconf $pbpkg-$pbver","Creating $pbpkg tar files compressed");
         pb_log(0,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n");
+        pb_system("tar cfz $pbpkg-$pbver.pbconf.tar.gz $pbpkg-$pbver/pbconf","Creating pbconf tar files compressed");
+        pb_log(0,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.pbconf.tar.gz\n");
 
         # Keep track of version-tag per pkg
@@ -658 +660 @@
 
         my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+        my $src2="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.pbconf.tar.gz";
         pb_log(2,"Source file: $src\n");
+        pb_log(2,"Pbconf file: $src2\n");
 
         pb_log(2,"Working directory: $ENV{'PBBUILDDIR'}\n");
@@ -673 +677 @@
             # We need to first extract the spec file
             my @specfile;
-            @specfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
+            @specfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
+
+            # We need to handle potential patches to upstream sources
 
             pb_log(2,"specfile: ".Dumper(\@specfile)."\n");
@@ -696 +702 @@
             chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
             pb_system("tar xfz $src","Extracting sources");
+            pb_system("tar xfz $src2","Extracting pbconf");
 
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
@@ -720 +727 @@
 
             # We need to first extract the ebuild file 
-            @ebuildfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$tmpd");
+            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$tmpd");
 
             # Prepare the build env for gentoo
@@ -766 +773 @@
             chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
             pb_system("tar xfz $src","Extracting sources");
+            pb_system("tar xfz $src2","Extracting pbconf");
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
             symlink "pbconf/$ddir-$dver","install" || die "Unable to symlink to pbconf/$ddir-$dver";
@@ -853 +861 @@
 
             if (($cmt eq "Sources") || ($cmt eq "vm") || ($cmt eq "ve")) {
-                $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+                $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz $ENV{'PBDESTDIR'}/$pbpkg-$pbver.pbconf.tar.gz";
                 if ($cmd eq "") {
                     $cmd = "ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";