Changeset 28 in ProjectBuilder

Timestamp:

Aug 2, 2007, 12:15:11 AM (17 years ago)

Author:

Bruno Cornec

Message:

build2pkg works for rpm. No we need a correct spec file ;-)

File:

• devel/pb/bin/pb.pl (modified) (3 diffs)

devel/pb/bin/pb.pl

@@ -311 +311 @@
         if ($dtype eq "rpm") {
             # rpm has its own standard build directory
-            $ENV{'PBBUILDDIR'}=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
-            chdir "$ENV{'PBBUILDDIR'}";
+            my $tmp=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
+            chomp($tmp);
+            $ENV{'PBBUILDDIR'}=$tmp;
+            print $LOG "Working under $ENV{'PBBUILDDIR'}\n" if ($debug >= 0);
             foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
-                pbmkdir_p($d) if (! -d $d) || die "Please ensure that you can write into $ENV{'PBBUILDDIR'}\nSolution: setup _topdir in your ~/.rpmmacros or\nchown the $ENV{'PBBUILDDIR'} directory to your uid";
+                if (! -d "$ENV{'PBBUILDDIR'}/$d") {
+                pbmkdir_p("$ENV{'PBBUILDDIR'}/$d") || die "Please ensure that you can write into $ENV{'PBBUILDDIR'} to create $d\nSolution: setup _topdir in your ~/.rpmmacros or\nchown the $ENV{'PBBUILDDIR'} directory to your uid";
+                }
             }
 
             # We need to first extract the spec file
-            symlink "$src","SOURCES/".basename($src) || die "Unable to symlink $src in SOURCES";;
-            extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","SPECS");
-
+            symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
+            my @specfile;
+            @specfile = extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
+
+            print $LOG "specfile: ".Dumper(\@specfile)."\n" if ($debug >= 1);
             # set LANGUAGE to check for correct log messages
             $ENV{'LANGUAGE'}="C";
-            system("ls -R ");
-            system("cd SPECS ; rpmbuild -ba *.spec");
-
+            #system("ls -R $ENV{'PBBUILDDIR'}") if ($debug >= 1);
+            foreach my $f (@specfile) {
+                if ($f =~ /\.spec$/) {
+                    print $LOG "rpmbuild -ba $f ...\n";
+                    system("rpmbuild -ba $f");
+                    last;
+                }
+            }
         } elsif ($dtype eq "tgz") {
             pbmkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
@@ -405 +416 @@
 my $dir=shift;
 my $ddir=shift;
+my @files;
 
 print $LOG "Extracting build files... " if ($debug >= 0);
@@ -419 +431 @@
     next if ($f =~ /^\./);
     move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir";
-    print $LOG "mv $dir/$f .\n" if ($debug >= 1);
+    print $LOG "mv $dir/$f $ddir\n" if ($debug >= 1);
+    push @files,"$ddir/$f";
 }
 closedir(DIR);
 # Not enough but still a first cleanup
 pbrm_rf("$dir");
+return(@files);
 }