Changeset 877 in ProjectBuilder

Timestamp:

Oct 21, 2009, 8:44:32 PM (16 years ago)

Author:

Bruno Cornec

Message:

Still there with File::Find workaround

File:

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

devel/pb/bin/pb

@@ -1055 +1055 @@
                     print PROTO "i pkginfo\n";
                     print PROTO "i depend\n" if (-f "install/depend");
+                    $ENV{'PBSOLDESTDIR'} = $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("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("rm -rf $ENV{'PBBUILDDIR'}/$dtype $pkgdestdir/install");
@@ -1100 +1101 @@
 
     my $uidgid = "bin bin";
+    my $pkgdestdir = $ENV{'PBSOLDESTDIR'};
 
     return if ($_ =~ /^Prototype/);
@@ -1106 +1108 @@
         $n =~ s~$pkgdestdir/~~;
         print PROTO "d none $n 0755 $uidgid\n";
-    if (-x $_) {
+    } elsif (-x $_) {
         my $n = $File::Find::name;
         $n =~ s~$pkgdestdir/~~;