Changeset 26 in ProjectBuilder

Timestamp:

Aug 1, 2007, 3:11:04 PM (17 years ago)

Author:

Bruno Cornec

Message:

build2pkg begins to work for rpm

Location:

devel

Files:

• pb/bin/pb.pl (modified) (4 diffs)
• pbconf/pb.pb (modified) (1 diff)
• pbconf/projectbuilder/rpm/pb.spec (modified) (1 diff)

devel/pb/bin/pb.pl

@@ -16 +16 @@
 use AppConfig qw(:argcount :expand);
 use File::Basename;
+use File::Copy;
 use Time::localtime qw(localtime);
 use POSIX qw(strftime);
@@ -317 +318 @@
 
             # We need to first extract the spec file
-            print $LOG "Extracting spec file\n" if ($debug >= 0);
-            symlink $src,"SOURCES/" || die "Unable to symlink $src in SOURCES";;
-            chdir "SPECS";
-            extract_build_files($src,"$pkg-$pbver/pbconf/$ddir-$dver/");
+            symlink "$src","SOURCES/".basename($src) || die "Unable to symlink $src in SOURCES";;
+            extract_build_files($src,"$pkg-$pbver/pbconf/$ddir-$dver/","SPECS");
 
             # set LANGUAGE to check for correct log messages
             $ENV{'LANGUAGE'}="C";
-            system("rpmbuild -ba *.spec 2>&1 | tee ");
+            system("ls -R ");
+            system("cd SPECS ; rpmbuild -ba *.spec");
 
         } elsif ($dtype eq "tgz") {
@@ -404 +404 @@
 my $src=shift;
 my $dir=shift;
-
+my $ddir=shift;
+
+print $LOG "Extracting build files... " if ($debug >= 0);
 system("tar xfz $src $dir >/dev/null");
 if ($? == -1) {
@@ -416 +418 @@
 foreach my $f (readdir(DIR)) {
     next if ($f =~ /^\./);
-    rename("$dir/$f",".");
+    move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir";
+    print $LOG "mv $dir/$f .\n" if ($debug >= 1);
 }
 closedir(DIR);
+# Not enough but still a first cleanup
 pbrm_rf("$dir");
 }

devel/pbconf/pb.pb

@@ -18 +18 @@
 
 # Hash of default package/package directory
-defpkgdir projectbuilder = pb
-defpkgdir projectbuilder-doc = pb-doc
+defpkgdir project-builder = pb
+defpkgdir project-builder-doc = pb-doc
 
 # Hash of additional package/package directory

devel/pbconf/projectbuilder/rpm/pb.spec

@@ -14 +14 @@
 Source:     PBSRC
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-BuildRequires:  
 BuildArch:  noarch
 Requires:   perl >= 5.8.8, PBDEP