Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/bin/compare.sh	Fri Jan 04 17:05:13 2013 +0100
     1.2 +++ b/common/bin/compare.sh	Fri Jan 04 17:08:33 2013 +0100
     1.3 @@ -1166,6 +1166,15 @@
     1.4      echo "WARNING! Other build doesn't contain docs, skipping doc compare."
     1.5  fi
     1.6  
     1.7 +if [ -f "$OTHER/tmp/sec-bin.zip" ]; then
     1.8 +    OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip"
     1.9 +elif [ -f "$OTHER/images/sec-bin.zip" ]; then
    1.10 +    OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip"
    1.11 +else
    1.12 +    echo "WARNING! No sec-bin.zip found in other."
    1.13 +fi
    1.14 +THIS_SEC_BIN="$THIS/images/sec-bin.zip"
    1.15 +
    1.16  ##########################################################################################
    1.17  # Do the work
    1.18  
    1.19 @@ -1282,6 +1291,12 @@
    1.20      if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
    1.21          compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
    1.22      fi
    1.23 +    if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then
    1.24 +        if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then
    1.25 +            echo "sec-bin.zip..."
    1.26 +            compare_zip_file $(dirname $THIS_SEC_BIN) $(dirname $OTHER_SEC_BIN) $COMPARE_ROOT/sec-bin sec-bin.zip
    1.27 +        fi
    1.28 +    fi
    1.29  fi
    1.30  
    1.31  if [ "$CMP_JARS" = "true" ]; then

     2.1 --- a/common/makefiles/JavaCompilation.gmk	Fri Jan 04 17:05:13 2013 +0100
     2.2 +++ b/common/makefiles/JavaCompilation.gmk	Fri Jan 04 17:08:33 2013 +0100
     2.3 @@ -250,7 +250,7 @@
     2.4  define SetupZipArchive
     2.5      # param 1 is for example ZIP_MYSOURCE
     2.6      # param 2,3,4,5,6,7,8,9 are named args.
     2.7 -    #    SRC,ZIP,INCLUDES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
     2.8 +    #    SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
     2.9      $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
    2.10      $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
    2.11      $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
    2.12 @@ -267,6 +267,12 @@
    2.13          else
    2.14              $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
    2.15          endif
    2.16 +    endif
    2.17 +    ifneq ($$($1_INCLUDE_FILES),)
    2.18 +        $1_SRC_INCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
    2.19 +        $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
    2.20 +    endif
    2.21 +    ifneq ($$($1_SRC_INCLUDES),)
    2.22          $1_ALL_SRCS     := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_SRCS))
    2.23      endif
    2.24      ifneq ($$($1_EXCLUDES),)