jdk8-mips64-public: comparison common/bin/compare.sh

-:5ec3c4948863
+:0f704e36bc5d
 SUFFIX="${THIS_FILE##*.}"
 TMP=1
 if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then
-TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \
+TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
 $GREP '^[<>]' | \
 $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \
 	         -e '/[<>] Created-By: .* (Oracle Corporation).*/d')
 fi
 if test "x$SUFFIX" = "xjava"; then
-TMP=$(LANG=C $DIFF $OTHER_FILE $THIS_FILE | \
+TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
 $GREP '^[<>]' | \
 $SED -e '/[<>] \* from.*\.idl/d' \
 -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
 -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \
 -e '/\/\/ Generated from input file.*/d' \
 #        $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e  's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
 #            | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
 #  	    | $SED -e '/^#/d' -e '/^$/d' \
 #            -e :a -e '/\\$/N; s/\\\n//; ta' \
 #  	    -e 's/^[ \t]*//;s/[ \t]*$//' \
-#	    -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
+#	    -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned
-TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
+TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
 fi
 if test -n "$TMP"; then
 echo Files $OTHER_FILE and $THIS_FILE differ
 return 1
 fi
 done
 CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff
 # On solaris, there is no -q option.
 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
-LANG=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \
+LC_ALL=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \
 | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \
 > $CONTENTS_DIFF_FILE
 else
-LANG=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE
+LC_ALL=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE
 fi
 ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE)
 ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE)
 $CAT $WORK_DIR/$ZIP_FILE.difflist
 if [ -n "$SHOW_DIFFS" ]; then
 for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do
 if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then
-LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
+LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
 elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then
-LANG=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
+LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
 else
-LANG=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
+LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
 fi
 done
 fi
 fi
 else
 	$NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
 	$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
 fi
-LANG=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff
+LC_ALL=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff
 if [ -s $WORK_FILE_BASE.symbols.diff ]; then
 SYM_MSG=" diff  "
 if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then
 DIFF_SYM=true
 if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then
 if [ -n "$LDD_CMD" ]; then
 	(cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME 2>/dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq)
 	(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)
 	(cd $FILE_WORK_DIR && $RM -f $NAME)
-	LANG=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff
+	LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff
-	LANG=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq
+	LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq
 	if [ -s $WORK_FILE_BASE.deps.diff ]; then
 if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then
 		DEP_MSG=" diff  "
 else
 # Compare fulldump output
 if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then
 $FULLDUMP_CMD $OTHER_FILE > $WORK_FILE_BASE.fulldump.other 2>&1
 $FULLDUMP_CMD $THIS_FILE > $WORK_FILE_BASE.fulldump.this 2>&1
-LANG=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff
+LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff
 if [ -s $WORK_FILE_BASE.fulldump.diff ]; then
 ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}')
 ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE)
 if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then
 	    DIS_DIFF_FILTER="$CAT"
 	fi
 $DIS_CMD $OTHER_FILE | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.other 2>&1
 $DIS_CMD $THIS_FILE  | $GREP -v $NAME | $DIS_DIFF_FILTER > $WORK_FILE_BASE.dis.this  2>&1
-LANG=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff
+LC_ALL=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff
 if [ -s $WORK_FILE_BASE.dis.diff ]; then
 DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}')
 DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE)
 if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then

Mercurial > jdk8-mips64-public / file comparison

comparison: common/bin/compare.sh

common/bin/compare.sh