Changeset 874 in ProjectBuilder

Timestamp:

Oct 21, 2009, 8:22:12 PM (15 years ago)

Author:

Bruno Cornec

Message:

Second round of Solaris fixes

File:

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

devel/pb/bin/pb

@@ -1041 +1041 @@
             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";
-            if (-x "install/pbbuild") {
+            if (-f "install/pbbuild") {
+                chmod 0755,"install/pbbuild";
                 # pkginfo file is mandatory
                 die "Unable to find pkginfo file in pbconf/$ddir-$dver-$arch" if (! -f "install/pkginfo");
@@ -1047 +1048 @@
                 pb_system("install/pbbuild $pkgdestdir","Building software");
                 # 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,"> install/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");
@@ -1059 +1060 @@
                 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");
-            }
+                pb_system("pkgtrans -s $ENV{'PBBUILDDIR'}/$dtype $pbpkg-$pbver.pkg $pbpkg","Transforming $pbpkg","verbose");
+                pb_system("rm -rf $ENV{'PBBUILDDIR'}/$dtype $pkgdestdir/install");
+            }
+            chdir ".." || die "Unable to chdir to parent dir";
+            pb_system("rm -rf $pbpkg-$pbver");
         } else {
             die "Unknown dtype format $dtype";
@@ -1094 +1097 @@
 }
 
-sub create_solaris_protype {
+sub create_solaris_prototype {
 
     my $uidgid = "bin bin";
 
-    print PROTO "d none $_ 0755 $uidgid\n" if (-d $_);
+    print PROTO "d none $File::Find::name 0755 $uidgid\n" if (-d $_);
     if (-x $_) {
-        print PROTO "f none $_ 0755 $uidgid\n";
+        print PROTO "f none $File::Find::name 0755 $uidgid\n";
     } elsif (-f $_) {
-        print PROTO "f none $_ 0644 $uidgid\n" if (-f $_);
+        print PROTO "f none $File::Find::name 0644 $uidgid\n" if (-f $_);
     }
 }