Changeset 1470 in ProjectBuilder for projects

Timestamp:

Apr 16, 2012, 4:04:12 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Improve again cbusterize with more usage of pb functions, including VCS ones now that they are available

File:

• projects/casparbuster/devel/bin/cbusterize (modified) (8 diffs)

projects/casparbuster/devel/bin/cbusterize

@@ -114 +114 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
+use ProjectBuilder::VCS;
 
 # settings
@@ -176 +177 @@
 my $cb = \%cb;
 ($cb->{'basedir'},$cb->{'database'},$cb->{'usemachines'},$cb->{'pluginsdir'},$cb->{'cms'}) = pb_conf_get("cbbasedir","cbdatabase","cbusemachines","cbpluginssubdir","cbcms");
-
-print Dumper($cb) if ($debug);
+pb_log(2,"%cb: ",Dumper($cb));
 
 # Check for mandatory params
@@ -190 +190 @@
 eval { $basedir =~ s/(\$ENV.+\})/$1/eeg };
 
-# debug mode overview
-if ($debug) {
-    print <<EOF;
-DEBUG MODE, not doing anything, just printing
-DEBUG: basedir = $basedir
-DEBUG: source  = $source
-EOF
-    if (defined ($machine)) {
-        print "DEBUG: machine = $machine\n";
-    }
-}
+pb_log(1, "DEBUG MODE, not doing anything, just printing\nDEBUG: basedir = $basedir\nDEBUG: source  = $source\n");
+pb_log(1, "DEBUG: machine = $machine\n") if (defined ($machine));
 
 # Create basedir if it doesn't exist
 if (not -d $basedir) {
     if ($debug) {
-        print "DEBUG: Creating recursively directory $basedir\n";
-    } else {
-        mkpath($basedir,0,0755) or die "Unable to recursively create $basedir";
-        # TODO: Add it to the CMS
+        pb_log(1, "DEBUG: Creating recursively directory $basedir\n");
+    } else {
+        pb_mkdir_p($basedir) || die "Unable to recursively create $basedir";
     }
 }
@@ -215 +205 @@
 my $srcdir = undef;
 my $srcfile = undef;
+# TODO: That should be remote !!
 if (-d $source) {
     $srcdir = $source;
@@ -222 +213 @@
     }
 
-if ($debug) {
-    print "DEBUG: Found srcdir = $srcdir\n";
-    if (defined $srcfile) {
-        print "DEBUG: Found srcfile = $srcfile\n";
-    } else {
-        print "DEBUG: Found no srcfile\n";
-    }
+pb_log(1,"DEBUG: Found srcdir = $srcdir\n");
+if (defined $srcfile) {
+    pb_log(1,"DEBUG: Found srcfile = $srcfile\n");
+} else {
+    pb_log(1,"DEBUG: Found no srcfile\n");
 }
 
@@ -236 +225 @@
 $target .= "$srcdir";
 
+my $scheme = $cb->{'cms'}->{$appname};
+
 # If both source and target are dirs, then copy into the parent of the target
 $target = basename($target) if ((not defined $srcfile) && (-d $target));
@@ -242 +233 @@
 if (not -d $target) {
     if ($debug) {
-        print "DEBUG: Creating recursively directory $target\n";
-    } else {
-        mkpath($target,0,0755) or die "Unable to recursively create $target";
-        print "INFO: Created $target you may want to add it to your CMS\n";
-        # TODO: Add it to the CMS
+        pb_log(1,"DEBUG: Creating recursively directory $target\n");
+    } else {
+        pb_mkdir_p($target) || die "Unable to recursively create $target";
+        pb_vcs_add($scheme,$target);
+        pb_log(0,"INFO: Created $target and added it to your $scheme system\n");
     }
 }
@@ -264 +255 @@
 
 # Now add content if not already there
-if ((defined $srcfile) && (! -f "$target/$srcfile")) {
+if (defined $srcfile) {
+    # File case
+    if (! -f "$target/$srcfile") {
+        if ($debug) {
+            pb_log(1,"DEBUG: launching $cmd\n");
+        } else {
+            pb_system($cmd);
+            pb_vcs_add($scheme,"$target/$srcfile");
+            pb_log(0,"INFO: Created $target/$srcfile and added it to your $scheme system\n");
+        }
+    } else {
+        pb_log(0,"INFO: File $target/$srcfile already there\n");
+    }
+} else {
+    # Directory case
+    # TODO: if targetlocal dir alredy exists, take the parent
     if ($debug) {
-        print "DEBUG: launching $cmd\n";
-    } else {
-        system($cmd);   
-        print "INFO: Created $target/$srcfile you may want to add it to your CMS\n";
-    }
-}
+        pb_log(1,"DEBUG: launching $cmd\n");
+    } else {
+        pb_system($cmd);
+        pb_vcs_add($scheme,"$target");
+        pb_log(0,"INFO: Created $target and added it to your $scheme system\n");
+    }
+}