Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/compare.sh.in	Thu Jan 03 20:54:38 2013 +0100
     1.2 +++ b/common/autoconf/compare.sh.in	Fri Jan 04 11:31:00 2013 +0100
     1.3 @@ -1,6 +1,6 @@
     1.4  #!/bin/bash
     1.5  #
     1.6 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     1.7 +# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
     1.8  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.9  #
    1.10  # This code is free software; you can redistribute it and/or modify it
    1.11 @@ -48,6 +48,7 @@
    1.12  JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap"
    1.13  LDD="@LDD@"
    1.14  MKDIR="@MKDIR@"
    1.15 +NAWK="@NAWK@"
    1.16  NM="@NM@"
    1.17  OBJDUMP="@OBJDUMP@"
    1.18  OTOOL="@OTOOL@"

     2.1 --- a/common/bin/compare.sh	Thu Jan 03 20:54:38 2013 +0100
     2.2 +++ b/common/bin/compare.sh	Fri Jan 04 11:31:00 2013 +0100
     2.3 @@ -1,6 +1,6 @@
     2.4  #!/bin/bash
     2.5  #
     2.6 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     2.7 +# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
     2.8  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.9  #
    2.10  # This code is free software; you can redistribute it and/or modify it
    2.11 @@ -113,12 +113,15 @@
    2.12          fi
    2.13      fi
    2.14      if test "x$SUFFIX" = "xproperties"; then
    2.15 -        $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e  's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
    2.16 -            | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
    2.17 -  	    | $SED -e '/^#/d' -e '/^$/d' \
    2.18 -            -e :a -e '/\\$/N; s/\\\n//; ta' \
    2.19 -  	    -e 's/^[ \t]*//;s/[ \t]*$//' \
    2.20 -	    -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
    2.21 +        # Run through nawk to add possibly missing newline at end of file.
    2.22 +        $CAT $OTHER_FILE | $NAWK '{ print }' > $OTHER_FILE.cleaned
    2.23 +# Disable this exception since we aren't changing the properties cleaning method yet.
    2.24 +#        $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e  's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
    2.25 +#            | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
    2.26 +#  	    | $SED -e '/^#/d' -e '/^$/d' \
    2.27 +#            -e :a -e '/\\$/N; s/\\\n//; ta' \
    2.28 +#  	    -e 's/^[ \t]*//;s/[ \t]*$//' \
    2.29 +#	    -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
    2.30          TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
    2.31      fi
    2.32      if test -n "$TMP"; then