Changeset 1694 in ProjectBuilder

Timestamp:

Feb 26, 2013, 6:37:21 AM (11 years ago)

Author:

Bruno Cornec

Message:

• pbdistrogetparam now works, is built & delivered, and has a new -a (all) option
• New function pb_conf_get_all to return the list of all parameters, also now used by pb_conf_print

Location:

devel/pb-modules

Files:

• Makefile.PL (modified) (1 diff)
• bin/pbdistrogetparam (modified) (4 diffs)
• lib/ProjectBuilder/Conf.pm (modified) (3 diffs)

devel/pb-modules/Makefile.PL

@@ -20 +20 @@
     #ABSTRACT_FROM => 'bin/pb',   # retrieve abstract from module
     AUTHOR        => 'Bruno Cornec <bruno#project-builder.org>',
-    EXE_FILES     => [ qw( bin/pbdistrocheck ) ],
-    MAN1PODS      => { 'bin/pbdistrocheck' => '$(INST_MAN1DIR)/pbdistrocheck.$(MAN1EXT)', },
+    EXE_FILES     => [ qw(bin/pbdistrocheck bin/pbdistrogetparam) ],
+    MAN1PODS      => { 
+                        'bin/pbdistrocheck' => '$(INST_MAN1DIR)/pbdistrocheck.$(MAN1EXT)', 
+                        'bin/pbdistrogetparam' => '$(INST_MAN1DIR)/pbdistrogetparam.$(MAN1EXT)', 
+                    },
 #   MAN3PODS      => {  'lib/ProjectBuilder/Distribution.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Distribution.$(MAN3EXT)',
                         #'lib/ProjectBuilder/Conf.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Conf.$(MAN3EXT)',

devel/pb-modules/bin/pbdistrogetparam

@@ -32 +32 @@
 =head1 SYNOPSIS
 
-pbdistrogetparam [-h][-v][-p project][-d distro-ver-arch] param
+pbdistrogetparam [-h][-v][-p project][-d distro-ver-arch] [param|-a]
 
 =head1 OPTIONS
@@ -53 +53 @@
 
 Name of the project you're working on (or use the env variable PBPROJ)
+
+=item B<-a|--all>
+
+Process all configuration parameters
 
 =back 
@@ -88 +92 @@
         "verbose|v+" => \$opts{'v'},
         "help|h" => \$opts{'h'},
+        "all|a" => \$opts{'a'},
         "project|p=s" => \$opts{'p'},
-        "distribution|d" => \$opts{'d'},
+        "distribution|d=s" => \$opts{'d'},
 );
+if (defined $opts{'h'}) {
+    pb_syntax(0,$opts{'h'}-1);
+}
+if (defined $opts{'man'}) {
+    pb_syntax(0,2);
+}
 if (defined $opts{'v'}) {
     $pbdebug = $opts{'v'};
@@ -99 +110 @@
 pb_env_init($opts{'p'},0,"none",0);
 my $pbos = pb_distro_get_context($dist);
-foreach my $r (pb_distro_get_param($pbos,pb_conf_get(@ARGV))) {
+
+my @tab = @ARGV;
+@tab = pb_conf_get_all() if (defined $opts{'a'});
+
+my $i = 0;
+foreach my $r (pb_distro_get_param($pbos,pb_conf_get(@tab))) {
+    print "$tab[$i] => " if ((defined $opts{'v'}) || (defined $opts{'a'}));
+    $i++;
     print "$r\n";
 }

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

@@ -29 +29 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_get pb_conf_get_if pb_conf_print);
+our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_get pb_conf_get_if pb_conf_print pb_conf_get_all);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -388 +388 @@
 
 
+=item B<pb_conf_get_all>
+
+This function returns an array wirh all configuration parameters
+
+=cut
+
+sub pb_conf_get_all {
+
+return(sort keys %$h);
+}
+
+
 =item B<pb_conf_print>
 
@@ -398 +410 @@
 pb_log(0,"Full pb configuration for project $ENV{'PBPROJ'}\n");
 pb_log(0,"====================================\n");
-foreach my $k (sort keys %$h) {
+foreach my $k (pb_conf_get_all()) {
     pb_log(0,"$k => ".Dumper($h->{$k})."\n");
 }
 }
-
 =back