Changeset 1208 in ProjectBuilder

Timestamp:

Feb 19, 2011, 1:36:38 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix a typo in CMS.pm
• Try to fix an issue when starting from a clean env (only one package built instead of 3 the first time)

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -1191 +1191 @@
     $pkg = { } if (not defined $pkg);
 
-    chdir "$ENV{'PBBUILDDIR'}";
+    pb_mkdir_p("$ENV{'PBBUILDDIR'}") || die "Unable to create $ENV{'PBBUILDDIR'}";
+    chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
     my $made = ""; # pkgs made during build
     my $pm;
@@ -1257 +1258 @@
 
         } elsif ($pbos->{'type'} eq "deb") {
-            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
             pb_system("tar xfz $src","Extracting sources");
             pb_system("tar xfz $src2","Extracting pbconf");
@@ -1341 +1341 @@
             $made="$made $pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";
 
-            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
             pb_system("tar xfz $src","Extracting sources");
             pb_system("tar xfz $src2","Extracting pbconf");
@@ -1356 +1355 @@
             my $pkgdestdir="$ENV{'PBBUILDDIR'}/install";
 
-            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
             # Will host resulting packages
             pb_mkdir_p("$pbos->{'type'}");
@@ -1392 +1390 @@
         } elsif ($pbos->{'type'} eq "hpux") {
             # HP-UX
-            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
             pb_system("tar xfz $src","Extracting sources");
             pb_system("tar xfz $src2","Extracting pbconf");
@@ -1561 +1558 @@
         $pkg = { } if (not defined $pkg);
 
-        chdir "$ENV{'PBBUILDDIR'}";
+        pb_mkdir_p("$ENV{'PBBUILDDIR'}") || die "Unable to create $ENV{'PBBUILDDIR'}";
+        chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
         foreach my $pbpkg (@pkgs) {
             my $vertag = $pkg->{$pbpkg};

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -706 +706 @@
     # Create structure and remove end dir before exporting
     pb_mkdir_p("$ENV{$envar}");
-    rm_rf($ENV{$envar});
+    pb_rm_rf($ENV{$envar});
     pb_cms_checkout($scheme,$uri,$ENV{$envar});
 } else {