Changeset 914 in ProjectBuilder

Timestamp:

Nov 27, 2009, 11:16:02 AM (14 years ago)

Author:

Bruno Cornec

Message:

• This revision allows the first Solaris build in a VM. Will lead to 0.9.8

File:

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

devel/pb/bin/pb

@@ -1042 +1042 @@
             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";
-            if (-f "install/pbbuild") {
-                chmod 0755,"install/pbbuild";
+            if (-f "pbconf/$ddir-$dver-$arch/pbbuild") {
+                chmod 0755,"pbconf/$ddir-$dver-$arch/pbbuild";
                 # pkginfo file is mandatory
-                die "Unable to find pkginfo file in pbconf/$ddir-$dver-$arch" if (! -f "install/pkginfo");
+                die "Unable to find pkginfo file in pbconf/$ddir-$dver-$arch" if (! -f "pbconf/$ddir-$dver-$arch/pkginfo");
                 # Build
-                pb_system("install/pbbuild $pkgdestdir/delivery","Building software and installing under $pkgdestdir/delivery");
+                pb_system("pbconf/$ddir-$dver-$arch/pbbuild $pkgdestdir/delivery","Building software and installing under $pkgdestdir/delivery");
                 # Copy complementary files
-                if (-f "install/prototype") {
-                    copy("install/prototype", $pkgdestdir) 
+                if (-f "pbconf/$ddir-$dver-$arch/prototype") {
+                    copy("pbconf/$ddir-$dver-$arch/prototype", $pkgdestdir) 
                 } else {
                     # No prototype provided, calculating it
                     open(PROTO,"> $pkgdestdir/prototype") || die "Unable to create prototype file";
                     print PROTO "i pkginfo\n";
-                    print PROTO "i depend\n" if (-f "install/depend");
+                    print PROTO "i depend\n" if (-f "pbconf/$ddir-$dver-$arch/depend");
                     $ENV{'PBSOLDESTDIR'} = "$pkgdestdir/delivery";
                     find(\&create_solaris_prototype, "$pkgdestdir/delivery");
                 }
-                copy("install/depend", $pkgdestdir) if (-f "install/depend");
-                copy("install/pkginfo", $pkgdestdir);
+                copy("pbconf/$ddir-$dver-$arch/depend", $pkgdestdir) if (-f "pbconf/$ddir-$dver-$arch/depend");
+                copy("pbconf/$ddir-$dver-$arch/pkginfo", $pkgdestdir);
                 pb_system("cd $pkgdestdir/delivery ; pkgmk -o -f ../prototype -r $pkgdestdir/delivery -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
                 pb_system("cd $ENV{'PBBUILDDIR'}/$dtype ;  echo \"\" | pkgtrans -o -n -s $ENV{'PBBUILDDIR'}/$dtype $ENV{'PBBUILDDIR'}/$pbpkg-$pbver.pkg all","Transforming $pbpkg","verbose");
                 pb_system("cd $ENV{'PBBUILDDIR'} ;  gzip -9f $pbpkg-$pbver.pkg","Compressing $pbpkg-$pbver.pkg","verbose");
             } else {
-                pb_log(0,"No pbbuild file found for $pbpkg-$pbver\n");
+                pb_log(0,"No pbconf/$ddir-$dver-$arch/pbbuild file found for $pbpkg-$pbver in \n");
             }
             chdir ".." || die "Unable to chdir to parent dir";
@@ -1525 +1524 @@
             }
         }
-        pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
+        my $hoption = "-p";
+        # Solaris doesn't support -h
+        $hoption = "" if ($dtype eq "pkg");
+        pb_system("$shcmd \"sudo /sbin/halt $hoption \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
     }
     if (($cmt =~ /^VE/) && ($snapme != 0)) {