Changeset 1173 in ProjectBuilder

Timestamp:

Feb 3, 2011, 8:19:00 PM (14 years ago)

Author:

Bruno Cornec

Message:

-Add somr structure creation in case we start from nothing and fix display for deb pkg generation

Location:

devel/pb

Files:

• bin/pb (modified) (2 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -727 +727 @@
         die "Unable to get env var PBDESTDIR" if (not defined $ENV{'PBDESTDIR'});
 
+        my $dest = "$ENV{'PBDESTDIR'}/$pbpkg-$pbver";
+        # Create the structure if needed 
+        pb_mkdir_p($dest);
         # Clean up dest if necessary. The export will recreate it
-        my $dest = "$ENV{'PBDESTDIR'}/$pbpkg-$pbver";
         pb_rm_rf($dest) if (-d $dest);
 
@@ -1301 +1303 @@
         my $made2 = "";
         foreach my $f (split(/ /,$made)) {
-            $made2 .= "../$f " if ($f =~ /\.changes$/);
+            $made2 .= "../$f " if ($f =~ /\.deb$/);
         }
         if (-x $chkcmd) {

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -696 +696 @@
     }
     pb_log(1,"Checking out $uri\n");
+    # Create structure and remove end dir before exporting
+    pb_mkdir_p("$ENV{$envar}");
+    rm_rf($ENV{$envar});
     pb_cms_checkout($scheme,$uri,$ENV{$envar});
 } else {