Changeset 25 in ProjectBuilder

Timestamp:

Aug 1, 2007, 3:30:16 AM (17 years ago)

Author:

Bruno Cornec

Message:

code of build2pkg done. tests begin

Location:

devel

Files:

• pb/bin/pb.pl (modified) (7 diffs)
• pb/lib/common.pm (modified) (1 diff)
• pbconf/projectbuilder/rpm/pb.spec (modified) (1 diff)

devel/pb/bin/pb.pl

@@ -160 +160 @@
             $build{"$ddir-$dver"} = "yes";
             if (-d "$ENV{'PBCONF'}/$pkg/$dtype") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$dtype" || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$dtype: $!");
+                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$dtype") || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$dtype: $!";
                 foreach my $f (readdir(BDIR)) {
                     next if ($f =~ /^\./);
@@ -168 +168 @@
                 closedir(BDIR);
             } elsif (-d "$ENV{'PBCONF'}/$pkg/$dfam") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$dfam" || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$dfam: $!");
+                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$dfam") || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$dfam: $!";
                 foreach my $f (readdir(BDIR)) {
                     next if ($f =~ /^\./);
@@ -176 +176 @@
                 closedir(BDIR);
             } elsif (-d "$ENV{'PBCONF'}/$pkg/$ddir") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$ddir" || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$ddir: $!");
+                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$ddir") || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$ddir: $!";
                 foreach my $f (readdir(BDIR)) {
                     next if ($f =~ /^\./);
@@ -184 +184 @@
                 closedir(BDIR);
             } elsif (-d "$ENV{'PBCONF'}/$pkg/$ddir-$dver") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$ddir-$dver" || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$ddir-$dver: $!");
+                opendir(BDIR,"$ENV{'PBCONF'}/$pkg/$ddir-$dver") || die "Unable to open dir $ENV{'PBCONF'}/$pkg/$ddir-$dver: $!";
                 foreach my $f (readdir(BDIR)) {
                     next if ($f =~ /^\./);
@@ -269 +269 @@
         chdir "$ENV{'PBDESTDIR'}";
         print $LOG "Creating $pkg tar files (gzip... " if ($debug >= 0);
+        # Possibility to look at PBSRC to guess more the filename
         system("tar cfphz $pkg-$pbver.tar.gz $pkg-$pbver");
         if ($? == -1) {
@@ -300 +301 @@
     # Get the running distro to build on
     my ($ddir, $dver, $dfam, $dtype, $dsuf) = distro_init();
-    print $LOG "DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $dsuf)."\n" if ($debug >= 1);
-
+    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n" if ($debug >= 1);
+
+    chdir "$ENV{'PBBUILDDIR'}";
     foreach my $pkg (@pkgs) {
+        my $src="$ENV{'PBDESTDIR'}/$pkg-$pbver.tar.gz";
+        print $LOG "Handling source file $src\n" if ($debug >= 0);
+
+        if ($dtype eq "rpm") {
+            # rpm has its own standard build directory
+            $ENV{'PBBUILDDIR'}=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
+            chdir "$ENV{'PBBUILDDIR'}";
+            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";
+            }
+
+            # 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/");
+
+            # set LANGUAGE to check for correct log messages
+            $ENV{'LANGUAGE'}="C";
+            system("rpmbuild -ba *.spec 2>&1 | tee ");
+
+        } elsif ($dtype eq "tgz") {
+            pbmkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
+        } elsif ($dtype eq "ebuild") {
+            pbmkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
+        } else {
+        }
     }
 } else {
@@ -371 +400 @@
 }
 
+sub extract_build_files {
+
+my $src=shift;
+my $dir=shift;
+
+system("tar xfz $src $dir >/dev/null");
+if ($? == -1) {
+    print $LOG "failed to execute: $!\n" if ($debug >= 0);
+} elsif ($? & 127) {
+    printf $LOG "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' if ($debug >= 0);
+} else {
+    print $LOG " OK\n" if ($debug >= 0);
+}
+opendir(DIR,"$dir") || die "Unable to open directory $dir";
+foreach my $f (readdir(DIR)) {
+    next if ($f =~ /^\./);
+    rename("$dir/$f",".");
+}
+closedir(DIR);
+pbrm_rf("$dir");
+}
+
 sub syntax {
 

devel/pb/lib/common.pm

@@ -89 +89 @@
 # Set delivery directory
 #
-$ENV{'PBTOPDIR'}="$ENV{'PBROOT'}/../delivery";
+chdir "$ENV{'PBROOT'}/..";
+my $path = `pwd`;
+chomp($path);
+$ENV{'PBTOPDIR'}=$path."/delivery";
 $ENV{'PBDESTDIR'}="$ENV{'PBTOPDIR'}/$ENV{'PBVER'}-$ENV{'PBTAG'}";
-pbrm_rf($ENV{'PBDESTDIR'}) if (-d "$ENV{'PBDESTDIR'}");
-pbmkdir_p($ENV{'PBDESTDIR'}) || die "Unable to recursively create $ENV{'PBDESTDIR'}";
+if (-d $ENV{'PBDESTDIR'}) {
+    opendir(DIR,$ENV{'PBDESTDIR'}) || die "Unable to open directory $ENV{'PBDESTDIR'}: $!";
+    foreach my $d (readdir(DIR)) {
+        next if ($d =~ /^\./);
+        pbrm_rf("$ENV{'PBDESTDIR'}/$d") if (-d "$ENV{'PBDESTDIR'}/$d");
+    }
+    closedir(DIR);
+}
+if (! -d "$ENV{'PBDESTDIR'}") {
+    pbmkdir_p($ENV{'PBDESTDIR'}) || die "Unable to recursively create $ENV{'PBDESTDIR'}";
+}
+
+#
+# Set build directory
+#
+$ENV{'PBBUILDDIR'}=$path."/build";
+pbrm_rf($ENV{'PBBUILDDIR'}) if (-d "$ENV{'PBBUILDDIR'}");
+pbmkdir_p($ENV{'PBBUILDDIR'}) || die "Unable to recursively create $ENV{'PBBUILDDIR'}";
 
 umask 0022;

devel/pbconf/projectbuilder/rpm/pb.spec

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