Changeset 878 in ProjectBuilder for devel

Timestamp:

Oct 23, 2009, 8:13:52 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Try to fix Solaris package build (problem in generated pkginfo format)

File:

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

devel/pb/bin/pb

@@ -1030 +1030 @@
         } elsif ($dtype eq "pkg") {
             # Solaris
-            $made="$made $dtype/";
+            $made="$made $pbpkg-$pbver.pkg.gz";
             my $pkgdestdir="$ENV{'PBBUILDDIR'}/install";
 
@@ -1036 +1036 @@
             # Will host resulting packages
             pb_mkdir_p("$dtype");
-            pb_mkdir_p("$pkgdestdir");
+            pb_mkdir_p("$pkgdestdir/delivery");
             pb_system("tar xfz $src","Extracting sources under $ENV{'PBBUILDDIR'}");
             pb_system("tar xfz $src2","Extracting pbconf under $ENV{'PBBUILDDIR'}");
@@ -1046 +1046 @@
                 die "Unable to find pkginfo file in pbconf/$ddir-$dver-$arch" if (! -f "install/pkginfo");
                 # Build
-                pb_system("install/pbbuild $pkgdestdir","Building software");
+                pb_system("install/pbbuild $pkgdestdir/delivery","Building software and installing under $pkgdestdir/delivery");
                 # Copy complementary files
-                if (-f "install/Prototype") {
-                    copy("install/Prototype", $pkgdestdir) 
+                if (-f "install/prototype") {
+                    copy("install/prototype", $pkgdestdir) 
                 } else {
                     # No prototype provided, calculating it
-                    open(PROTO,"> $pkgdestdir/Prototype") || die "Unable to create Prototype file";
+                    open(PROTO,"> $pkgdestdir/prototype") || die "Unable to create prototype file";
                     print PROTO "i pkginfo\n";
                     print PROTO "i depend\n" if (-f "install/depend");
                     $ENV{'PBSOLDESTDIR'} = $pkgdestdir;
-                    find(\&create_solaris_prototype, $pkgdestdir."/.");
+                    find(\&create_solaris_prototype, $pkgdestdir);
                 }
                 copy("install/depend", $pkgdestdir) if (-f "install/depend");
                 copy("install/pkginfo", $pkgdestdir);
-                pb_system("cd $pkgdestdir ; echo \"BASEDIR=\"$pkgdestdir\"\" >> pkginfo ; pkgmk -o -r $pkgdestdir -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
-                pb_system("pkgtrans -s $ENV{'PBBUILDDIR'}/$dtype $pbpkg-$pbver.pkg $pbpkg","Transforming $pbpkg","verbose");
+                pb_system("cd $pkgdestdir ; echo \"BASEDIR=\"$pkgdestdir\"\" >> pkginfo ; cd delivery ; pkgmk -o -r $pkgdestdir -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
+                pb_system("cd $ENV{'PBBUILDDIR'}/$dtype ;  pkgtrans -s `pwd` ../$pbpkg-$pbver.pkg","Transforming $pbpkg","verbose");
+                pb_system("cd $ENV{'PBBUILDDIR'} ;  gzip -c9 $pbpkg-$pbver.pkg","Compressing $pbpkg-$pbver.pkg","verbose");
                 pb_system("rm -rf $ENV{'PBBUILDDIR'}/$dtype $pkgdestdir/install");
             }
@@ -1103 +1104 @@
     my $pkgdestdir = $ENV{'PBSOLDESTDIR'};
 
-    return if ($_ =~ /^Prototype/);
+    return if ($_ =~ /^$pkgdestdir$/);
     if (-d $_) {
         my $n = $File::Find::name;