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

fixes bug 306077 "do not package channel-prefs.js in MAR complete and partial patches" r=chase

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@179480 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net
2005-09-01 18:41:11 +00:00
parent 8aaebfe76c
commit ec44d896d4
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,13 @@ make_add_instruction() {
fi
}
# List all files in the current directory, stripping leading "./"
# Skip the channel-prefs.js file as it should not be included in any
# generated MAR files (see bug 306077).
list_files() {
find . -type f ! -name "channel-prefs.js" | sed 's/\.\/\(.*\)/"\1"/'
}
archive="$1"
targetdir="$2"
workdir="$targetdir.work"
@@ -64,7 +71,7 @@ manifest="$workdir/update.manifest"
targetfiles="update.manifest"
# Generate a list of all files in the target directory.
list=$(cd "$targetdir" && find . -type f | sed 's/\.\/\(.*\)/"\1"/')
list=$(cd "$targetdir" && list_files)
eval "files=($list)"
mkdir -p "$workdir"

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

@@ -65,6 +65,13 @@ make_patch_instruction() {
fi
}
# List all files in the current directory, stripping leading "./"
# Skip the channel-prefs.js file as it should not be included in any
# generated MAR files (see bug 306077).
list_files() {
find . -type f ! -name "channel-prefs.js" | sed 's/\.\/\(.*\)/"\1"/'
}
archive="$1"
olddir="$2"
newdir="$3"
@@ -73,9 +80,9 @@ manifest="$workdir/update.manifest"
archivefiles="update.manifest"
# Generate a list of all files in the target directory.
list=$(cd "$olddir" && find . -type f | sed 's/\.\/\(.*\)/"\1"/')
list=$(cd "$olddir" && list_files)
eval "oldfiles=($list)"
list=$(cd "$newdir" && find . -type f | sed 's/\.\/\(.*\)/"\1"/')
list=$(cd "$newdir" && list_files)
eval "newfiles=($list)"
mkdir -p "$workdir"