Changeset 405 in ProjectBuilder for devel/pb-modules

Timestamp:

Apr 20, 2008, 1:59:47 PM (17 years ago)

Author:

Bruno Cornec

Message:

Split again function in modules to allow for usage with pbinit and easier reuse.

Location:

devel/pb-modules

Files:

• Makefile.PL (modified) (1 diff)
• lib/ProjectBuilder/Base.pm (modified) (3 diffs)
• lib/ProjectBuilder/Conf.pm (added)

devel/pb-modules/Makefile.PL

@@ -18 +18 @@
     EXE_FILES     => [ qw( bin/pbdistrocheck ) ],
     MAN3PODS      => {  'lib/ProjectBuilder/Distribution.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Distribution.$(MAN3EXT)',
+                        'lib/ProjectBuilder/Conf.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Conf.$(MAN3EXT)',
                         'lib/ProjectBuilder/Base.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Base.$(MAN3EXT)', },
 );

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

@@ -33 +33 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_conf_read pb_conf_read_if pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_display_file pb_syntax_init pb_syntax pb_temp_init $debug $LOG);
+our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_display_file pb_syntax_init pb_syntax pb_temp_init $debug $LOG);
 
 =pod
@@ -63 +63 @@
   #
   pb_system("ls -l", "Printing directory content");
-
-  #
-  # Read hash codes of values from a configuration file and return table of pointers
-  #
-  my ($k1, $k2) = pb_conf_read_if("$ENV{'HOME'}/.pbrc","key1","key2");
-  my ($k) = pb_conf_read("$ENV{'HOME'}/.pbrc","key");
 
   #
@@ -162 +156 @@
 }
 
-=item B<pb_conf_read_if>
-
-This function returns a table of pointers on hashes
-corresponding to the keys in a configuration file passed in parameter.
-If that file doesn't exist, it returns undef.
-
-The format of the configuration file is as follows:
-
-key tag = value1,value2,...
-
-Supposing the file is called "$ENV{'HOME'}/.pbrc", containing the following:
-
-  $ cat $HOME/.pbrc
-  pbver pb = 3
-  pbver default = 1
-  pblist pb = 12,25
-
-calling it like this:
-
-  my ($k1, $k2) = pb_conf_read_if("$ENV{'HOME'}/.pbrc","pbver","pblist");
-
-will allow to get the mapping:
-
-  $k1->{'pb'}  contains 3
-  $ka->{'default'} contains 1
-  $k2->{'pb'} contains 12,25
-
-Valid chars for keys and tags are letters, numbers, '-' and '_'.
-
-=cut
-
-sub pb_conf_read_if {
-
-my $conffile = shift;
-my @param = @_;
-
-open(CONF,$conffile) || return((undef));
-close(CONF);
-return(pb_conf_read($conffile,@param));
-}
-
-=item B<pb_conf_read>
-
-This function is similar to B<pb_conf_read_if> except that it dies when the file in parameter doesn't exist.
-
-=cut
-
-sub pb_conf_read {
-
-my $conffile = shift;
-my @param = @_;
-my $trace;
-my @ptr;
-my %h;
-
-open(CONF,$conffile) || die "Unable to open $conffile";
-while(<CONF>) {
-    if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
-        pb_log(3,"DEBUG: 1:$1 2:$2 3:$3\n");
-        $h{$1}{$2}=$3;
-    }
-}
-close(CONF);
-
-for my $param (@param) {
-    push @ptr,$h{$param};
-}
-return(@ptr);
-}
-
 =item B<pb_get_uri>