Changeset 2279 in ProjectBuilder for devel

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

Files:

• pb-modules/Makefile.PL (modified) (1 diff)
• pb-modules/bin/pbdistrocheck (modified) (1 diff)
• pb-modules/bin/pbgetparam (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (3 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (4 diffs)
• pb-modules/lib/ProjectBuilder/Version.pm (modified) (1 diff)
• pb/bin/pb (modified) (2 diffs)
• pbmkbm/bin/pbmkbm (modified) (1 diff)
• pbtest/bin/pbsyncheck (added)
• rpmbootstrap/bin/rpmbootstrap (modified) (2 diffs)

devel/pb-modules/Makefile.PL

@@ -73 +73 @@
     $text .= "\t".'mkdir -p $(DESTDIR)'."$sharedir\n";
     $text .= "\t".'chmod 755 $(DESTDIR)'."$sharedir\n";
-    $text .= "\t".'cp etc/pb.conf $(DESTDIR)'."$sharedir\n";
+    $text .= "\t".'cp etc/pb.yml $(DESTDIR)'."$sharedir\n";
 
     # Also create a fake version in /etc/pb for sysadmin to modify
     $text .= "\t".'mkdir -p $(DESTDIR)'."$sysconfdir\n";
     $text .= "\t".'chmod 755 $(DESTDIR)'."$sysconfdir\n";
-    $text .= "\t".'perl -p -e \'s|^|#|\' etc/pb.conf > $(DESTDIR)/'."$sysconfdir/pb.conf\n";
+    $text .= "\t".'perl -p -e \'s|^|#|\' etc/pb.yml > $(DESTDIR)/'."$sysconfdir/pb.yml\n";
     # Doesn't seem to work in the makefile generated for now :-(
-    #$text .= "\t".'perl -p -e \'s|^([^#])|#$1|\' etc/pb.conf > $(DESTDIR)/'."$sysconfdir/pb.conf\n";
+    #$text .= "\t".'perl -p -e \'s|^([^#])|#$1|\' etc/pb.yml > $(DESTDIR)/'."$sysconfdir/pb.yml\n";
 
-    # Produce the man page for pb.conf
+    # Produce the man page for pb.yml
     $text .= "\t".'mkdir -p $(DESTDIR)'."$mandir/man5\n";
     $text .= "\t".'pod2man --section=5 etc/pb.conf.pod > $(DESTDIR)'."$mandir/man5/pb.conf.5\n";

devel/pb-modules/bin/pbdistrocheck

@@ -94 +94 @@
 =head1 CONFIGURATION FILES
 
-Uses the main /etc/pb/pb.conf (or /usr/local/etc/pb/pb.conf if installed from files) configuration file to give its answers.
+Uses the main /etc/pb/pb.yml (or /usr/local/etc/pb/pb.yml if installed from files) configuration file to give its answers.
 
 =head1 AUTHORS

devel/pb-modules/bin/pbgetparam

@@ -75 +75 @@
 =head1 CONFIGURATION FILES
 
-Uses the main /etc/pb/pb.conf (or /usr/local/etc/pb/pb.conf if installed from files) configuration file to give its answers.
+Uses the main /etc/pb/pb.yml (or /usr/local/etc/pb/pb.yml if installed from files) configuration file to give its answers.
 
 =head1 AUTHORS

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;

devel/pb/bin/pb

@@ -863 +863 @@
     if ($@) {
         # Sys::CPU not found, defaulting to 1
-        pb_log(1,"ADVISE: Install Sys::CPU to benefit from automatic parallelism optimization.\nOr use pbparallel in your pb.conf file\nOnly 1 process at a time for the moment\n");
+        pb_log(1,"ADVISE: Install Sys::CPU to benefit from automatic parallelism optimization.\nOr use pbparallel in your pb.yml file\nOnly 1 process at a time for the moment\n");
         $pbparallel = 1;
     } else {
@@ -4974 +4974 @@
     if ($@) {
         # Linux::SysInfo not found
-        pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb.conf file\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system\n");
+        pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb.yml file\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system\n");
     } else {
         # Using the memory size
         my $si = Linux::SysInfo::sysinfo();
         if (not defined $si) {
-            pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb.conf file\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system\n");
+            pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb.yml file\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system\n");
         } else {
             # Keep the number of VM whose memory can be allocated

devel/pbmkbm/bin/pbmkbm

@@ -183 +183 @@
 =head1 CONFIGURATION FILE
 
-Uses Project-Builder.org configuration file (/etc/pb/pb.conf or /usr/local/etc/pb/pb.conf)
+Uses Project-Builder.org configuration file (/etc/pb/pb.yml or /usr/local/etc/pb/pb.yml)
 
 =head1 AUTHORS

devel/rpmbootstrap/bin/rpmbootstrap

@@ -50 +50 @@
 rpmbootstrap works in 2 phases. The first one is used to download all
 the required packages to have a working package management system in the
-chroot working. This list of packages is stored in /etc/pb/pb.conf under
+chroot working. This list of packages is stored in /etc/pb/pb.yml under
 the rbsmindep parameter (aka rpmbootstrap minimal dependencies). Once the
 packages have been downloaded from the mirror, they are extracted with
@@ -160 +160 @@
 =head1 CONFIGURATION FILE
 
-Uses Project-Builder.org configuration file (/etc/pb/pb.conf or /usr/local/etc/pb/pb.conf)
+Uses Project-Builder.org configuration file (/etc/pb/pb.yml or /usr/local/etc/pb/pb.yml)
 
 =head1 AUTHORS