Changeset 1235 in ProjectBuilder

Timestamp:

Feb 27, 2011, 8:30:50 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix a debian build bug due to directory change (backport from devel to 0.11.1)

File:

• 0.11.1/pb/bin/pb (modified) (4 diffs)

0.11.1/pb/bin/pb

@@ -1277 +1277 @@
                 my $tmp = $_;
                 next if ($tmp !~ /^dpkg-deb.*:/);
-                $tmp =~ s|.*../(.*)_(.*).deb.*|$1|;
+                $tmp =~ s|.*\.\./(.*)_(.*).deb.*|$1|;
                 $made="$made $tmp.dsc $tmp.tar.gz $tmp"."_*.deb $tmp"."_*.changes";
             }
             close(LOG);
+            chdir ".." || die "Unable to chdir to parent dir";
+            pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
         } elsif ($pbos->{'type'} eq "ebuild") {
             my @ebuildfile;
@@ -1353 +1355 @@
                 pb_system("sudo /sbin/makepkg -p -l y -c y $pbpkg","Packaging $pbpkg","verbose");
             }
+            chdir ".." || die "Unable to chdir to parent dir";
+            pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
         } elsif ($pbos->{'type'} eq "pkg") {
             # Solaris
@@ -1410 +1414 @@
             $made="$made $pbpkg-$pbver-$pbtag.sd";
 
+            chdir ".." || die "Unable to chdir to parent dir";
             pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
         } else {
@@ -1451 +1456 @@
         my $made2 = "";
         foreach my $f (split(/ /,$made)) {
-            $made2 .= "../$f " if ($f =~ /\.deb$/);
+            $made2 .= "$f " if ($f =~ /\.deb$/);
         }
         if (-x $chkcmd) {
             pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","verbose");
-        } else {
-            pb_log(0,"deb packages generated: $made2\n");
-        }
+        }
+        pb_log(0,"deb packages generated: $made2\n");
     } else {
         pb_log(0,"No check done for $pbos->{'type'} yet\n");