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

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/lib/ProjectBuilder

Files:

• Conf.pm (modified) (1 diff)
• Env.pm (modified) (3 diffs)

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