Changeset 2500 in ProjectBuilder

Timestamp:

Apr 1, 2020, 2:25:15 AM (4 years ago)

Author:

Bruno Cornec

Message:

fix pb_version_init call and dpfunc/ldfunc declaration in init

File:

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

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

@@ -22 +22 @@
 # Inherit from the "Exporter" module which handles exporting functions.
  
-use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
+use vars qw(@ISA @EXPORT);
 use Exporter;
  
@@ -30 +30 @@
 our @ISA = qw(Exporter);
 our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_write pb_conf_get pb_conf_get_if pb_conf_get_all pb_conf_get_hash pb_conf_cache pb_conf_update_v0 pb_conf_get_in_hash_if);
-($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
 
 # Global hash of conf files
@@ -43 +42 @@
 # We consider that values can not change during the life of pb
 my $h = ();
+
+my $dpfunc;
+my $ldfunc;
+our ($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
 
 =pod
@@ -146 +149 @@
 my $proj=shift;
 
-pb_log(1,"Entering pb_conf_init\n");
+pb_log(2,"Entering pb_conf_init\n");
 #
 # Check project name
@@ -165 +168 @@
 }
 pb_log(1,"PBPROJ = $ENV{'PBPROJ'}\n");
+
+# Manage YAML modules to use
+
+if ($PBCONFVER >= 1) {
+    eval {
+        require YAML::XS;
+        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;
+                    $ldfunc = \&pb_LoadFile;
+                    #die "Unable to handle YAML configuration files without a YAML.pm module\n";
+                } else {
+                    $dpfunc = \&YAML::Tiny::Dump;
+                    $ldfunc = \&YAML::Tiny::LoadFile;
+                }
+            } else {
+                $dpfunc = \&Module::Build::YAML::Dump;
+                $ldfunc = \&Module::Build::YAML::LoadFile;
+            }
+        } else {
+            $dpfunc = \&YAML::Dump;
+            $ldfunc = \&YAML::LoadFile;
+        }
+    } else {
+        $dpfunc = \&YAML::XS::Dump;
+        $ldfunc = \&YAML::XS::LoadFile;
+    }
+}
 }
 
@@ -180 +230 @@
 my $cf = shift;
 my $lh = shift;
-
-my $ldfunc;
 
 # Read the content of the config file and cache it in the %h hash then available for queries
@@ -208 +256 @@
     }
     close(CONF);
+
 } else {
-    eval {
-        require YAML::XS;
-        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 ($@) {
-                    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
-                        $ldfunc = \&LoadFile;
-                        #die "Unable to handle YAML configuration files without a YAML.pm module\n";
-                    } else {
-                        $ldfunc = \&ProjectBuilder::YAML::LoadFile;
-                    }
-                } else {
-                    $ldfunc = \&YAML::Tiny::LoadFile;
-                }
-            } else {
-                $ldfunc = \&Module::Build::YAML::LoadFile;
-            }
-        } else {
-            $ldfunc = \&YAML::LoadFile;
-        }
-    } else {
-        $ldfunc = \&YAML::XS::LoadFile;
-    }
-
     # Have we already handled that conf file ?
     next if ((defined $lh) && (defined $lh->{'__cf'}) && (defined $lh->{'__cf'}->{$cf}) && ($lh->{'__cf'}->{$cf} eq 1));
@@ -366 +368 @@
 my $conffile = shift;
 my $h = shift;
-my $dpfunc;
 
 confess "No configuration file defined to write into !" if (not defined $conffile);
@@ -381 +382 @@
     }
 } else {
-    # This is the new YAML format
-    eval {
-        require YAML::XS;
-        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 ($@) {
-                    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 = \&YAML::Dump;
-        }
-    } else {
-        $dpfunc = \&YAML::XS::Dump;
-    }
-
     pb_log(1,"Writing YAML conf file $conffile\n");
     delete $h->{'__cf'};