Changeset 873 in ProjectBuilder

Timestamp:

Oct 21, 2009, 7:59:55 PM (16 years ago)

Author:

Bruno Cornec

Message:

First round of Solaris fixes

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Base.pm (modified) (1 diff)
• pb/bin/pb (modified) (4 diffs)
• pb/lib/ProjectBuilder/CMS.pm (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -383 +383 @@
 chomp($arch);
 $arch =~ s/i.86/i386/;
+# For Solaris
+$arch =~ s/i86pc/i386/;
 
 return($arch);

devel/pb/bin/pb

@@ -1028 +1028 @@
                 pb_system("sudo /sbin/makepkg -p -l y -c y $pbpkg","Packaging $pbpkg","verbose");
             }
-        } elsif ($dtype eq "sol") {
+        } elsif ($dtype eq "pkg") {
             # Solaris
             $made="$made $dtype/";
-            my $soldestdir="/usr/pb/$pbpkg";
+            my $pkgdestdir="$ENV{'PBBUILDDIR'}/install";
 
             chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
             # Will host resulting packages
             pb_mkdir_p("$dtype");
-            pb_system("tar xfz $src","Extracting sources");
-            pb_system("tar xfz $src2","Extracting pbconf");
+            pb_mkdir_p("$pkgdestdir");
+            pb_system("tar xfz $src","Extracting sources under $ENV{'PBBUILDDIR'}");
+            pb_system("tar xfz $src2","Extracting pbconf under $ENV{'PBBUILDDIR'}");
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
             symlink "pbconf/$ddir-$dver-$arch","install" || die "Unable to symlink to pbconf/$ddir-$dver-$arch";
@@ -1044 +1045 @@
                 die "Unable to find pkginfo file in pbconf/$ddir-$dver-$arch" if (! -f "install/pkginfo");
                 # Build
-                pb_system("install/pbbuild $soldestdir","Building software");
+                pb_system("install/pbbuild $pkgdestdir","Building software");
                 # Copy complementary files
                 if (-f "install/prototype") {
-                    copy("install/prototype", $soldestdir) 
+                    copy("install/prototype", $pkgdestdir) 
                 } else {
                     # No prototype provided, calculating it
@@ -1053 +1054 @@
                     print PROTO "i pkginfo\n";
                     print PROTO "i depend\n" if (-f "install/depend");
-                    find(\&create_solaris_prototype, $soldestdir);
+                    find(\&create_solaris_prototype, $pkgdestdir);
                 }
-                copy("install/depend", $soldestdir) if (-f "install/depend");
-                copy("install/pkginfo", $soldestdir);
-                pb_system("pkgmk -o -r $soldestdir -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
+                copy("install/depend", $pkgdestdir) if (-f "install/depend");
+                copy("install/pkginfo", $pkgdestdir);
+                pb_system("pkgmk -o -r $pkgdestdir -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
                 pb_system("pkgtrans -s $ENV{'PBBUILDDIR'}/$dtype $pbpkg-$pbver.pkg $pbpkg","Transformaing $pbpkg","verbose");
                 pb_system("rm -rf $ENV{'PBBUILDDIR'}/$dtype");
@@ -1095 +1096 @@
 sub create_solaris_protype {
 
-    my $uiggid = "bin bin";
+    my $uidgid = "bin bin";
 
     print PROTO "d none $_ 0755 $uidgid\n" if (-d $_);

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -600 +600 @@
         } elsif ($dtype eq "ebuild") {
             $pbpkgreal = $pbpkg;
+        } elsif ($dtype eq "pkg") {
+            $pbpkgreal = "PB$pbpkg";
         } else {
             die "pb_cms_get_real_pkg not implemented for $dtype yet";