Merge

.hgtags-top-repo

@@ -268,3 +268,4 @@ ee4fd72b2ec3d92497f37163352f294aa695c6fb jdk9-b20
 88567461a2cd9b7fb431fee6440005a694df1f47 jdk9-b23
 1d4a293fbec19dc2d5790bbb2c7dd0ed8f265484 jdk9-b24
 aefd8899a8d6615fb34ba99b2e38996a7145baa8 jdk9-b25
+d3ec8d048e6c3c46b6e0ee011cc551ad386dfba5 jdk9-b26

Makefile

@@ -58,29 +58,70 @@ $(eval $(call ParseConfAndSpec))
 ifeq ($(SPEC),)
   # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
 else
-  ifeq ($(words $(SPEC)),1)
-    # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
-    include $(root_dir)/make/Main.gmk
-  else
-    # We are building multiple configurations.
-    # First, find out the valid targets
-    # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
-    # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
-    all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \
-        cd $(root_dir) && $(MAKE) -p -q FRC SPEC=$(firstword $(SPEC)) | \
-        grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
-
-    $(all_phony_targets):
-	@$(foreach spec,$(SPEC),(cd $(root_dir) && $(MAKE) SPEC=$(spec) \
-	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
-
-    .PHONY: $(all_phony_targets)
-
+  # In Cygwin, the MAKE variable gets messed up if the make executable is called with
+  # a Windows mixed path (c:/cygwin/bin/make.exe). If that's the case, fix it by removing
+  # the prepended root_dir.
+  ifneq ($(findstring :, $(MAKE)), )
+    MAKE := $(patsubst $(root_dir)%, %, $(MAKE))
   endif
+
+  # We are potentially building multiple configurations.
+  # First, find out the valid targets
+  # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
+  # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
+  all_phony_targets := $(sort $(filter-out $(global_targets), $(strip $(shell \
+      cd $(root_dir)/make && $(MAKE) -f Main.gmk -p -q FRC SPEC=$(firstword $(SPEC)) | \
+      grep "^.PHONY:" | head -n 1 | cut -d " " -f 2-))))
+
+  # Loop through the configurations and call the main-wrapper for each one. The wrapper
+  # target will execute with a single configuration loaded.
+  $(all_phony_targets):
+	@$(if $(TARGET_RUN),,\
+          $(foreach spec,$(SPEC),\
+            (cd $(root_dir) && $(MAKE) SPEC=$(spec) MAIN_TARGETS="$(call GetRealTarget)" \
+	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) main-wrapper) &&) true)
+	@echo > /dev/null
+	$(eval TARGET_RUN=true)
+
+  .PHONY: $(all_phony_targets)
+
+  ifneq ($(MAIN_TARGETS), )
+    # The wrapper target was called so we now have a single configuration. Load the spec file
+    # and call the real Main.gmk.
+    include $(SPEC)
+
+    ### Clean up from previous run
+    # Remove any build.log from a previous run, if they exist
+    ifneq (,$(BUILD_LOG))
+      ifneq (,$(BUILD_LOG_PREVIOUS))
+        # Rotate old log
+        $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
+        $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
+      else
+        $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
+      endif
+      $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
+    endif
+    # Remove any javac server logs and port files. This
+    # prevents a new make run to reuse the previous servers.
+    ifneq (,$(SJAVAC_SERVER_DIR))
+      $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
+    endif
+
+    main-wrapper:
+	@$(if $(findstring clean, $(MAIN_TARGETS)), , $(call AtMakeStart))
+	(cd $(root_dir)/make && $(BUILD_LOG_WRAPPER) $(MAKE) -f Main.gmk SPEC=$(SPEC) -j $(JOBS) \
+	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $(MAIN_TARGETS) \
+	    $(if $(filter true, $(OUTPUT_SYNC_SUPPORTED)), -O$(OUTPUT_SYNC)))
+	@$(if $(findstring clean, $(MAIN_TARGETS)), , $(call AtMakeEnd))
+
+     .PHONY: main-wrapper
+
+   endif
 endif
 
 # Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
-# If you addd more global targets, please update the variable global_targets in MakeHelpers.
+# If you add more global targets, please update the variable global_targets in MakeHelpers.
 
 help:
 	$(info )
@@ -88,12 +129,12 @@ help:
 	$(info =====================)
 	$(info )
 	$(info Common make targets)
-	$(info .  make [default]         # Compile all product in langtools, hotspot, jaxp, jaxws,)
-	$(info .                         # corba and jdk)
-	$(info .  make all               # Compile everything, all repos and images)
+	$(info .  make [default]         # Compile all modules in langtools, hotspot, jaxp, jaxws,)
+	$(info .                         # corba and jdk and create a runnable "exploded" image)
+	$(info .  make all               # Compile everything, all repos, docs and images)
 	$(info .  make images            # Create complete j2sdk and j2re images)
-	$(info .  make docs              # Create javadocs)
-	$(info .  make overlay-images    # Create limited images for sparc 64 bit platforms)
+	$(info .  make docs              # Create all docs)
+	$(info .  make docs-javadoc      # Create just javadocs, depends on less than full docs)
 	$(info .  make profiles          # Create complete j2re compact profile images)
 	$(info .  make bootcycle-images  # Build images twice, second time with newly build JDK)
 	$(info .  make install           # Install the generated images locally)
@@ -103,12 +144,18 @@ help:
 	$(info .  make help              # Give some help on using make)
 	$(info .  make test              # Run tests, default is all tests (see TEST below))
 	$(info )
-	$(info Targets for specific components)
-	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
-	$(info .  make <component>       # Build <component> and everything it depends on. )
-	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
+	$(info Targets for specific modules)
+	$(info .  make <module>          # Build <module> and everything it depends on. )
+	$(info .  make <module>-only     # Build <module> only, without dependencies. This)
 	$(info .                         # is faster but can result in incorrect build results!)
-	$(info .  make clean-<component> # Remove files generated by make for <component>)
+	$(info .  make <module>-java     # Compile java classes for <module> and everything it)
+	$(info .                         # depends on)
+	$(info .  make <module>-libs     # Build native libraries for <module> and everything it)
+	$(info .                         # depends on)
+	$(info .  make <module>-launchers# Build native executables for <module> and everything it)
+	$(info .                         # depends on)
+	$(info .  make <module>-gensrc   # Execute the gensrc step for <module> and everything it)
+	$(info .                         # depends on)
 	$(info )
 	$(info Useful make variables)
 	$(info .  make CONF=             # Build all configurations (note, assignment is empty))

common/autoconf/basics.m4

@@ -759,6 +759,32 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
   fi
 ])
 
+AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
+[
+  # Check if make supports the output sync option and if so, setup using it.
+  AC_MSG_CHECKING([if make --output-sync is supported])
+  if $MAKE --version -O > /dev/null 2>&1; then
+    OUTPUT_SYNC_SUPPORTED=true
+    AC_MSG_RESULT([yes])
+    AC_MSG_CHECKING([for output-sync value])
+    AC_ARG_WITH([output-sync], [AS_HELP_STRING([--with-output-sync],
+      [set make output sync type if supported by make. @<:@recurse@:>@])],
+      [OUTPUT_SYNC=$with_output_sync])
+    if test "x$OUTPUT_SYNC" = "x"; then
+      OUTPUT_SYNC=none
+    fi
+    AC_MSG_RESULT([$OUTPUT_SYNC])
+    if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then
+      AC_MSG_ERROR([Make did not the support the value $OUTPUT_SYNC as output sync type.])
+    fi
+  else
+    OUTPUT_SYNC_SUPPORTED=false
+    AC_MSG_RESULT([no])
+  fi
+  AC_SUBST(OUTPUT_SYNC_SUPPORTED)
+  AC_SUBST(OUTPUT_SYNC)
+])
+
 # Goes looking for a usable version of GNU make.
 AC_DEFUN([BASIC_CHECK_GNU_MAKE],
 [
@@ -805,6 +831,8 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE],
   MAKE=$FOUND_MAKE
   AC_SUBST(MAKE)
   AC_MSG_NOTICE([Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)])
+
+  BASIC_CHECK_MAKE_OUTPUT_SYNC
 ])
 
 AC_DEFUN([BASIC_CHECK_FIND_DELETE],

common/autoconf/boot-jdk.m4

@@ -401,4 +401,10 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
 
   JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small
   AC_SUBST(JAVA_FLAGS_SMALL)
+
+  JAVA_TOOL_FLAGS_SMALL=""
+  for f in $JAVA_FLAGS_SMALL; do
+    JAVA_TOOL_FLAGS_SMALL="$JAVA_TOOL_FLAGS_SMALL -J$f"
+  done
+  AC_SUBST(JAVA_TOOL_FLAGS_SMALL)
 ])

common/autoconf/compare.sh.in

@@ -45,7 +45,7 @@ EXPR="@EXPR@"
 FILE="@FILE@"
 FIND="@FIND@"
 GREP="@GREP@"
-JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap"
+JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
 LDD="@LDD@"
 MKDIR="@MKDIR@"
 NAWK="@NAWK@"

common/autoconf/flags.m4

@@ -668,12 +668,9 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
 
   # Setup some hard coded includes
   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
-      -I${JDK_OUTPUTDIR}/include \
-      -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
-      -I${JDK_TOPDIR}/src/share/javavm/export \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
-      -I${JDK_TOPDIR}/src/share/native/common \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
+      -I${JDK_TOPDIR}/src/java.base/share/native/include \
+      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
+      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_API_DIR/native/include"
 
   # The shared libraries are compiled using the picflag.
   CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"

common/autoconf/generated-configure.sh

@@ -805,6 +805,7 @@ JAXWS_TOPDIR
 JAXP_TOPDIR
 CORBA_TOPDIR
 LANGTOOLS_TOPDIR
+JAVA_TOOL_FLAGS_SMALL
 JAVA_FLAGS_SMALL
 JAVA_FLAGS_BIG
 JAVA_FLAGS
@@ -865,6 +866,8 @@ LDD
 ZIP
 UNZIP
 FIND_DELETE
+OUTPUT_SYNC
+OUTPUT_SYNC_SUPPORTED
 MAKE
 CHECK_TOOLSDIR_MAKE
 CHECK_TOOLSDIR_GMAKE
@@ -1044,6 +1047,7 @@ with_toolchain_path
 with_extra_path
 with_sdk_name
 with_conf_name
+with_output_sync
 with_builddeps_conf
 with_builddeps_server
 with_builddeps_dir
@@ -1881,6 +1885,8 @@ Optional Packages:
   --with-sdk-name         use the platform SDK of the given name. [macosx]
   --with-conf-name        use this as the name of the configuration [generated
                           from important configuration options]
+  --with-output-sync      set make output sync type if supported by make.
+                          [recurse]
   --with-builddeps-conf   use this configuration file for the builddeps
   --with-builddeps-server download and use build dependencies from this server
                           url
@@ -3487,6 +3493,8 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # $2: the description on how we found this
 
 
+
+
 # Goes looking for a usable version of GNU make.
 
 
@@ -4311,7 +4319,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1405336663
+DATE_WHEN_GENERATED=1407143049
 
 ###############################################################################
 #
@@ -13924,7 +13932,7 @@ $as_echo "$COMPILE_TYPE" >&6; }
 
   # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
   if test "x$OPENJDK_TARGET_OS_API" = xposix; then
-    OPENJDK_TARGET_OS_API_DIR="solaris"
+    OPENJDK_TARGET_OS_API_DIR="unix"
   fi
   if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
     OPENJDK_TARGET_OS_API_DIR="windows"
@@ -17147,6 +17155,39 @@ $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
 $as_echo "$as_me: Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)" >&6;}
 
 
+  # Check if make supports the output sync option and if so, setup using it.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if make --output-sync is supported" >&5
+$as_echo_n "checking if make --output-sync is supported... " >&6; }
+  if $MAKE --version -O > /dev/null 2>&1; then
+    OUTPUT_SYNC_SUPPORTED=true
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for output-sync value" >&5
+$as_echo_n "checking for output-sync value... " >&6; }
+
+# Check whether --with-output-sync was given.
+if test "${with_output_sync+set}" = set; then :
+  withval=$with_output_sync; OUTPUT_SYNC=$with_output_sync
+fi
+
+    if test "x$OUTPUT_SYNC" = "x"; then
+      OUTPUT_SYNC=none
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_SYNC" >&5
+$as_echo "$OUTPUT_SYNC" >&6; }
+    if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then
+      as_fn_error $? "Make did not the support the value $OUTPUT_SYNC as output sync type." "$LINENO" 5
+    fi
+  else
+    OUTPUT_SYNC_SUPPORTED=false
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+
+
+
+
+
 
   # Test if find supports -delete
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5
@@ -19866,8 +19907,6 @@ fi
 
   if test "x$with_cacerts_file" != x; then
     CACERTS_FILE=$with_cacerts_file
-  else
-    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
   fi
 
 
@@ -26378,6 +26417,12 @@ $as_echo "$boot_jdk_jvmargs_small" >&6; }
   JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small
 
 
+  JAVA_TOOL_FLAGS_SMALL=""
+  for f in $JAVA_FLAGS_SMALL; do
+    JAVA_TOOL_FLAGS_SMALL="$JAVA_TOOL_FLAGS_SMALL -J$f"
+  done
+
+
 
 ###############################################################################
 #
@@ -42285,12 +42330,9 @@ fi
 
   # Setup some hard coded includes
   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
-      -I${JDK_OUTPUTDIR}/include \
-      -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
-      -I${JDK_TOPDIR}/src/share/javavm/export \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
-      -I${JDK_TOPDIR}/src/share/native/common \
-      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
+      -I${JDK_TOPDIR}/src/java.base/share/native/include \
+      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
+      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_API_DIR/native/include"
 
   # The shared libraries are compiled using the picflag.
   CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
@@ -49120,7 +49162,7 @@ fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
 $as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
 
-    if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+    if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
       ENABLE_INTREE_EC=yes
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }

common/autoconf/jdk-options.m4

@@ -414,8 +414,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
       [specify alternative cacerts file])])
   if test "x$with_cacerts_file" != x; then
     CACERTS_FILE=$with_cacerts_file
-  else
-    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
   fi
   AC_SUBST(CACERTS_FILE)
 
@@ -441,7 +439,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   [
     AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
 
-    if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+    if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
       ENABLE_INTREE_EC=yes
       AC_MSG_RESULT([yes])
     else

common/autoconf/platform.m4

@@ -331,7 +331,7 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
 
   # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
   if test "x$OPENJDK_TARGET_OS_API" = xposix; then
-    OPENJDK_TARGET_OS_API_DIR="solaris"
+    OPENJDK_TARGET_OS_API_DIR="unix"
   fi
   if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
     OPENJDK_TARGET_OS_API_DIR="windows"

common/autoconf/spec.gmk.in

@@ -74,6 +74,9 @@ ifeq (,$(findstring -I @TOPDIR@/make/common,$(MAKE)))
   MAKE:=$(MAKE) -I @TOPDIR@/make/common
 endif
 
+OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@
+OUTPUT_SYNC:=@OUTPUT_SYNC@
+
 # The "human readable" name of this configuration
 CONF_NAME:=@CONF_NAME@
 
@@ -240,6 +243,7 @@ HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
 NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn
 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
+TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/testmake
 
 LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist
 CORBA_DIST=$(CORBA_OUTPUTDIR)/dist
@@ -446,6 +450,7 @@ POST_MCS_CMD:=@POST_MCS_CMD@
 JAVA_FLAGS:=@JAVA_FLAGS@
 JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@
 JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@
+JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@
 
 JAVA=@FIXPATH@ @JAVA@ $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
 JAVA_SMALL=@FIXPATH@ @JAVA@ $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
@@ -459,7 +464,7 @@ JAVAH:=@FIXPATH@ @JAVAH@
 
 JAR:=@FIXPATH@ @JAR@
 
-NATIVE2ASCII:=@FIXPATH@ @NATIVE2ASCII@ $(addprefix -J, $(JAVA_FLAGS_SMALL))
+NATIVE2ASCII:=@FIXPATH@ @NATIVE2ASCII@ $(JAVA_TOOL_FLAGS_SMALL)
 
 JARSIGNER:=@FIXPATH@ @JARSIGNER@
 

common/bin/compare.sh

@@ -93,14 +93,16 @@ diff_text() {
     fi
     # Ignore date strings in class files.
     # On Macosx the system sources for generated java classes produce different output on 
-    # consequtive invokations seemingly randomly.
+    # consequtive invocations seemingly randomly.
     # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this.
+    # Anonymous lambda classes get randomly assigned counters in their names.
     if test "x$SUFFIX" = "xclass"; then
         # To improve performance when large diffs are found, do a rough filtering of classes
         # elibeble for these exceptions
         if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \
 	        -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \
-	        -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
+	        -e thePoint -e aPoint -e setItemsPtr \
+                -e 'lambda\$[a-zA-Z0-9]*\$[0-9]' ${THIS_FILE} > /dev/null; then
             $JAVAP -c -constants -l -p ${OTHER_FILE} >  ${OTHER_FILE}.javap
             $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
             TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
@@ -109,7 +111,8 @@ diff_text() {
 		     -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \
  	             -e '/[<>].*Point   Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
 	             -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
-	             -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
+	             -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d' \
+                     -e '/[<>].*lambda\$[a-zA-Z0-9]*\$[0-9]*/d')
         fi
     fi
     if test "x$SUFFIX" = "xproperties"; then
@@ -122,7 +125,16 @@ diff_text() {
 #            -e :a -e '/\\$/N; s/\\\n//; ta' \
 #  	    -e 's/^[ \t]*//;s/[ \t]*$//' \
 #	    -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned
-        TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
+        # Filter out date string differences.
+        TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE | \
+            $GREP '^[<>]' | \
+            $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d')
+    fi
+    if test "x$SUFFIX" = "xMF"; then
+        # Filter out date string differences.
+        TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
+            $GREP '^[<>]' | \
+            $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d')
     fi
     if test -n "$TMP"; then
         echo Files $OTHER_FILE and $THIS_FILE differ
@@ -145,7 +157,7 @@ compare_dirs() {
     (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other)
     (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this)
 
-    $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_other > $WORK_DIR/dirs_diff
+    $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_this > $WORK_DIR/dirs_diff
     
     echo -n Directory structure...
     if [ -s $WORK_DIR/dirs_diff ]; then
@@ -251,8 +263,8 @@ compare_file_types() {
     do
         if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
         if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
-        OF=`cd ${OTHER_DIR} && $FILE -h $f`
-        TF=`cd ${THIS_DIR} && $FILE -h $f`
+        OF=`cd ${OTHER_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'`
+        TF=`cd ${THIS_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'`
         if [ "$f" = "./src.zip" ] || [[ "$f" = *"/Home/src.zip" ]] || [[ "$f" = *"/lib/JObjC.jar" ]]
         then
 	    if [ "`echo $OF | $GREP -ic zip`" -gt 0 -a "`echo $TF | $GREP -ic zip`" -gt 0 ]
@@ -317,12 +329,14 @@ compare_general_files() {
                                           -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \
                                           -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \
                                           -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
+                                          -e 's/^\(.*\)\( o'"'"'clock \)\([A-Z][A-Z][A-Z]\)/(removed)\2(removed)/' \
                     > $OTHER_FILE
                 $CAT $THIS_DIR/$f  | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
                                           -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \
                                           -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \
                                           -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \
                                           -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
+                                          -e 's/^\(.*\)\( o'"'"'clock \)\([A-Z][A-Z][A-Z]\)/(removed)\2(removed)/' \
                     > $THIS_FILE
             else
                 OTHER_FILE=$OTHER_DIR/$f
@@ -510,7 +524,8 @@ compare_all_jar_files() {
     WORK_DIR=$3
 
     # TODO filter?
-    ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" | $SORT | $FILTER)
+    ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" \
+        | $SORT | $FILTER)
 
     if [ -n "$ZIPS" ]; then
         echo Jar files...
@@ -538,9 +553,14 @@ compare_bin_file() {
     OTHER_DIR=$2
     WORK_DIR=$3
     BIN_FILE=$4
+    OTHER_BIN_FILE=$5
 
     THIS_FILE=$THIS_DIR/$BIN_FILE
-    OTHER_FILE=$OTHER_DIR/$BIN_FILE
+    if [ -n "$OTHER_BIN_FILE" ]; then
+        OTHER_FILE=$OTHER_DIR/$OTHER_BIN_FILE
+    else
+        OTHER_FILE=$OTHER_DIR/$BIN_FILE
+    fi
     NAME=$(basename $BIN_FILE)
     WORK_FILE_BASE=$WORK_DIR/$BIN_FILE
     FILE_WORK_DIR=$(dirname $WORK_FILE_BASE)
@@ -970,6 +990,8 @@ if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1
     echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
     echo ""
     echo "-2zips <file1> <file2> Compare two zip files only"
+    echo "-2bins <file1> <file2> Compare two binary files only"
+    echo "-2dirs <dir1> <dir2> Compare two directories as if they were images"
     echo ""
     exit 10
 fi
@@ -1032,6 +1054,15 @@ while [ -n "$1" ]; do
         -execs)
             CMP_EXECS=true
             ;;
+        -2dirs)
+            THIS="$(cd "$2" && pwd )"
+            OTHER="$(cd "$3" && pwd )"
+            THIS_BASE_DIR="$THIS"
+            OTHER_BASE_DIR="$OTHER"
+            SKIP_DEFAULT=true
+            shift
+            shift
+            ;;
         -2zips)
             CMP_2_ZIPS=true
             THIS_FILE=$2
@@ -1039,6 +1070,13 @@ while [ -n "$1" ]; do
             shift
             shift
             ;;
+        -2bins)
+            CMP_2_BINS=true
+            THIS_FILE=$2
+            OTHER_FILE=$3
+            shift
+            shift
+            ;;
         *)
             CMP_NAMES=false
             CMP_PERMS=false
@@ -1069,6 +1107,18 @@ if [ "$CMP_2_ZIPS" = "true" ]; then
     exit
 fi
 
+if [ "$CMP_2_BINS" = "true" ]; then
+    THIS_DIR="$(dirname $THIS_FILE)"
+    THIS_DIR="$(cd "$THIS_DIR" && pwd )"
+    OTHER_DIR="$(dirname $OTHER_FILE)"
+    OTHER_DIR="$(cd "$OTHER_DIR" && pwd )"
+    THIS_FILE_NAME="$(basename $THIS_FILE)"
+    OTHER_FILE_NAME="$(basename $OTHER_FILE)"
+    echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
+    compare_bin_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2bins $THIS_FILE_NAME $OTHER_FILE_NAME
+    exit
+fi
+
 if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then
     CMP_NAMES=true
     CMP_PERMS=true
@@ -1084,151 +1134,154 @@ if [ -z "$FILTER" ]; then
     FILTER="$CAT"
 fi
 
-if [ -z "$OTHER" ]; then
-    OTHER="$THIS/../$LEGACY_BUILD_DIR"
-    if [ -d "$OTHER" ]; then
+if [ "$SKIP_DEFAULT" != "true" ]; then
+    if [ -z "$OTHER" ]; then
+        OTHER="$THIS/../$LEGACY_BUILD_DIR"
+        if [ -d "$OTHER" ]; then
+            OTHER="$( cd "$OTHER" && pwd )"
+        else
+            echo "Default old build directory does not exist:"
+            echo "$OTHER"
+            exit 1
+        fi
+        echo "Comparing to default old build:"
+        echo "$OTHER"
+        echo
+    else
+        if [ ! -d "$OTHER" ]; then
+            echo "Other build directory does not exist:"
+            echo "$OTHER"
+            exit 1
+        fi
         OTHER="$( cd "$OTHER" && pwd )"
-    else
-        echo "Default old build directory does not exist:"
+        echo "Comparing to:"
         echo "$OTHER"
-        exit 1
+        echo
     fi
-    echo "Comparing to default old build:"
-    echo "$OTHER"
-    echo
-else
-    if [ ! -d "$OTHER" ]; then
-        echo "Other build directory does not exist:"
-        echo "$OTHER"
-        exit 1
-    fi
-    OTHER="$( cd "$OTHER" && pwd )"
-    echo "Comparing to:"
-    echo "$OTHER"
-    echo
-fi
 
 
-# Figure out the layout of the this build. Which kinds of images have been produced
-if [ -d "$THIS/install/j2sdk-image" ]; then
-    THIS_J2SDK="$THIS/install/j2sdk-image"
-    THIS_J2RE="$THIS/install/j2re-image"
-    echo "Selecting install images in this build"
-elif [ -d "$THIS/deploy/j2sdk-image" ]; then
-    THIS_J2SDK="$THIS/deploy/j2sdk-image"
-    THIS_J2RE="$THIS/deploy/j2re-image"
-    echo "Selecting deploy images in this build"
-elif [ -d "$THIS/images/j2sdk-image" ]; then
-    THIS_J2SDK="$THIS/images/j2sdk-image"
-    THIS_J2RE="$THIS/images/j2re-image"
-    echo "Selecting jdk images in this build"
-fi
-
-if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
+    # Figure out the layout of the this build. Which kinds of images have been produced
     if [ -d "$THIS/install/j2sdk-image" ]; then
-        # If there is an install image, prefer that, it's also overlay
-        THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
-        THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
-        echo "Selecting install overlay images in this build"
-    else
-        THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
-        THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
-        echo "Selecting jdk overlay images in this build"
+        THIS_J2SDK="$THIS/install/j2sdk-image"
+        THIS_J2RE="$THIS/install/j2re-image"
+        echo "Selecting install images in this build"
+    elif [ -d "$THIS/deploy/j2sdk-image" ]; then
+        THIS_J2SDK="$THIS/deploy/j2sdk-image"
+        THIS_J2RE="$THIS/deploy/j2re-image"
+        echo "Selecting deploy images in this build"
+    elif [ -d "$THIS/images/j2sdk-image" ]; then
+        THIS_J2SDK="$THIS/images/j2sdk-image"
+        THIS_J2RE="$THIS/images/j2re-image"
+        echo "Selecting jdk images in this build"
     fi
-fi
 
-if [ -d "$THIS/images/j2sdk-bundle" ]; then
-    THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
-    THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
-    echo "Selecting bundles in this build"
-fi
-
-# Figure out the layout of the other build (old or new, normal or overlay image)
-if [ -d "$OTHER/j2sdk-image" ]; then
-    if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
-        OTHER_J2SDK="$OTHER/j2sdk-image"
-        OTHER_J2RE="$OTHER/j2re-image"
-        echo "Selecting old-style images in other build"
-    else
-        OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
-        OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
-        echo "Selecting overlay images in other build"
+    if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
+        if [ -d "$THIS/install/j2sdk-image" ]; then
+            # If there is an install image, prefer that, it's also overlay
+            THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
+            THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
+            echo "Selecting install overlay images in this build"
+        else
+            THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
+            THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
+            echo "Selecting jdk overlay images in this build"
+        fi
     fi
-elif [ -d "$OTHER/install/j2sdk-image" ]; then
-    OTHER_J2SDK="$OTHER/install/j2sdk-image"
-    OTHER_J2RE="$OTHER/install/j2re-image"
-    echo "Selecting install images in other build"
-elif [ -d "$OTHER/deploy/j2sdk-image" ]; then
-    OTHER_J2SDK="$OTHER/deploy/j2sdk-image"
-    OTHER_J2RE="$OTHER/deploy/j2re-image"
-    echo "Selecting deploy images in other build"
-elif [ -d "$OTHER/images/j2sdk-image" ]; then
-    OTHER_J2SDK="$OTHER/images/j2sdk-image"
-    OTHER_J2RE="$OTHER/images/j2re-image"
-    echo "Selecting jdk images in other build"
-fi
 
-if [ -d "$OTHER/j2sdk-bundle" ]; then
-    OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
-    OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
-    echo "Selecting bundles in other build"
-elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
-    OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
-    OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
-    echo "Selecting jdk bundles in other build"
-fi
+    if [ -d "$THIS/images/j2sdk-bundle" ]; then
+        THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
+        THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
+        echo "Selecting bundles in this build"
+    fi
 
-if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
-    if [ -z "$THIS_J2SDK_OVERLAY" ]; then
-        echo "Cannot locate images for this build. Are you sure you have run 'make images'?"
+    # Figure out the layout of the other build (old or new, normal or overlay image)
+    if [ -d "$OTHER/j2sdk-image" ]; then
+        if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
+            OTHER_J2SDK="$OTHER/j2sdk-image"
+            OTHER_J2RE="$OTHER/j2re-image"
+            echo "Selecting old-style images in other build"
+        else
+            OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
+            OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
+            echo "Selecting overlay images in other build"
+        fi
+    elif [ -d "$OTHER/install/j2sdk-image" ]; then
+        OTHER_J2SDK="$OTHER/install/j2sdk-image"
+        OTHER_J2RE="$OTHER/install/j2re-image"
+        echo "Selecting install images in other build"
+    elif [ -d "$OTHER/deploy/j2sdk-image" ]; then
+        OTHER_J2SDK="$OTHER/deploy/j2sdk-image"
+        OTHER_J2RE="$OTHER/deploy/j2re-image"
+        echo "Selecting deploy images in other build"
+    elif [ -d "$OTHER/images/j2sdk-image" ]; then
+        OTHER_J2SDK="$OTHER/images/j2sdk-image"
+        OTHER_J2RE="$OTHER/images/j2re-image"
+        echo "Selecting jdk images in other build"
+    fi
+
+    if [ -d "$OTHER/j2sdk-bundle" ]; then
+        OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
+        OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
+        echo "Selecting bundles in other build"
+    elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
+        OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
+        OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
+        echo "Selecting jdk bundles in other build"
+    fi
+    
+    if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
+        if [ -z "$THIS_J2SDK_OVERLAY" ]; then
+            echo "Cannot locate images for this build. Are you sure you have run 'make images'?"
+            exit 1
+        fi
+    fi
+
+    if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then
+        echo "OTHER build only has an overlay image while this build does not. Nothing to compare!"
         exit 1
     fi
-fi
 
-if [ -z "$OTHER_J2SDK" ] && [ -n "$OTHER_J2SDK_OVERLAY" ] && [ -z "$THIS_J2SDK_OVERLAY" ]; then
-    echo "OTHER build only has an overlay image while this build does not. Nothing to compare!"
-    exit 1
-fi
-
-if [ -z "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
-    echo "WARNING! OTHER build has bundles built while this build does not."
-    echo "Skipping bundle compare!"
-fi
-
-if [ -d "$THIS/docs" ]; then
-    THIS_DOCS="$THIS/docs"
-fi
-
-if [ -d "$OTHER/docs" ]; then
-    OTHER_DOCS="$OTHER/docs"
-fi
-
-if [ -z "$THIS_DOCS" ]; then
-    echo "WARNING! Docs haven't been built and won't be compared."
-fi
-
-if [ -z "$OTHER_DOCS" ]; then
-    echo "WARNING! Other build doesn't contain docs, skipping doc compare."
-fi
-
-if [ -d "$OTHER/images" ]; then
-    OTHER_SEC_DIR="$OTHER/images"
-else
-    OTHER_SEC_DIR="$OTHER/tmp"
-fi
-OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
-THIS_SEC_DIR="$THIS/images"
-THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
-if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-    if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
-        JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
-    else
-        JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
+    if [ -z "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
+        echo "WARNING! OTHER build has bundles built while this build does not."
+        echo "Skipping bundle compare!"
     fi
-    OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
-    OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
-    THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
-    THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
+
+    if [ -d "$OTHER/images" ]; then
+        OTHER_SEC_DIR="$OTHER/images"
+    else
+        OTHER_SEC_DIR="$OTHER/tmp"
+    fi
+    OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
+    THIS_SEC_DIR="$THIS/images"
+    THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
+    if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+        if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
+            JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
+        else
+            JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
+        fi
+        OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
+        OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
+        THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
+        THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
+    fi
+
+    if [ -d "$THIS/docs" ]; then
+        THIS_DOCS="$THIS/docs"
+    fi
+
+    if [ -d "$OTHER/docs" ]; then
+        OTHER_DOCS="$OTHER/docs"
+    fi
+
+    if [ -z "$THIS_DOCS" ]; then
+        echo "WARNING! Docs haven't been built and won't be compared."
+    fi
+
+    if [ -z "$OTHER_DOCS" ]; then
+        echo "WARNING! Other build doesn't contain docs, skipping doc compare."
+    fi
+
 fi
 
 ##########################################################################################
@@ -1274,6 +1327,10 @@ if [ "$CMP_NAMES" = "true" ]; then
         echo -n "Docs "
         compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_dirs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+        compare_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_PERMS" = "true" ]; then
@@ -1295,6 +1352,9 @@ if [ "$CMP_PERMS" = "true" ]; then
         echo -n "J2RE  Bundle "
         compare_permissions $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_TYPES" = "true" ]; then
@@ -1316,6 +1376,9 @@ if [ "$CMP_TYPES" = "true" ]; then
         echo -n "J2RE  Bundle "
         compare_file_types $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_file_types $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_GENERAL" = "true" ]; then
@@ -1341,6 +1404,9 @@ if [ "$CMP_GENERAL" = "true" ]; then
         echo -n "Docs "
         compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_general_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_ZIPS" = "true" ]; then
@@ -1365,12 +1431,18 @@ if [ "$CMP_ZIPS" = "true" ]; then
             compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN
         fi
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_all_zip_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_JARS" = "true" ]; then
     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
         compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_all_jar_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_LIBS" = "true" ]; then
@@ -1386,6 +1458,9 @@ if [ "$CMP_LIBS" = "true" ]; then
         echo -n "Bundle   "
         compare_all_libs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 if [ "$CMP_EXECS" = "true" ]; then
@@ -1396,6 +1471,9 @@ if [ "$CMP_EXECS" = "true" ]; then
         echo -n "Overlay "
         compare_all_execs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
     fi
+    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+        compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+    fi
 fi
 
 echo

common/bin/unshuffle_patch.sh

@@ -0,0 +1,196 @@
+#!/bin/sh
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Script for updating a patch file as per the shuffled/unshuffled source location.
+
+usage() {
+      echo "Usage: $0 [-h|--help] [-v|--verbose] <repo> <input_patch> <output_patch>"
+      echo "where:"
+      echo "  <repo>          is one of: corba, jaxp, jaxws, jdk, langtools, nashorn"
+      echo "                  [Note: patches from other repos do not need updating]"
+      echo "  <input_patch>   is the input patch file, that needs shuffling/unshuffling"
+      echo "  <output_patch>  is the updated patch file "
+      echo " "
+      exit 1
+}
+
+SCRIPT_DIR=`pwd`/`dirname $0`
+UNSHUFFLE_LIST=$SCRIPT_DIR"/unshuffle_list.txt"
+
+if [ ! -f "$UNSHUFFLE_LIST" ] ; then
+  echo "FATAL: cannot find $UNSHUFFLE_LIST"
+  exit 1
+fi
+
+vflag="false"
+while [ $# -gt 0 ]
+do
+  case $1 in
+    -h | --help )
+      usage
+      ;;
+
+    -v | --verbose )
+      vflag="true"
+      ;;
+
+    -*)  # bad option
+      usage
+      ;;
+
+     * )  # non option
+      break
+      ;;
+  esac
+  shift
+done
+
+# Make sure we have the right number of arguments
+if [ ! $# -eq 3 ] ; then
+  echo "ERROR: Invalid number of arguments."
+  usage
+fi
+
+# Check the given repo
+repos="corba jaxp jaxws jdk langtools nashorn"
+repo="$1"
+found="false"
+for r in $repos ; do
+  if [ $repo = "$r" ] ; then
+    found="true"
+    break;
+  fi 
+done
+if [ $found = "false" ] ; then
+  echo "ERROR: Unknown repo: $repo. Should be one of [$repos]."
+  usage
+fi
+
+# Check given input/output files
+input="$2"
+output="$3"
+
+if [ ! -f $input ] ; then
+  echo "ERROR: Cannot find input patch file: $input"
+  exit 1
+fi
+
+if [ -f $output ] ; then
+  echo "ERROR: Output patch already exists: $output"
+  exit 1
+fi
+
+what=""  ## shuffle or unshuffle
+
+verbose() {
+  if [ ${vflag} = "true" ] ; then
+    echo "$@"
+  fi
+}
+
+unshuffle() {
+  line=$@
+  verbose "Attempting to rewrite: \"$line\""
+
+  # Retrieve the file name
+  path=
+  if echo "$line" | egrep '^diff' > /dev/null ; then
+    if ! echo "$line" | egrep '\-\-git' > /dev/null ; then
+      echo "ERROR: Only git patches supported. Please use 'hg export --git ...'."
+      exit 1
+    fi
+    path="`echo "$line" | sed -e s@'diff --git a/'@@ -e s@' b/.*$'@@`"
+  elif echo "$line" | egrep '^\-\-\-' > /dev/null ; then
+    path="`echo "$line" | sed -e s@'--- a/'@@`"
+  elif echo "$line" | egrep '^\+\+\+' > /dev/null ; then
+    path="`echo "$line" | sed s@'+++ b/'@@`"
+  fi
+  verbose "Extracted path: \"$path\""
+
+  # Only source can be shuffled, or unshuffled
+  if ! echo "$path" | egrep '^src/.*' > /dev/null ; then
+    verbose "Not a src path, skipping."
+    echo "$line" >> $output
+    return
+  fi
+
+  # Shuffle or unshuffle?
+  if [ "${what}" = "" ] ; then
+    if echo "$path" | egrep '^src/java\..*|^src/jdk\..*' > /dev/null ; then
+      what="unshuffle"
+    else
+      what="shuffle"
+    fi
+    verbose "Shuffle or unshuffle: $what"
+  fi
+
+  # Find the most specific matches in the shuffle list
+  matches=
+  matchpath="$repo"/"$path"/x
+  while [ "$matchpath" != "" ] ; do
+    matchpath="`echo $matchpath | sed s@'\(.*\)/.*$'@'\1'@`"
+
+    if [ "${what}" =  "shuffle" ] ; then
+      pattern=": $matchpath$"
+    else
+      pattern="^$matchpath :"
+    fi
+    verbose "Attempting to find \"$matchpath\""
+    matches=`egrep "$pattern" "$UNSHUFFLE_LIST"`
+    if ! [ "x${matches}" = "x" ] ; then
+      verbose "Got matches: [$matches]"
+      break;
+    fi
+
+    if ! echo "$matchpath" | egrep '.*/.*' > /dev/null ; then
+      break;
+    fi
+  done
+
+  # Rewrite the line, if we have a match
+  if ! [ "x${matches}" = "x" ] ; then
+    shuffled="`echo "$matches" | sed -e s@' : .*'@@g -e s@'^[a-z]*\/'@@`"
+    unshuffled="`echo "$matches" | sed -e s@'.* : '@@g -e s@'^[a-z]*\/'@@`"
+    if [ "${what}" =  "shuffle" ] ; then
+      newline="`echo "$line" | sed -e s@"$unshuffled"@"$shuffled"@g`"
+    else
+      newline="`echo "$line" | sed -e s@"$shuffled"@"$unshuffled"@g`"
+    fi
+    verbose "Rewriting to \"$newline\""
+    echo "$newline" >> $output
+  else
+    echo "WARNING: no match found for $path"
+    echo "$line" >> $output
+  fi
+}
+
+while IFS= read -r line
+do
+  if echo "$line" | egrep '^diff|^\-\-\-|^\+\+\+' > /dev/null ; then
+    unshuffle "$line"
+  else
+    printf "%s\n" "$line" >> $output
+  fi
+done < "$input"
+

corba/.hgtags

@@ -268,3 +268,4 @@ ddc07abf4307855c0dc904cc5c96cc764023a930 jdk9-b22
 57735d66face054440a63ce99789eac5a5ee1dfd jdk9-b23
 8a44142bb7fc8118f70f91a1b97c12dfc50563ee jdk9-b24
 da08cca6b97f41b7081a3e176dcb400af6e4bb26 jdk9-b25
+6c777df597bbf5abba3488d44c401edfe73c74af jdk9-b26

corba/make/CompileCorba.gmk

@@ -34,53 +34,31 @@ include CommonCorba.gmk
 
 ################################################################################
 
-$(eval $(call SetupJavaCompilation,BUILD_CORBA, \
-    SETUP := GENERATE_NEWBYTECODE, \
-    SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc, \
+$(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \
+    SETUP := GENERATE_OLDBYTECODE, \
+    SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes \
+      $(CORBA_TOPDIR)/src/jdk.rmic/share/classes \
+      $(CORBA_OUTPUTDIR)/gensrc/java.corba, \
     EXCLUDES := com/sun/corba/se/PortableActivationIDL, \
     EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
         com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
-        com/sun/org/omg/CORBA/IDLTypeOperations.java \
-        com/sun/org/omg/CORBA/IRObjectOperations.java \
         org/omg/PortableInterceptor/UNKNOWN.java \
         com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
         com/sun/corba/se/impl/presentation/rmi/jndi.properties, \
     COPY := .prp, \
     CLEAN := .properties, \
-    BIN := $(CORBA_OUTPUTDIR)/classes, \
-    JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
-
-# For the interim version, don't bother cleaning the properties.
-$(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \
-    SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(BUILD_CORBA_SRC), \
-    EXCLUDES := $(BUILD_CORBA_EXCLUDES), \
-    EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \
-    COPY := $(BUILD_CORBA_COPY) $(BUILD_CORBA_CLEAN), \
     BIN := $(CORBA_OUTPUTDIR)/interim_classes, \
     JAR := $(INTERIM_CORBA_JAR)))
 
-# Separate src.zip call to include sources that were excluded in the build to
-# mimic behavior in old build system.
-$(eval $(call SetupZipArchive,ARCHIVE_CORBA_SRC, \
-    SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc, \
-    ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip))
-
 ################################################################################
-# Create bin.zip containing the corba specific binaries: orb.idl, ir.idl
-BIN_FILES := $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \
-    $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl
+# Copy idl files straight to jdk/lib. Not sure if this is the right way to do
+# it, but we are moving away from the one repo at a time build. Perhaps we should
+# scrap the 'jdk' prefix to bin, lib etc?
+$(JDK_OUTPUTDIR)/lib/%: $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/%
+	$(install-file)
 
-$(CORBA_OUTPUTDIR)/dist/lib/bin.zip: $(BIN_FILES)
-	$(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib
-	$(MKDIR) -p $(CORBA_OUTPUTDIR)/lib
-	$(RM) -f $@
-	$(ECHO) Creating `basename $@`
-	$(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib
-	$(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/*
-	(cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
+IDL_TARGET_FILES := $(JDK_OUTPUTDIR)/lib/orb.idl $(JDK_OUTPUTDIR)/lib/ir.idl
 
 ################################################################################
 
-all: $(BUILD_CORBA) $(BUILD_INTERIM_CORBA) $(ARCHIVE_CORBA_SRC) \
-    $(CORBA_OUTPUTDIR)/dist/lib/bin.zip
+all: $(BUILD_INTERIM_CORBA) $(IDL_TARGET_FILES)

corba/make/GensrcCorba.gmk

@@ -34,7 +34,7 @@ include CommonCorba.gmk
 
 ################################################################################
 
-$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
+$(eval $(call SetupJavaCompilation,BUILD_TOOLS_CORBA, \
     SETUP := GENERATE_OLDBYTECODE, \
     SRC := $(CORBA_TOPDIR)/make/src/classes, \
     BIN := $(CORBA_OUTPUTDIR)/tools_classes))
@@ -44,7 +44,7 @@ TOOL_LOGUTIL_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/tools_classes \
 
 $(eval $(call SetupJavaCompilation,BUILD_IDLJ, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(CORBA_TOPDIR)/src/share/classes, \
+    SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \
     BIN := $(CORBA_OUTPUTDIR)/idlj_classes, \
     COPY := .prp, \
     INCLUDES := com/sun/tools/corba/se/idl, \
@@ -56,16 +56,16 @@ TOOL_IDLJ_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/idlj_classes \
 ################################################################################
 
 # Generate LogWrapper classes
-$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/%SystemException.java: \
-    $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
-    $(BUILD_TOOLS)
+$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/%SystemException.java: \
+    $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
+    $(BUILD_TOOLS_CORBA)
 	$(MKDIR) -p $(@D)
 	$(RM) -f $(@D)/_the_wrappers.d
 	$(ECHO) $(LOG_INFO) Generating class file from $*.mc
 	$(TOOL_LOGUTIL_CMD) make-class $< $(@D)
 
 # Generate LogWrapper properties file by concatening resource files
-$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/LogStrings.properties: \
+$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/LogStrings.properties: \
     $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \
     $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \
     $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \
@@ -80,8 +80,8 @@ $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/LogStrings.properties: \
 
 # The resources files are generated from lisp-like .mc files.
 $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: \
-    $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
-    $(BUILD_TOOLS)
+    $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
+    $(BUILD_TOOLS_CORBA)
 	$(MKDIR) -p $(@D)
 	$(RM) -f $(@D)/_the_wrappers.d
 	$(ECHO) $(LOG_INFO) Generating resource file from $*.mc
@@ -89,15 +89,15 @@ $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: \
 
 
 LOGWRAPPER_TARGETS := \
-    $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/ActivationSystemException.java \
-    $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/IORSystemException.java \
-    $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
-    $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/NamingSystemException.java \
-    $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/OMGSystemException.java \
-    $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
-    $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/POASystemException.java \
-    $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/UtilSystemException.java \
-    $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/LogStrings.properties
+    $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/ActivationSystemException.java \
+    $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/IORSystemException.java \
+    $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
+    $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/NamingSystemException.java \
+    $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/OMGSystemException.java \
+    $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
+    $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/POASystemException.java \
+    $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/UtilSystemException.java \
+    $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/LogStrings.properties
 
 ################################################################################
 # Build the IDLs.
@@ -213,8 +213,8 @@ IDL_DELETES := \
 
 $(eval $(call SetupIdlCompilation,BUILD_IDLS, \
     IDLJ := $(TOOL_IDLJ_CMD), \
-    SRC := $(CORBA_TOPDIR)/src/share/classes, \
-    BIN := $(CORBA_OUTPUTDIR)/gensrc, \
+    SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \
+    BIN := $(CORBA_OUTPUTDIR)/gensrc/java.corba, \
     EXCLUDES := com/sun/tools/corba/se/idl/% \
         org/omg/CORBA/% \
         com/sun/corba/se/GiopIDL/% \
@@ -229,12 +229,12 @@ $(BUILD_IDLS): $(BUILD_IDLJ)
 ################################################################################
 # zh_HK is just a copy of zh_TW
 
-$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \
-    $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
+$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \
+    $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
 	$(install-file)
 
 ################################################################################
 
 all: $(BUILD_IDLS) $(LOGWRAPPER_TARGETS) \
-    $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties
+    $(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties