Changeset 1469 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Apr 16, 2012, 3:43:53 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Split CMS functions in 2 parts, one lowlevel reusable outside of pb in VCS.pm, the remaining stay in CMS.pm, part of pb.

File:

• devel/pb/bin/pb (modified) (7 diffs)

devel/pb/bin/pb

@@ -32 +32 @@
 use ProjectBuilder::Conf;
 use ProjectBuilder::Distribution;
+use ProjectBuilder::VCS;
 use ProjectBuilder::CMS;
 use ProjectBuilder::Env;
@@ -850 +851 @@
             }
         }
-        my $preserve = pb_cms_export($sourceuri,$sourcedir,$dest);
+        my $preserve = pb_vcs_export($sourceuri,$sourcedir,$dest);
 
         # Generated fake content for test versions to speed up stuff
@@ -998 +999 @@
                         foreach my $pf (split(/,/,$pb->{'patches'}->{$v})) {
                             my $pp = basename($pf);
-                            pb_cms_export($pf,undef,"$dest/pbconf/$v/pbpatch");
+                            pb_vcs_export($pf,undef,"$dest/pbconf/$v/pbpatch");
                             pb_filter_file_inplace($ptr,"$dest/pbconf/$v/pbpatch/$pp",$pb);
                             pb_system("gzip -9f $dest/pbconf/$v/pbpatch/$pp","","quiet");
@@ -1017 +1018 @@
                         foreach my $pf (split(/,/,$pb->{'sources'}->{$v})) {
                             my $pp = basename($pf);
-                            pb_cms_export($pf,undef,"$dest/pbconf/$v/pbsrc");
+                            pb_vcs_export($pf,undef,"$dest/pbconf/$v/pbsrc");
                             pb_filter_file_inplace($ptr,"$dest/pbconf/$v/pbsrc/$pp",$pb);
                         }
@@ -2604 +2605 @@
     }
 
-    my $res = pb_cms_isdiff($scheme,$ENV{'PBROOTDIR'});
+    my $res = pb_vcs_isdiff($scheme,$ENV{'PBROOTDIR'});
     die "ERROR: No differences accepted in CMS for $ENV{'PBROOTDIR'} before creating a new version" if ($res != 0);
 
-    $res = pb_cms_isdiff($scheme2,$ENV{'PBDIR'});
+    $res = pb_vcs_isdiff($scheme2,$ENV{'PBDIR'});
     die "ERROR: No differences accepted in CMS for $ENV{'PBDIR'} before creating a new version" if ($res != 0);
 
@@ -2625 +2626 @@
     # Duplicate and extract project-builder part
     pb_log(2,"Copying $uri/$oldver to $newurl\n");
-    pb_cms_copy($scheme,"$uri/$oldver",$newurl);
+    pb_vcs_copy($scheme,"$uri/$oldver",$newurl);
     pb_log(2,"Checkout $newurl to $ENV{'PBCONFDIR'}/$newver\n");
-    pb_cms_up($scheme,"$ENV{'PBCONFDIR'}");
+    pb_vcs_up($scheme,"$ENV{'PBCONFDIR'}");
 
     # Duplicate and extract project
@@ -2633 +2634 @@
 
     pb_log(2,"Copying $pburl->{$ENV{'PBPROJ'}}/$oldver to $newurl2\n");
-    pb_cms_copy($scheme2,"$pburl->{$ENV{'PBPROJ'}}/$oldver",$newurl2);
+    pb_vcs_copy($scheme2,"$pburl->{$ENV{'PBPROJ'}}/$oldver",$newurl2);
 
     my $tmp = $ENV{'PBDIR'};
     $tmp =~ s|$oldver$||;
     pb_log(2,"Checkout $newurl2 to $tmp/$newver\n");
-    pb_cms_up($scheme2,"$tmp");
+    pb_vcs_up($scheme2,"$tmp");
 
     # Update the .pb file