Changeset 2267 in ProjectBuilder for devel/pb-modules

Timestamp:

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

Author:

Bruno Cornec

Message:

the function to update v0 conf into v1 is now used in VCS.pm to allow
to add files generated into VCS without poluting Conf. with it
(hierarchy issues)

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Conf.pm (modified) (2 diffs)
• Env.pm (modified) (2 diffs)
• VCS.pm (modified) (2 diffs)

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

@@ -19 +19 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Version;
-use ProjectBuilder::VCS;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -594 +593 @@
 close(ORIG);
 close(DEST);
-# Adding this new file to VCS (not removing the previous one)
-my ($pburl) = pb_conf_get("pburl");
-my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
-pb_vcs_add_if_not_in($scheme,$dest);
 return();
 }

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

@@ -210 +210 @@
             pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
         } elsif (-f "$p->{$ENV{'PBPROJ'}}/.pbrc") {
-            pb_conf_update_v0("$p->{$ENV{'PBPROJ'}}/.pbrc","$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
+            pb_vcs_conf_update_v0("$p->{$ENV{'PBPROJ'}}/.pbrc","$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
             pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
             my ($pburl) = pb_conf_get("pburl");
@@ -387 +387 @@
         pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
     } elsif (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") {
-        pb_conf_update_v0("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb","$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
+        pb_vcs_conf_update_v0("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb","$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
         pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
     }

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

@@ -36 +36 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_vcs_export pb_vcs_get_uri pb_vcs_copy pb_vcs_checkout pb_vcs_up pb_vcs_checkin pb_vcs_isdiff pb_vcs_add pb_vcs_add_if_not_in pb_vcs_cmd pb_vcs_compliant);
+our @EXPORT = qw(pb_vcs_export pb_vcs_get_uri pb_vcs_copy pb_vcs_checkout pb_vcs_up pb_vcs_checkin pb_vcs_isdiff pb_vcs_add pb_vcs_add_if_not_in pb_vcs_cmd pb_vcs_compliant pb_vcs_conf_update_v0);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -738 +738 @@
 }
 
-
+=item B<pb_vcs_conf_update_v0>
+
+This function transform the old configuration v0 file as first param into a new v1 one as second param  by calling a COnf.pm function and then adds the resulting file into VCS
+
+=cut
+
+
+sub pb_vcs_conf_update_v0 {
+
+my $orig = shift;
+my $dest = shift;
+
+pb_conf_update_v0($orig,$dest);
+# Adding this new file to VCS (not removing the previous one)
+my ($pburl) = pb_conf_get("pburl");
+my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
+pb_vcs_add_if_not_in($scheme,$dest);
+
+}
 =back