Changeset 2241 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

Timestamp:

Aug 2, 2017, 6:16:44 PM (7 years ago)

Author:

Bruno Cornec

Message:

revert last commit as this is not ready yet for integration in that tree !

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Conf.pm (modified) (8 diffs)
• Distribution.pm (modified) (6 diffs)
• Version.pm (modified) (1 diff)

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

@@ -19 +19 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Version;
+#use YAML;
 
 # Inherit from the "Exporter" module which handles exporting functions.
  
-use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
+use vars qw($VERSION $REVISION @ISA @EXPORT);
 use Exporter;
  
@@ -30 +31 @@
 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);
-($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
+($VERSION,$REVISION) = pb_version_init();
 
 # Global hash of conf files
@@ -69 +70 @@
 to allow for overwrite to work:
 
-1. /usr/share/pb/pb.yml    - the read-only system conf file provided by install
-2. /etc/pb/pb.yml          - the same global conf file given to the sysadmin in order to make system wide modifications
+1. /usr/share/pb/pb.conf    - the read-only system conf file provided by install
+2. /etc/pb/pb.conf          - the same global conf file given to the sysadmin in order to make system wide modifications
 3. /path/to/project.pb      - Configuration file for the project we're building for
 4. /(vm|ve|rm)path/to/.pbrc - configuration file for VM, VE or RM specific parameters. Cumulative should be orthogonal
@@ -123 +124 @@
 my $cf = shift;
 my $lh = shift;
-
-my $ldfunc;
-
-eval {
-    require YAML;
-    YAML->import();
-    $ldfunc = \&YAML::LoadFile;
-};
-if ($@) {
-    # No YAML found using a more std but less complete one. Old perl only
-    use Module::Build::YAML;
-    $ldfunc = \&Module::Build::YAML::LoadFile;
-}
+my $confver = "0.14";
 
 # Read the content of the config file and cache it in the %h hash then available for queries
-if ($PBCONFVER < 1) {
+if ($confver < 0.15) {
     open(CONF,$cf) || confess "Unable to open $cf";
     # This is the original conf file format for versions up to 0.14
@@ -150 +139 @@
     close(CONF);
 } else {
-    $lh = $ldfunc->($cf);
+    $lh = LoadFile($cf);
 }
 return($lh);
@@ -262 +251 @@
 my $conffile = shift;
 my $h = shift;
-my $dpfunc;
-
-eval {
-    require YAML;
-    YAML->import();
-    $dpfunc = \&YAML::Dump;
-};
-if ($@) {
-    # No YAML found using a more std but less complete one. Old perl only
-    use Module::Build::YAML;
-    $dpfunc = \&Module::Build::YAML::Dump;
-}
+my $confver = "0.14";
 
 confess "No configuration file defined to write into !" if (not defined $conffile);
@@ -279 +257 @@
 open(CONF,"> $conffile") || confess "Unable to write into $conffile";
 
-if ($PBCONFVER < 1) {
+if ($confver < 0.15) {
     # This is the original conf file format for versions up to 0.14
     foreach my $p (sort keys %$h) {
@@ -289 +267 @@
 } else {
     # This is the new YAML format
-    print CONF $dpfunc->($h);
+    print CONF Dump($h);
 }
 close(CONF);

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

@@ -26 +26 @@
 # Inherit from the "Exporter" module which handles exporting functions.
  
-use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
+use vars qw($VERSION $REVISION @ISA @EXPORT);
 use Exporter;
  
@@ -34 +34 @@
 our @ISA = qw(Exporter);
 our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_sysconffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_setuprepo_gen pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);
-($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
+($VERSION,$REVISION) = pb_version_init();
 
 =pod
@@ -77 +77 @@
 sub pb_distro_conffile {
 
-if ($PBCONFVER < 1) {
-    return("CCCC/pb.conf");
-} else {
-    return("CCCC/pb.yml");
-}
+return("CCCC/pb.conf");
 }
 
@@ -92 +88 @@
 sub pb_distro_sysconffile {
 
-if ($PBCONFVER < 1) {
-    return("SSSS/pb.conf");
-} else {
-    return("SSSS/pb.yml");
-}
+return("SSSS/pb.conf");
 }
 
@@ -107 +99 @@
 Mandriva, Open SuSE and Fedora have all the same "rpm" type of build system. Ubuntu and Debian have the same "deb" type of build system. 
 And "fc" is the extension generated for all Fedora packages (Version will be added by pb).
-All this information is stored in an external configuration file typically at /etc/pb/pb.yml
+All this information is stored in an external configuration file typically at /etc/pb/pb.conf
 
 When passing the distribution name and version as parameters, the B<pb_distro_init> function returns the parameter of that distribution instead of the underlying one.
@@ -643 +635 @@
             my $dirdest = "";
             my $reponame = "";
-            # TODO: could go in pb.yml in fact
+            # TODO: could go in pb.conf in fact
             if ($pbos->{install} =~ /\byum\b/) {
                 $reponame="yum";

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

@@ -29 +29 @@
 my $projectbuilderver = $VERSION;
 my $projectbuilderrev = $REVISION;
-# We fix the format of the conf file for this version of pb
-my $projectbuilderconfver = 1;
 
-return($projectbuilderver,$projectbuilderrev,$projectbuilderconfver);
+return($projectbuilderver,$projectbuilderrev);
 }
 1;