Changeset 875

Timestamp:

10/21/09 20:32:21 (4 years ago)

Author:

bruno

Message:

Trying to improve automatic prototype creation

File:

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

devel/pb/bin/pb

@@ -1055 +1055 @@
                     print PROTO "i pkginfo\n";
                     print PROTO "i depend\n" if (-f "install/depend");
-                    find(\&create_solaris_prototype, $pkgdestdir);
+                    find(\&create_solaris_prototype, $pkgdestdir."/.");
                 }
                 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("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");
@@ -1101 +1101 @@
     my $uidgid = "bin bin";
 
-    print PROTO "d none $File::Find::name 0755 $uidgid\n" if (-d $_);
+    return if ($_ =~ /^Prototype/);
+    if (-d $_) {
+        my $n = $File::Find::name;
+        $n =~ s~$pkgdestdir/~~;
+        print PROTO "d none $n 0755 $uidgid\n";
     if (-x $_) {
-        print PROTO "f none $File::Find::name 0755 $uidgid\n";
+        my $n = $File::Find::name;
+        $n =~ s~$pkgdestdir/~~;
+        print PROTO "f none $n 0755 $uidgid\n";
     } elsif (-f $_) {
-        print PROTO "f none $File::Find::name 0644 $uidgid\n" if (-f $_);
+        my $n = $File::Find::name;
+        $n =~ s~$pkgdestdir/~~;
+        print PROTO "f none $n 0644 $uidgid\n";
     }
 }