Changeset 2485 in ProjectBuilder

Timestamp:

Mar 22, 2020, 6:52:44 PM (4 years ago)

Author:

Bruno Cornec

Message:

Adds internal YAML support and improve install2pkg with additional repos

File:

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

devel/pb/bin/pb

@@ -1618 +1618 @@
 
     # Get list of packages to test
-    # Get content saved in cms2build
-    my $ptr = pb_get_pkg();
-    @pkgs = @$ptr;
-
+    my $pkg = pb_cms_get_pkg($defpkgdir);
+    my @pkgs = @$pkg;
+    my @ipkgs;
+    foreach my $pbpkg (@pkgs) {
+        push(@ipkgs,pb_cms_get_real_pkg($pbpkg,$pbos->{'type'}));
+    }
     # Additional potential repo
     pb_distro_setuprepo($pbos,"install");
-    foreach my $pbpkg (@pkgs) {
-        # We need to install the package to test, and deps brought with it
-        pb_distro_installpkgs($pbos,$pbpkg,"local");
-    }
+    # We need to install the package to test, and deps brought with it
+    pb_distro_installpkgs($pbos,join(' ',@ipkgs));
 }
 
@@ -3867 +3867 @@
 # We should not need in this script more functions than what is provided 
 # by Base, Conf and Distribution to avoid problems at exec time.
+# # We also need some YAML interpreter
 # They are appended at the end.
 
@@ -4236 +4237 @@
 
     # Adds pb_distro_get_context and all functions needed from ProjectBuilder::Distribution, Conf and Base
-    foreach my $m ("ProjectBuilder/Base.pm","ProjectBuilder/Distribution.pm","ProjectBuilder/Conf.pm") {
+    # Also adds the minimal independant YAML code from Tiny::YAML in case no other is around
+    foreach my $m ("ProjectBuilder/Base.pm","ProjectBuilder/Distribution.pm","ProjectBuilder/Conf.pm","ProjectBuilder/YAML.pm") {
         foreach my $d (@INC) {
             my $f = "$d/$m";
@@ -4245 +4247 @@
                     next if (/^use Exporter/);
                     next if (/^use ProjectBuilder::/);
-                    next if (/^our /);
+                    # Remove lines with our except for the strerr var in YAML
+                    next if ((/^our /) && ($_ !~ /errstr/));
                     print SCRIPT $_;
                 }