Changeset 1140

Timestamp:

01/08/11 02:13:21 (2 years ago)

Author:

bruno

Message:

• Adds 2 new functions sbx2setupve|vm to update an in VE|VM incompatible version of pb to latest needed to dialog correctly.
• Fix a now incorrect call to pbscript in pb_setup2v

File:

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

devel/pb/bin/pb

@@ -259 +259 @@
 
 Setup a virtual environment for pb usage
+
+=item B<sbx2setupvm>
+
+Setup a virtual machine for pb usage using the sandbox version of pb instead of the latest stable
+Reserved to dev team.
+
+=item B<sbx2setupve>
+
+Setup a virtual environment for pb usage using the sandbox version of pb instead of the latest stable
+Reserved to dev team.
 
 =item B<snapvm>
@@ -595 +605 @@
 } elsif ($action =~ /^setupvm$/) {
     pb_setup2v("vm");
+} elsif ($action =~ /^sbx2setupve$/) {
+    die "This feature is limited to the pb project" if ($ENV{'PBPROJ'} ne $appname);
+    pb_cms2build("SandBox");
+    pb_setup2v("ve","SandBox");
+} elsif ($action =~ /^sbx2setupvm$/) {
+    die "This feature is limited to the pb project" if ($ENV{'PBPROJ'} ne $appname);
+    pb_cms2build("SandBox");
+    pb_setup2v("vm","SandBox");
 } elsif ($action =~ /^updateve$/) {
     pb_update2v("ve");
@@ -1718 +1736 @@
     }
 
-    pb_system("$shcmd \"echo \'cd $tdir ; if [ -x pbscript ]; then ./pbscript; fi ; rm -f ./pbscript\' | bash\"","Executing pbscript on $cptarget if needed","verbose");
+    # Use the right script name depending on context
+    my $pbscript;
+    if ($cmt =~ /^V[EM]/) {
+        $pbscript = "pbscript.$$";
+    } else {
+        $pbscript = "pbscript";
+    }
+
+    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
@@ -2059 +2085 @@
                         my ($rbsconf) = pb_conf_get("rbsconf");
 
-                        pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$rbsconf->{$ENV{'PBPROJ'}}\" $b4post $postinstall $rbsopt $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
+                        my $command = pb_check_req("rinse",0);
+                        pb_system("sudo $command --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$rbsconf->{$ENV{'PBPROJ'}}\" $b4post $postinstall $rbsopt $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
                     } elsif ($verpmstyle eq "rpmbootstrap") {
                         my $rbsverb = "";
@@ -2466 +2493 @@
 
 my $vtype = shift;
+my $sbx = shift || undef;
 
 my ($vm,$all) = pb_get2v($vtype);
@@ -2498 +2526 @@
 
 # We should not need in this script more functions than what is provided 
-# by Base and Distribution to avoid problems at exec time.
+# by Base, Conf and Distribution to avoid problems at exec time.
 # They are appended at the end.
 
@@ -2744 +2772 @@
     my ($instype) = pb_conf_get("pbinstalltype");
     my $itype = pb_distro_get_param($ddir,$dver,$darch,$instype,$dfam,$dtype,$dos);
+    if (defined $sbx) {
+        # Install from sandbox mean a file base install
+        $itype = "file";
+    }
     if ($itype =~ /^file/) {
+        my $cmdget;
+        if (defined $sbx) {
+            # Install from sandbox mean using the result of the just passed sbx2build command
+            # Get content saved in cms2build
+            my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
+            die "Unable to get package list" if (not defined $pkg);
+            my ($vepath) = pb_conf_get("vepath");
+
+            # We consider 2 specific packages
+            my $vertag1 = $pkg->{"ProjectBuilder"};
+            my $vertag2 = $pkg->{"project-builder"};
+            # get the version of the current package - maybe different
+            my ($pbver1,$tmp1) = split(/-/,$vertag1);
+            my ($pbver2,$tmp2) = split(/-/,$vertag2);
+            # Copy inside the VM
+            copy("$ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/tmp");
+            copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/tmp");
+            $cmdget = "mv /tmp/ProjectBuilder-$pbver1.tar.gz ProjectBuilder-latest.tar.gz ; mv /tmp/project-builder-$pbver2.tar.gz project-builder-latest.tar.gz";
+        } else {
+            $cmdget = "wget --passive-ftp ftp://ftp.project-builder.org/src/ProjectBuilder-latest.tar.gz; wget --passive-ftp ftp://ftp.project-builder.org/src/project-builder-latest.tar.gz";
+        }
         print SCRIPT << 'EOF';
 # Then install manually the missing perl modules
@@ -2757 +2810 @@
     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}");
 }
-
-pb_system("rm -rf ProjectBuilder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/ProjectBuilder-latest.tar.gz ; gzip -cd ProjectBuilder-latest.tar.gz | tar xf - ; cd ProjectBuilder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf ProjectBuilder-* ; rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; gzip -cd project-builder-latest.tar.gz | tar xf - ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
+EOF
+
+        print SCRIPT << "EOF";
+pb_system("rm -rf ProjectBuilder-* ; rm -rf project-builder-* ; $cmdget ; gzip -cd ProjectBuilder-latest.tar.gz | tar xf - ; cd ProjectBuilder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf ProjectBuilder-* ; gzip -cd project-builder-latest.tar.gz | tar xf - ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
 EOF
     } elsif ($itype =~ /^pkg/) {