Changeset 2252 in ProjectBuilder for devel/pb-modules

Timestamp:

Aug 30, 2017, 5:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

Use .pbrc.yml now as a YAML file as well instead of .pbrc

Location:

devel/pb-modules

Files:

• etc/pb.conf.pod (modified) (1 diff)
• lense/projectbuilder.aug (modified) (1 diff)
• lib/ProjectBuilder/Conf.pm (modified) (1 diff)
• lib/ProjectBuilder/Env.pm (modified) (3 diffs)

devel/pb-modules/etc/pb.conf.pod

@@ -17 +17 @@
 The key could be also default, in which case it will be used as a default value if no more precise content is given for the key.
 
-Each value is detailed below giving the nature of its use (Mandatory or Optional - only used for certain feature), the value of the key (could be the project, an OS name, default, ...), the value of the parameter field and its format, the default configuration file in which it should be defined (home $HOME/.pbrc, conf /etc/pb/pb.conf or /usr/local/etc/pb/pb.conf, VE vepath/.pbrc, VM vmpath/.pbrc,  or project project.pb) and an example of use.
+Each value is detailed below giving the nature of its use (Mandatory or Optional - only used for certain feature), the value of the key (could be the project, an OS name, default, ...), the value of the parameter field and its format, the default configuration file in which it should be defined (home $HOME/.pbrc.yml, conf /etc/pb/pb.yml or /usr/local/etc/pb/pb.yml, VE vepath/.pbrc.yml, VM vmpath/.pbrc.yml, or project project.yml) and an example of use.
 
 =head1 OPTIONS

devel/pb-modules/lense/projectbuilder.aug

@@ -30 +30 @@
   let lns = ( record | comment | empty )*
 
-  let filter = (incl "/home/bruno/.pbrc") . Util.stdexcl
+  let filter = (incl "/home/bruno/.pbrc.yml") . Util.stdexcl
 
   let xfm = transform lns filter

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

@@ -62 +62 @@
   # 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");
+  my ($k1, $k2) = pb_conf_read_if("$ENV{'HOME'}/.pbrc.yml","key1","key2");
+  my ($k) = pb_conf_read("$ENV{'HOME'}/.pbrc.yml","key");
 
 =head1 USAGE

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

@@ -73 +73 @@
 }
 
-$ENV{'PBETC'} = "$dir/.pbrc";
+$ENV{'PBETC'} = "$dir/.pbrc.yml";
 
 if (! -f $ENV{'PBETC'}) {
@@ -185 +185 @@
         $p->{$ENV{'PBPROJ'}} = pb_path_expand($p->{$ENV{'PBPROJ'}});
         # TODO: should we add the conf files pointed by project default as well ?
-        pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$p->{$ENV{'PBPROJ'}}/.pbrc");
+        pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml") if (-f "$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
     }
 }
@@ -223 +223 @@
 
 
- (*) By default, if no relocation in .pbrc, dev dir is taken in the maint pbdefdir (when appropriate)
+ (*) By default, if no relocation in .pbrc.yml, dev dir is taken in the maint pbdefdir (when appropriate)
  Names under a pbproj and the corresponding pbconf should be similar