Changeset 2502 in ProjectBuilder

Timestamp:

Apr 1, 2020, 2:28:06 AM (4 years ago)

Author:

Bruno Cornec

Message:

Fix pbinstalltype usage, based on project and addbuildrepo used in main conf files and check osperldep and improve setupv generation for pb_version_init and fix sbx2docker for pb/non-pb projects

File:

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

devel/pb/bin/pb

@@ -2090 +2090 @@
             $made .= " ".pb_get_content($f);
         }
+        pb_rm_rf($tmpd);
         confess "Aborting, one or more of the children failed." if ((not $all_ok) && ($Global::pb_stop_on_error));
-        pb_rm_rf($tmpd);
     }
 
@@ -4138 +4138 @@
 
 EOF
-    my $itype = pb_distro_get($pbos,"pbinstalltype");
+    my ($itype) = pb_conf_get("pbinstalltype");
     # Install from sandbox mean a file base install
     $itype = "file" if (defined $sbx);
     $itype = $installtype if (defined $installtype);
+    pb_log(2,"DEBUG: Found installtype: $itype\n");
     if ($itype =~ /^file/) {
-            #my ($addrepo) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","addbuildrepo");
-            #my $pbrepo = pb_distro_get_param($pbos,$addrepo);
-        my $pbrepo = pb_distro_get_in_conf_if($pbos,"$ENV{'PBDESTDIR'}/pbrc.yml","addbuildrepo");
+        my $pbrepo = pb_distro_get_if($pbos,"addbuildrepo");
+        #my $pbrepo = pb_distro_get_in_conf_if($pbos,"$ENV{'PBDESTDIR'}/pbrc.yml","addbuildrepo");
         print SCRIPT << 'EOF';
 
@@ -4190 +4190 @@
 my $verbopt = "mayfail";
 $verbopt = "mayfailverbose" if ($pbdebug ge 1);
-foreach my $m (split(/,/,$osperldep)) {
-    # Skip empty deps
-    next if ($m =~ /^\s*$/);
-    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*\" | bash -e $bashopt" ,"Installing perl module $m-$osperlver->{$m}",$verbopt);
+if (defined $osperldep) {
+    foreach my $m (split(/,/,$osperldep)) {
+        # Skip empty deps
+        next if ($m =~ /^\s*$/);
+        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*\" | bash -e $bashopt" ,"Installing perl module $m-$osperlver->{$m}",$verbopt);
+    }
 }
 EOF
@@ -4220 +4222 @@
 pb_system("pb --version",undef,"verbose");
 EOF
-    if ($vtype eq "ve"){
+    if ($vtype eq "ve") {
         if ($vetype ne "docker") {
             print SCRIPT << 'EOF';
@@ -4239 +4241 @@
 }
 chmod 0755,$nf;
+
 EOF
     }
+
+    # Use a fake pb_version_init version here
+    print SCRIPT << "EOF";
+sub pb_version_init {
+    return("$projectbuilderver","$projectbuilderrev","$projectbuilderconfver");
+}
+EOF
 
     # Adds pb_distro_get_context and all functions needed from ProjectBuilder::Distribution, Conf and Base
@@ -4253 +4263 @@
                     next if (/^use Exporter/);
                     next if (/^use ProjectBuilder::/);
+                    next if (/^1;$/);
                     # Remove lines with our except for the strerr var in YAML
                     next if ((/^our /) && ($_ !~ /errstr/));
@@ -4263 +4274 @@
         }
     }
-    # Use a fake pb_version_init version here
     print SCRIPT << "EOF";
-sub pb_version_init {
-
-return("$projectbuilderver","$projectbuilderrev","$projectbuilderconfver");
-}
 1;
 EOF
@@ -4453 +4459 @@
         # pb -p pb -m distro-ver-arch setupve
         pb_log(2,"Using savproj: $savproj\n");
-        if ($savproj eq "pb") {
+        if ($savproj ne "pb") {
             pb_cms2build("SandBox") if ($action =~ /sbx2/);
-            pb_setup2v("ve","SandBox");
-        } else {
             # Here we install in the CTN pb from upstream packages to have a stable version
             pb_setup2v("ve",undef,"pkg");
+        } else {
+            pb_setup2v("ve","SandBox");
         }
     }