Changeset 2494 in ProjectBuilder

Timestamp:

Mar 31, 2020, 12:56:14 PM (4 years ago)

Author:

Bruno Cornec

Message:

pb_conf_write also needs multiple YAML implementation support

File:

• devel/pb-modules/lib/ProjectBuilder/Conf.pm (modified) (3 diffs)

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

@@ -251 +251 @@
         } else {
             $ldfunc = \&YAML::LoadFile;
+        }
     } else {
         $ldfunc = \&YAML::XS::LoadFile;
@@ -256 +257 @@
 
     # Have we already handled that conf file ?
-    next if ($lh->{'__cf'}->{$cf} eq 1);
+    next if ((defined $lh) && (defined $lh->{'__cf'}) && (defined $lh->{'__cf'}->{$cf}) && ($lh->{'__cf'}->{$cf} eq 1));
 
     pb_log(1,"Loading YAML conf file $cf\n");
@@ -382 +383 @@
     # This is the new YAML format
     eval {
-        require YAML;
-        YAML->import();
+        require YAML::XS;
+        YAML::XS->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();
+            require YAML;
+            YAML->import();
         };
         if ($@) {
-            die "Unable to handle YAML configuration files without a YAML.pm module\n";
+            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 ($@) {
+                    eval {
+                        # No YAML found using an embedded pne
+                        require ProjectBuilder::YAML;
+                        ProjectBuilder::YAML->import();
+                    };
+                    if ($@) {
+                        # Here we should be in the setup phase, with an embedded YAML code
+                        $dpfunc = \&LoadFile;
+                        #die "Unable to handle YAML configuration files without a YAML.pm module\n";
+                    } else {
+                        $dpfunc = \&ProjectBuilder::YAML::Dump;
+                    }
+                } else {
+                    $dpfunc = \&YAML::Tiny::Dump;
+                }
+            } else {
+                $dpfunc = \&Module::Build::YAML::Dump;
+            }
         } else {
-            $dpfunc = \&Module::Build::YAML::Dump;
+            $dpfunc = \&YAML::Dump;
         }
     } else {
-        $dpfunc = \&YAML::Dump;
+        $dpfunc = \&YAML::XS::Dump;
     }
 
     pb_log(1,"Writing YAML conf file $conffile\n");
+    delete $h->{'__cf'};
     print CONF $dpfunc->($h);
 }