1.1 --- a/common/bin/compare.sh Fri Sep 27 16:27:34 2013 -0700
1.2 +++ b/common/bin/compare.sh Tue Oct 01 10:58:24 2013 +0200
1.3 @@ -76,13 +76,13 @@
1.4 TMP=1
1.5
1.6 if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then
1.7 - TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \
1.8 + TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
1.9 $GREP '^[<>]' | \
1.10 $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \
1.11 -e '/[<>] Created-By: .* (Oracle Corporation).*/d')
1.12 fi
1.13 if test "x$SUFFIX" = "xjava"; then
1.14 - TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \
1.15 + TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
1.16 $GREP '^[<>]' | \
1.17 $SED -e '/[<>] \* from.*\.idl/d' \
1.18 -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
1.19 @@ -121,8 +121,8 @@
1.20 # | $SED -e '/^#/d' -e '/^$/d' \
1.21 # -e :a -e '/\\$/N; s/\\\n//; ta' \
1.22 # -e 's/^[ \t]*//;s/[ \t]*$//' \
1.23 -# -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
1.24 - TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
1.25 +# -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned
1.26 + TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
1.27 fi
1.28 if test -n "$TMP"; then
1.29 echo Files $OTHER_FILE and $THIS_FILE differ
1.30 @@ -410,11 +410,11 @@
1.31 CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff
1.32 # On solaris, there is no -q option.
1.33 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
1.34 - LANG=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \
1.35 + LC_ALL=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \
1.36 | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \
1.37 > $CONTENTS_DIFF_FILE
1.38 else
1.39 - LANG=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE
1.40 + LC_ALL=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE
1.41 fi
1.42
1.43 ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE)
1.44 @@ -459,11 +459,11 @@
1.45 if [ -n "$SHOW_DIFFS" ]; then
1.46 for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do
1.47 if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then
1.48 - LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
1.49 + LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
1.50 elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then
1.51 - LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
1.52 + LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
1.53 else
1.54 - LANG=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
1.55 + LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
1.56 fi
1.57 done
1.58 fi
1.59 @@ -703,7 +703,7 @@
1.60 $NM -a $ORIG_THIS_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
1.61 fi
1.62
1.63 - LANG=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff
1.64 + LC_ALL=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff
1.65 if [ -s $WORK_FILE_BASE.symbols.diff ]; then
1.66 SYM_MSG=" diff "
1.67 if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then
1.68 @@ -732,8 +732,8 @@
1.69 (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME 2</dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.this | $UNIQ > $WORK_FILE_BASE.deps.this.uniq)
1.70 (cd $FILE_WORK_DIR && $RM -f $NAME)
1.71
1.72 - LANG=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff
1.73 - LANG=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq
1.74 + LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff
1.75 + LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq
1.76
1.77 if [ -s $WORK_FILE_BASE.deps.diff ]; then
1.78 if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then
1.79 @@ -768,7 +768,7 @@
1.80 if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then
1.81 $FULLDUMP_CMD $OTHER_FILE > $WORK_FILE_BASE.fulldump.other 2>&1
1.82 $FULLDUMP_CMD $THIS_FILE > $WORK_FILE_BASE.fulldump.this 2>&1
1.83 - LANG=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff
1.84 + LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff
1.85
1.86 if [ -s $WORK_FILE_BASE.fulldump.diff ]; then
1.87 ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}')
1.88 @@ -802,7 +802,7 @@
1.89 $DIS_CMD $OTHER_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.other 2>&1
1.90 $DIS_CMD $THIS_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.this 2>&1
1.91
1.92 - LANG=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff
1.93 + LC_ALL=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff
1.94
1.95 if [ -s $WORK_FILE_BASE.dis.diff ]; then
1.96 DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}')
