Changeset 383 in ProjectBuilder

Timestamp:

Apr 14, 2008, 2:07:36 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Adds pb_cms_up and use it
• Prepare a projects directory to host all projects using pb

Files:

• devel/pb/bin/pb (modified) (2 diffs)
• devel/pb/lib/ProjectBuilder/Base.pm (modified) (3 diffs)
• projects (added)

devel/pb/bin/pb

@@ -1207 +1207 @@
     pb_cms_copy($scheme,"$uri/$tmp",$newurl);
     pb_log(2,"Checkout $newurl to $ENV{'PBROOTDIR'}/../$newver\n");
-    pb_cms_checkout($scheme,$newurl,"$ENV{'PBROOTDIR'}/../$newver");
+    pb_cms_up($scheme,"$ENV{'PBCONFDIR'}/..");
 
     # Duplicate and extract project
@@ -1215 +1215 @@
     pb_cms_copy($scheme,"$pburl->{$ENV{'PBPROJ'}}/$tmp",$newurl2);
     pb_log(2,"Checkout $newurl2 to $ENV{'PBDIR'}/../$newver\n");
-    pb_cms_checkout($scheme,$newurl2,"$ENV{'PBDIR'}/../$newver");
+    pb_cms_up($scheme,"$ENV{'PBDIR'}/..");
 
     # Update the .pb file

devel/pb/lib/ProjectBuilder/Base.pm

@@ -32 +32 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_env_init pb_conf_read pb_conf_read_if pb_conf_get pb_conf_get_if pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_filter_file_inplace pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout pb_get_date pb_log pb_log_init pb_get_pkg pb_cms_get_pkg pb_get_uri pb_cms_get_uri $debug $LOG);
+our @EXPORT = qw(pb_env_init pb_conf_read pb_conf_read_if pb_conf_get pb_conf_get_if pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_filter_file_inplace pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout pb_cms_up pb_cms_checkin pb_get_date pb_log pb_log_init pb_get_pkg pb_cms_get_pkg pb_get_uri pb_cms_get_uri $debug $LOG);
 
 sub pb_env_init {
@@ -1326 +1326 @@
 }
 
-sub pb_cms_checkin {
+sub pb_cms_up {
 my $scheme = shift;
 my $dir = shift;
 
-my $ver = basename($dir);
 if ($scheme =~ /^svn/) {
-    pb_system("svn ci -m \"Updated to $ver\" $dir","Checking in $dir");
     pb_system("svn up $dir","Updating $dir");
 } elsif ($scheme eq "flat") {
@@ -1339 +1337 @@
     die "cms $scheme unknown";
 }
+}
+
+sub pb_cms_checkin {
+my $scheme = shift;
+my $dir = shift;
+
+my $ver = basename($dir);
+if ($scheme =~ /^svn/) {
+    pb_system("svn ci -m \"updated to $ver\" $dir","Checking in $dir");
+} elsif ($scheme eq "flat") {
+} elsif ($scheme =~ /^cvs/) {
+} else {
+    die "cms $scheme unknown";
+}
+pb_cms_up($scheme,$dir);
 }