Changeset 2267 in ProjectBuilder
- Timestamp:
- Aug 30, 2017, 5:07:48 PM (7 years ago)
- Location:
- devel
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Conf.pm
r2266 r2267 19 19 use ProjectBuilder::Base; 20 20 use ProjectBuilder::Version; 21 use ProjectBuilder::VCS;22 21 23 22 # Inherit from the "Exporter" module which handles exporting functions. … … 594 593 close(ORIG); 595 594 close(DEST); 596 # Adding this new file to VCS (not removing the previous one)597 my ($pburl) = pb_conf_get("pburl");598 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});599 pb_vcs_add_if_not_in($scheme,$dest);600 595 return(); 601 596 } -
devel/pb-modules/lib/ProjectBuilder/Env.pm
r2260 r2267 210 210 pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 211 211 } elsif (-f "$p->{$ENV{'PBPROJ'}}/.pbrc") { 212 pb_ conf_update_v0("$p->{$ENV{'PBPROJ'}}/.pbrc","$p->{$ENV{'PBPROJ'}}/.pbrc.yml");212 pb_vcs_conf_update_v0("$p->{$ENV{'PBPROJ'}}/.pbrc","$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 213 213 pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml"); 214 214 my ($pburl) = pb_conf_get("pburl"); … … 387 387 pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml"); 388 388 } elsif (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") { 389 pb_ conf_update_v0("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb","$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");389 pb_vcs_conf_update_v0("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb","$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml"); 390 390 pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml"); 391 391 } -
devel/pb-modules/lib/ProjectBuilder/VCS.pm
r2265 r2267 36 36 37 37 our @ISA = qw(Exporter); 38 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 );38 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); 39 39 ($VERSION,$REVISION) = pb_version_init(); 40 40 … … 738 738 } 739 739 740 740 =item B<pb_vcs_conf_update_v0> 741 742 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 743 744 =cut 745 746 747 sub pb_vcs_conf_update_v0 { 748 749 my $orig = shift; 750 my $dest = shift; 751 752 pb_conf_update_v0($orig,$dest); 753 # Adding this new file to VCS (not removing the previous one) 754 my ($pburl) = pb_conf_get("pburl"); 755 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}}); 756 pb_vcs_add_if_not_in($scheme,$dest); 757 758 } 741 759 =back 742 760 -
devel/pb/bin/pb
r2262 r2267 1095 1095 $fyml =~ s/\.pb/.yml/; 1096 1096 $fyml =~ s/\.pbrc/.pbrc.yml/; 1097 pb_ conf_update_v0($f,$fyml);1097 pb_vcs_conf_update_v0($f,$fyml); 1098 1098 } 1099 1099 } elsif ($action =~ /^getconf$/) { -
devel/pb/lib/ProjectBuilder/Filter.pm
r2266 r2267 95 95 my $fyml = $f; 96 96 $fyml =~ s/\.pbf/.yml/; 97 pb_ conf_update_v0($f,$fyml);97 pb_vcs_conf_update_v0($f,$fyml); 98 98 push(@ffiles, $fyml); 99 99 }
Note:
See TracChangeset
for help on using the changeset viewer.