Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Leverage -C command line flag when calling the mar executable to avoid

Browse Source 
need to "cd" into $workdir.  This allows us to locate the mar executable
using a relative file path, which is a good thing since $PWD is sometimes
not set correctly on the tinderbox systems.  (This patch is based on
discussion with Chase over IRC.)


git-svn-id: svn://10.0.0.236/trunk@174975 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net
2005-06-22 00:32:16 +00:00
parent ed149e610d
commit 75aeebd3b2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/tools/update-packaging/Makefile.in
View File

@@ -48,6 +48,6 @@ STAGE_DIR = $(DIST)/update
full-update::
mkdir -p $(STAGE_DIR)
MAR=$(PWD)/$(DIST)/host/bin/mar $(srcdir)/make_full_update.sh $(STAGE_DIR)/update.mar $(DIST)/bin
MAR=$(DIST)/host/bin/mar $(srcdir)/make_full_update.sh $(STAGE_DIR)/update.mar $(DIST)/bin
include $(topsrcdir)/config/rules.mk

2
mozilla/tools/update-packaging/make_full_update.sh
View File

@@ -76,7 +76,7 @@ done
$BZIP2 -z9 "$manifest" && mv -f "$manifest.bz2" "$manifest"
(cd "$workdir" && eval "$MAR -c output.mar $targetfiles")
eval "$MAR -C \"$workdir\" -c output.mar $targetfiles"
mv -f "$workdir/output.mar" "$archive"
# cleanup

2
mozilla/tools/update-packaging/make_incremental_update.sh
View File

@@ -113,7 +113,7 @@ done
$BZIP2 -z9 "$manifest" && mv -f "$manifest.bz2" "$manifest"
(cd "$workdir" && eval "$MAR -c output.mar $archivefiles")
eval "$MAR -C \"$workdir\" -c output.mar $archivefiles"
mv -f "$workdir/output.mar" "$archive"
# cleanup