Changeset 2254 in ProjectBuilder for devel

Timestamp:

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

Author:

Bruno Cornec

Message:

Automatically modify v0 filter files into v1 format

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (1 diff)
• pb/lib/ProjectBuilder/Filter.pm (modified) (3 diffs)

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

@@ -30 +30 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_write pb_conf_get pb_conf_get_if pb_conf_get_all pb_conf_get_hash pb_conf_cache);
-($VERSION,$REVISION) = pb_version_init();
+our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_write pb_conf_get pb_conf_get_if pb_conf_get_all pb_conf_get_hash pb_conf_cache pb_conf_update_v0);
+($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
 
 # Global hash of conf files
@@ -92 +92 @@
 
   $ cat $HOME/.pbrc.yml
-  ---
+  --- %YAML 1.0
     pbver:
       - pb: 3

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

@@ -492 +492 @@
 =item B<pb_vcs_add_if_not_in>
 
-This function adds to a VCS content from a local directory if the content wasn't already managed under th VCS.
+This function adds to a VCS content from a local directory if the content wasn't already managed under the VCS.
 The first parameter is the schema of the VCS systems (svn, cvs, svn+ssh, ...)
 The second parameter is a list of directory/file to add.

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -24 +24 @@
 use ProjectBuilder::Distribution;
 use ProjectBuilder::Changelog;
+use ProjectBuilder::VCS;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -65 +66 @@
 
 my @ffiles;
+my @ffilestoconvert;
 my $pbpkg = shift || die "No package specified";
 my $pbos = shift;
@@ -79 +81 @@
     foreach my $file_basename (@file_basenames) {
         my $path = "$dir/${file_basename}.yml";
-        push(@ffiles, $path) if -f $path;
-    }
-}
+        if (-f $path) {
+            push(@ffiles, $path);
+        } else {
+            my $path2 = "$dir/${file_basename}.pbf";
+            push(@ffilestoconvert, $path2) if (-f $path2);
+        }
+    }
+}
+
+# Convert all old filter files into new ones
+if (@ffilestoconvert) {
+    foreach my $f (@ffilestoconvert) {
+        my $fyml = $f;
+        $fyml =~ s/\.pbf/.yml/;
+        pb_update_conf_v0($f,$fyml);
+        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,$fyml);
+        push(@ffiles, $fyml);
+    }
 
 if (@ffiles) {