Changeset 908 in ProjectBuilder

Timestamp:

Nov 24, 2009, 2:10:27 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Force bash usage in pb to be OS compatible
• Solaris setupvm improvements
• Module-Build is now version 0.35 by default

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb/bin/pb (modified) (4 diffs)

devel/pb-modules/etc/pb.conf

@@ -258 +258 @@
 osperldep pkg = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
 # Should be installaed manually first for the moment
-ospkgdep pkg = wget,make
+#ospkgdep pkg = wget,make
+# And also need ftp://ftp.sunfreeware.com/pub/freeware/sparc/10/sudo-1.7.2p1-sol10-sparc-local.gz ftp://ftp.sunfreeware.com/pub/freeware/sparc/10/make-3.81-sol10-sparc-local.gz ftp://ftp.sunfreeware.com/pub/freeware/intel/10/libintl-3.4.0-sol10-x86-local.gz ftp://ftp.sunfreeware.com/pub/freeware/intel/10/libiconv-1.9.2-sol10-x86-local.gz ftp://ftp.sunfreeware.com/pub/freeware/intel/10/libgcc-3.4.6-sol10-x86-local.gz
 
 # Version of the perl module as found on CPAN
 # http://search.cpan.org/CPAN/modules/by-module
 osperlver Date-Manip = 5.54
-osperlver Module-Build = 0.2808
+osperlver Module-Build = 0.35
 osperlver File-MimeInfo = 0.15
 osperlver File-BaseDir = 0.03

devel/pb/bin/pb

@@ -1447 +1447 @@
     # Do not touch when just announcing
     if ($cmt ne "Announce") {
-        pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | sh\"","Preparing $tdir on $cptarget");
+        pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $cptarget");
     } else {
         $logres = "> ";
@@ -1458 +1458 @@
     }
 
-    pb_system("$shcmd \"echo \'cd $tdir ; if [ -x pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | sh\"","Executing pbscript on $cptarget if needed","verbose");
+    pb_system("$shcmd \"echo \'cd $tdir ; if [ -x pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | bash\"","Executing pbscript on $cptarget if needed","verbose");
     if ($cmt =~ /^V[EM]build/) {
         # Get back info on pkg produced, compute their name and get them from the VM
@@ -1523 +1523 @@
             }
         }
-        pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | sh ; sleep 10","VM $v halt (pid $vmpid)");
+        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)");
     }
     if (($cmt =~ /^VE/) && ($snapme != 0)) {
@@ -2390 +2390 @@
         my $dir = $m;
         $dir =~ s/-.*//;
-        pb_system("echo \"rm -rf $m* ; wget http://search.cpan.org/CPAN/modules/by-module/$dir/$m-$osperlver->{$m}.tar.gz ; gzip -cd $m-$osperlver->{$m}.tar.gz | tar xf - ; cd $m* ; if [ -f Build.PL ]; then perl Build.PL; ./Build ; ./Build install ; else perl Makefile.PL; make ; make install ; fi; cd .. ; rm -rf $m*\" | sh" ,"Installing perl module $m-$osperlver->{$m}");
+        pb_system("echo \"rm -rf $m* ; wget http://search.cpan.org/CPAN/modules/by-module/$dir/$m-$osperlver->{$m}.tar.gz ; gzip -cd $m-$osperlver->{$m}.tar.gz | tar xf - ; cd $m* ; if [ -f Build.PL ]; then perl Build.PL; ./Build ; ./Build install ; else perl Makefile.PL; make ; make install ; fi; cd .. ; rm -rf $m*\" | bash" ,"Installing perl module $m-$osperlver->{$m}");
     }