Changeset 2598 in ProjectBuilder for devel

Timestamp:

Apr 3, 2020, 8:48:30 PM (5 years ago)

Author:

Bruno Cornec

Message:

Only use ProjectBuilder::YAML when not in setupv

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/YAML.pm (modified) (1 diff)
• pb/bin/pb (modified) (2 diffs)

devel/pb-modules/lib/ProjectBuilder/Conf.pm

@@ -176 +176 @@
         YAML::XS->import();
     };
-    if ($@) {
-        eval {
-            require YAML;
-            YAML->import();
-        };
-        if ($@) {
-            eval {
-                # No YAML found using a more std but less complete one. Old perl only
-                require Module::Build::YAML;
-                Module::Build::YAML->import();
-            };
-            if ($@) {
-                eval {
-                    # No YAML found using a more std but less complete one. Old perl only
-                    require YAML::Tiny;
-                    YAML::Tiny->import();
-                };
-                if ($@) {
-                    # Here we should be in the setup phase, with an embedded YAML code
-                    $dpfunc = \&pb_Dump;
+    if ($@) {
+        eval {
+            require YAML;
+            YAML->import();
+        };
+        if ($@) {
+            eval {
+                # No YAML found using a more std but less complete one. Old perl only
+                require Module::Build::YAML;
+                Module::Build::YAML->import();
+            };
+            if ($@) {
+                eval {
+                    # No YAML found using a more std but less complete one. Old perl only
+                    require YAML::Tiny;
+                    YAML::Tiny->import();
+                };
+                if ($@) {
+                    # Here we use an embedded YAML code for distro lacking any YAML module
+                    if (not defined ($ENV{'PBSETUPV'})) {
+                        # Don't do that for setupv only for other scripts
+                        # as the module is already embedded and would conflict
+                        require ProjectBuilder::YAML;
+                        ProjectBuilder::YAML->import();
+                    };
+                    $dpfunc = \&pb_Dump;
                     $ldfunc = \&pb_LoadFile;
-                    #die "Unable to handle YAML configuration files without a YAML.pm module\n";
-                } else {
-                    $dpfunc = \&YAML::Tiny::Dump;
+                } else {
+                    $dpfunc = \&YAML::Tiny::Dump;
                     $ldfunc = \&YAML::Tiny::LoadFile;
-                }
-            } else {
-                $dpfunc = \&Module::Build::YAML::Dump;
+                }
+            } else {
+                $dpfunc = \&Module::Build::YAML::Dump;
                 $ldfunc = \&Module::Build::YAML::LoadFile;
-            }
-        } else {
-            $dpfunc = \&YAML::Dump;
+            }
+        } else {
+            $dpfunc = \&YAML::Dump;
             $ldfunc = \&YAML::LoadFile;
-        }
-    } else {
-        $dpfunc = \&YAML::XS::Dump;
+        }
+    } else {
+        $dpfunc = \&YAML::XS::Dump;
         $ldfunc = \&YAML::XS::LoadFile;
-    }
+    }
 }
 }

devel/pb-modules/lib/ProjectBuilder/YAML.pm

@@ -160 +160 @@
     my $self   = [];
     my $string = $_[0];
-    print("string var: $string\n");
+    #print("string var: $string\n");
     eval {
         unless ( defined $string ) {

devel/pb/bin/pb

@@ -3887 +3887 @@
 $ppref \$pblocale = "";
 $ppref \$PBCONFVER = $projectbuilderconfver;
+$ppref \$ENV{'PBSETUPV'} = 1;
 EOF
     print SCRIPT << 'EOF';
@@ -4264 +4265 @@
                     next if (/^use ProjectBuilder::/);
                     next if (/^1;$/);
-                    # Remove lines with our except for the strerr var in YAML
+                    # Remove lines with our except for the errstr var in YAML
                     next if ((/^our /) && ($_ !~ /errstr/));
                     print SCRIPT $_;