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

Timestamp:

Aug 30, 2017, 5:08:03 PM (7 years ago)

Author:

Bruno Cornec

Message:

YAML support working for most distros

• Fix rebase issues
• Adds a pbsyncheck script for pre-commit check
• Fix test deps for centos & fedora
• update pbcl versions for deb build

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Conf.pm (modified) (3 diffs)
• Distribution.pm (modified) (4 diffs)
• Version.pm (modified) (1 diff)

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

@@ -22 +22 @@
 # Inherit from the "Exporter" module which handles exporting functions.
  
-use vars qw($VERSION $REVISION @ISA @EXPORT);
+use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
 use Exporter;
  
@@ -184 +184 @@
 
 # Read the content of the config file and cache it in the %h hash then available for queries
-if ($confver < 0.15) {
+if ($PBCONFVER < 1) {
     open(CONF,$cf) || confess "Unable to open $cf";
     # This is the original conf file format for versions up to 0.14
@@ -333 +333 @@
 open(CONF,"> $conffile") || confess "Unable to write into $conffile";
 
-if ($confver < 0.15) {
+if ($PBCONFVER < 1) {
     # This is the original conf file format for versions up to 0.14
     foreach my $p (sort keys %$h) {

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

@@ -26 +26 @@
 # Inherit from the "Exporter" module which handles exporting functions.
  
-use vars qw($VERSION $REVISION @ISA @EXPORT);
+use vars qw($VERSION $REVISION $PBCONFVER @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) = pb_version_init();
+($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
 
 =pod
@@ -77 +77 @@
 sub pb_distro_conffile {
 
-return("CCCC/pb.conf");
+if ($PBCONFVER < 1) {
+    return("CCCC/pb.conf");
+} else {
+    return("CCCC/pb.yml");
+}
 }
 
@@ -88 +92 @@
 sub pb_distro_sysconffile {
 
-return("SSSS/pb.conf");
+if ($PBCONFVER < 1) {
+    return("SSSS/pb.conf");
+} else {
+    return("SSSS/pb.yml");
+}
 }
 

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

@@ -33 +33 @@
 my $projectbuilderconfver = $PBCONFVER;
 
-return($projectbuilderver,$projectbuilderrev);
+return($projectbuilderver,$projectbuilderrev,$projectbuilderconfver);
 }
 1;