Changeset 2604 in ProjectBuilder

Timestamp:

Apr 5, 2020, 4:13:31 PM (4 years ago)

Author:

Bruno Cornec

Message:

Avoid usage of Module::Build::YAML as creating issues on old distros and prefer Tiny:YAML embedded

Files:

• 0.15.3/pb-modules/lib/ProjectBuilder/Conf.pm (modified) (1 diff)
• devel/pb-modules/lib/ProjectBuilder/Conf.pm (modified) (1 diff)

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

@@ -184 +184 @@
             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::Tiny;
+                YAML::Tiny->import();
             };
             if ($@) {
-                eval {
-                    # No YAML found using a more std but less complete one. Old perl only
-                    require YAML::Tiny;
-                    YAML::Tiny->import();
+                # 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();
                 };
-                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;
-                } else {
-                    $dpfunc = \&YAML::Tiny::Dump;
-                    $ldfunc = \&YAML::Tiny::LoadFile;
-                }
+                $dpfunc = \&pb_Dump;
+                $ldfunc = \&pb_LoadFile;
             } else {
-                $dpfunc = \&Module::Build::YAML::Dump;
-                $ldfunc = \&Module::Build::YAML::LoadFile;
+                $dpfunc = \&YAML::Tiny::Dump;
+                $ldfunc = \&YAML::Tiny::LoadFile;
             }
         } else {

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

@@ -184 +184 @@
             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::Tiny;
+                YAML::Tiny->import();
             };
             if ($@) {
-                eval {
-                    # No YAML found using a more std but less complete one. Old perl only
-                    require YAML::Tiny;
-                    YAML::Tiny->import();
+                # 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();
                 };
-                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;
-                } else {
-                    $dpfunc = \&YAML::Tiny::Dump;
-                    $ldfunc = \&YAML::Tiny::LoadFile;
-                }
+                $dpfunc = \&pb_Dump;
+                $ldfunc = \&pb_LoadFile;
             } else {
-                $dpfunc = \&Module::Build::YAML::Dump;
-                $ldfunc = \&Module::Build::YAML::LoadFile;
+                $dpfunc = \&YAML::Tiny::Dump;
+                $ldfunc = \&YAML::Tiny::LoadFile;
             }
         } else {