--- a/doc/building.html Wed Jun 06 13:04:25 2018 -0700
+++ b/doc/building.html Wed Jun 06 13:16:12 2018 -0700
@@ -505,7 +505,7 @@
<ul>
<li><code>hotspot</code> - Build all of hotspot (but only hotspot)</li>
<li><code>hotspot-<variant></code> - Build just the specified jvm variant</li>
-<li><code>images</code> or <code>product-images</code> - Build the JRE and JDK images</li>
+<li><code>images</code> or <code>product-images</code> - Build the JDK image</li>
<li><code>docs</code> or <code>docs-image</code> - Build the documentation image</li>
<li><code>test-image</code> - Build the test image</li>
<li><code>all</code> or <code>all-images</code> - Build all images (product, docs and test)</li>
@@ -639,7 +639,7 @@
<p>OpenJDK contains two different ports for the aarch64 platform, one is the original aarch64 port from the <a href="http://openjdk.java.net/projects/aarch64-port">AArch64 Port Project</a> and one is a 64-bit version of the Oracle contributed ARM port. When targeting aarch64, by the default the original aarch64 port is used. To select the Oracle ARM 64 port, use <code>--with-cpu-port=arm64</code>. Also set the corresponding value (<code>aarch64</code> or <code>arm64</code>) to --with-abi-profile, to ensure a consistent build.</p>
<h3 id="verifying-the-build">Verifying the Build</h3>
<p>The build will end up in a directory named like <code>build/linux-arm-normal-server-release</code>.</p>
-<p>Inside this build output directory, the <code>images/jdk</code> and <code>images/jre</code> will contain the newly built JDK and JRE, respectively, for your <em>target</em> system.</p>
+<p>Inside this build output directory, the <code>images/jdk</code> will contain the newly built JDK, for your <em>target</em> system.</p>
<p>Copy these folders to your <em>target</em> system. Then you can run e.g. <code>images/jdk/bin/java -version</code>.</p>
<h2 id="build-performance">Build Performance</h2>
<p>Building OpenJDK requires a lot of horsepower. Some of the build tools can be adjusted to utilize more or less of resources such as parallel threads and memory. The <code>configure</code> script analyzes your system and selects reasonable values for such options based on your hardware. If you encounter resource problems, such as out of memory conditions, you can modify the detected values with:</p>
--- a/doc/building.md Wed Jun 06 13:04:25 2018 -0700
+++ b/doc/building.md Wed Jun 06 13:16:12 2018 -0700
@@ -747,7 +747,7 @@
* `hotspot` - Build all of hotspot (but only hotspot)
* `hotspot-<variant>` - Build just the specified jvm variant
- * `images` or `product-images` - Build the JRE and JDK images
+ * `images` or `product-images` - Build the JDK image
* `docs` or `docs-image` - Build the documentation image
* `test-image` - Build the test image
* `all` or `all-images` - Build all images (product, docs and test)
@@ -1039,8 +1039,8 @@
The build will end up in a directory named like
`build/linux-arm-normal-server-release`.
-Inside this build output directory, the `images/jdk` and `images/jre` will
-contain the newly built JDK and JRE, respectively, for your *target* system.
+Inside this build output directory, the `images/jdk` will contain the newly
+built JDK, for your *target* system.
Copy these folders to your *target* system. Then you can run e.g.
`images/jdk/bin/java -version`.
--- a/make/Bundles.gmk Wed Jun 06 13:04:25 2018 -0700
+++ b/make/Bundles.gmk Wed Jun 06 13:16:12 2018 -0700
@@ -146,19 +146,13 @@
# correct base directories.
ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
- JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
- JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home
JDK_BUNDLE_SUBDIR :=
- JRE_BUNDLE_SUBDIR :=
else
JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
- JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
- JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
ifneq ($(DEBUG_LEVEL), release)
JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
- JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
endif
endif
@@ -204,26 +198,6 @@
TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES))
- ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR))
-
- # Create special filter rules when dealing with unzipped .dSYM directories on
- # macosx
- ifeq ($(OPENJDK_TARGET_OS), macosx)
- ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
- JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
- $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES))))
- endif
- endif
-
- JRE_BUNDLE_FILES := $(filter-out \
- $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
- $(SYMBOLS_EXCLUDE_PATTERN), \
- $(ALL_JRE_FILES))
- JRE_SYMBOLS_BUNDLE_FILES := $(filter \
- $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
- $(SYMBOLS_EXCLUDE_PATTERN), \
- $(ALL_JRE_FILES))
-
$(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
FILES := $(JDK_BUNDLE_FILES), \
@@ -234,15 +208,6 @@
PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
- $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
- BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
- FILES := $(JRE_BUNDLE_FILES), \
- BASE_DIRS := $(JRE_IMAGE_DIR), \
- SUBDIR := $(JRE_BUNDLE_SUBDIR), \
- ))
-
- PRODUCT_TARGETS += $(BUILD_JRE_BUNDLE)
-
$(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
@@ -253,16 +218,6 @@
PRODUCT_TARGETS += $(BUILD_JDK_SYMBOLS_BUNDLE)
- $(eval $(call SetupBundleFile, BUILD_JRE_SYMBOLS_BUNDLE, \
- BUNDLE_NAME := $(JRE_SYMBOLS_BUNDLE_NAME), \
- FILES := $(JRE_SYMBOLS_BUNDLE_FILES), \
- BASE_DIRS := $(JRE_IMAGE_DIR), \
- SUBDIR := $(JRE_BUNDLE_SUBDIR), \
- UNZIP_DEBUGINFO := true, \
- ))
-
- PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE)
-
# The demo bundle is only created to support client tests. Ideally it should
# be built with the main test bundle, but since the prerequisites match
# better with the product build, it makes more sense to keep it there for now.
--- a/make/Help.gmk Wed Jun 06 13:04:25 2018 -0700
+++ b/make/Help.gmk Wed Jun 06 13:16:12 2018 -0700
@@ -40,10 +40,10 @@
$(info $(_) # image (alias for jdk or exploded-image))
$(info $(_) make all # Create all images: product, test, docs)
$(info $(_) # (alias for all-images))
- $(info $(_) make images # Create complete jdk and jre images)
+ $(info $(_) make images # Create a complete jdk image)
$(info $(_) # (alias for product-images))
$(info $(_) make <name>-image # Build just the image for any of: )
- $(info $(_) # jdk, jre, test, docs, symbols)
+ $(info $(_) # jdk, test, docs, symbols, legacy-jre)
$(info $(_) make <phase> # Build the specified phase and everything it depends on)
$(info $(_) # (gensrc, java, copy, libs, launchers, gendata, rmic))
$(info $(_) make *-only # Applies to most targets and disables building the)
--- a/make/Images.gmk Wed Jun 06 13:04:25 2018 -0700
+++ b/make/Images.gmk Wed Jun 06 13:16:12 2018 -0700
@@ -90,7 +90,7 @@
$(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
$(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
- $(ECHO) Creating jdk jimage
+ $(ECHO) Creating jdk image
$(RM) -r $(JDK_IMAGE_DIR)
$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jdk, \
$(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
@@ -101,7 +101,7 @@
$(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
$(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
- $(ECHO) Creating jre jimage
+ $(ECHO) Creating legacy jre image
$(RM) -r $(JRE_IMAGE_DIR)
$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre, \
$(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
--- a/make/Main.gmk Wed Jun 06 13:04:25 2018 -0700
+++ b/make/Main.gmk Wed Jun 06 13:16:12 2018 -0700
@@ -328,14 +328,17 @@
jdk-image:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk)
-jre-image:
+legacy-jre-image:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre)
symbols-image:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)
-mac-bundles-jdk:
- +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
+mac-jdk-bundle:
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jdk-bundle)
+
+mac-legacy-jre-bundle:
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jre-bundle)
release-file:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk)
@@ -344,8 +347,8 @@
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk)
ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \
- zip-source jrtfs-jar jdk-image jre-image \
- symbols-image mac-bundles-jdk \
+ zip-source jrtfs-jar jdk-image legacy-jre-image \
+ symbols-image mac-jdk-bundle mac-legacy-jre-bundle \
release-file exploded-image-optimize
################################################################################
@@ -776,16 +779,17 @@
generate-link-opt-data: buildtools-jdk
# The generated classlist needs to go into java.base-jmod.
- java.base-jmod jdk.jlink-jmod jdk-image jre-image: generate-link-opt-data
+ java.base-jmod jdk.jlink-jmod jdk-image legacy-jre-image: generate-link-opt-data
endif
release-file: create-source-revision-tracker
jdk-image: jmods zip-source demos release-file
- jre-image: jmods release-file
+ legacy-jre-image: jmods release-file
symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)
- mac-bundles-jdk: jdk-image jre-image
+ mac-jdk-bundle: jdk-image
+ mac-legacy-jre-bundle: legacy-jre-image
# The optimize target can run as soon as the modules dir has been completely
# populated (java, copy and gendata targets) and the basic libs and launchers
@@ -956,14 +960,14 @@
# alias for backwards compatibility
docs-javadoc: docs-jdk-api
-mac-bundles: mac-bundles-jdk
+mac-bundles: mac-jdk-bundle
# The $(OUTPUTDIR)/images directory contain the resulting deliverables,
# and in line with this, our targets for creating these are named *-image[s].
-# This target builds the product images, e.g. the JRE and JDK image
+# This target builds the product images, e.g. the JDK image
# (and possibly other, more specific versions)
-product-images: jdk-image jre-image symbols-image exploded-image
+product-images: jdk-image symbols-image exploded-image
# zip-security is actually a bundle, but for now it needs to be considered
# an image until this can be cleaned up properly.
@@ -980,7 +984,7 @@
endif
ifeq ($(OPENJDK_TARGET_OS), macosx)
- product-images: mac-bundles
+ product-images: mac-jdk-bundle
endif
# This target builds the documentation image
--- a/make/autoconf/spec.gmk.in Wed Jun 06 13:04:25 2018 -0700
+++ b/make/autoconf/spec.gmk.in Wed Jun 06 13:16:12 2018 -0700
@@ -859,17 +859,13 @@
DEBUG_PART := -$(DEBUG_LEVEL)
endif
JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).tar.gz
-JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).tar.gz
JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
-JRE_SYMBOLS_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
-JRE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
-JRE_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_SYMBOLS_BUNDLE_NAME)
TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
DOCS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME)
--- a/make/conf/jib-profiles.js Wed Jun 06 13:04:25 2018 -0700
+++ b/make/conf/jib-profiles.js Wed Jun 06 13:16:12 2018 -0700
@@ -272,7 +272,6 @@
*/
common.main_profile_artifacts = function (o) {
var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
- var jre_subdir = (o.jre_subdir != null ? o.jre_subdir : "jre-" + data.version);
var pf = o.platform
return {
artifacts: {
@@ -285,15 +284,6 @@
subdir: jdk_subdir,
exploded: "images/jdk"
},
- jre: {
- local: "bundles/\\(jre.*bin.tar.gz\\)",
- remote: [
- "bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin.tar.gz",
- "bundles/" + pf + "/\\1"
- ],
- subdir: jre_subdir,
- exploded: "images/jre"
- },
test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
remote: [
@@ -319,15 +309,6 @@
subdir: jdk_subdir,
exploded: "images/jdk"
},
- jre_symbols: {
- local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
- remote: [
- "bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-symbols.tar.gz",
- "bundles/" + pf + "/\\1"
- ],
- subdir: jre_subdir,
- exploded: "images/jre"
- }
}
};
};
@@ -339,7 +320,6 @@
*/
common.debug_profile_artifacts = function (o) {
var jdk_subdir = "jdk-" + data.version + "/fastdebug";
- var jre_subdir = "jre-" + data.version + "/fastdebug";
var pf = o.platform
return {
artifacts: {
@@ -352,15 +332,6 @@
subdir: jdk_subdir,
exploded: "images/jdk"
},
- jre: {
- local: "bundles/\\(jre.*bin-debug.tar.gz\\)",
- remote: [
- "bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-debug.tar.gz",
- "bundles/" + pf + "/\\1"
- ],
- subdir: jre_subdir,
- exploded: "images/jre"
- },
test: {
local: "bundles/\\(jdk.*bin-tests-debug.tar.gz\\)",
remote: [
@@ -378,15 +349,6 @@
subdir: jdk_subdir,
exploded: "images/jdk"
},
- jre_symbols: {
- local: "bundles/\\(jre.*bin-debug-symbols.tar.gz\\)",
- remote: [
- "bundles/" + pf + "/jre-" + data.version + "_" + pf + "_bin-debug-symbols.tar.gz",
- "bundles/" + pf + "/\\1"
- ],
- subdir: jre_subdir,
- exploded: "images/jre"
- }
}
};
};
@@ -608,7 +570,6 @@
"macosx-x64": {
platform: "osx-x64",
jdk_subdir: "jdk-" + data.version + ".jdk/Contents/Home",
- jre_subdir: "jre-" + data.version + ".jre/Contents/Home"
},
"solaris-x64": {
platform: "solaris-x64",
--- a/make/scripts/compare.sh Wed Jun 06 13:04:25 2018 -0700
+++ b/make/scripts/compare.sh Wed Jun 06 13:16:12 2018 -0700
@@ -1300,35 +1300,10 @@
THIS_JDK="$THIS/install/jdk"
OTHER_JDK="$OTHER/install/jdk"
echo "Selecting install images for JDK compare"
- if [ -d "$THIS/install/jre" ] && [ -d "$OTHER/install/jre" ]; then
- THIS_JRE="$THIS/install/jre"
- OTHER_JRE="$OTHER/install/jre"
- echo "Also selecting install images for JRE compare"
- else
- echo "No install JRE image found"
- fi
- elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/deploy/images/jdk" ]; then
- THIS_JDK="$THIS/images/jdk"
- OTHER_JDK="$OTHER/deploy/images/jdk"
- echo "Selecting deploy images for JDK compare"
- if [ -d "$THIS/images/jre" ] && [ -d "$OTHER/deploy/images/jre" ]; then
- THIS_JRE="$THIS/images/jre"
- OTHER_JRE="$OTHER/deploy/images/jre"
- echo "Selecting deploy images for JRE compare"
- else
- echo "No deploy JRE image found"
- fi
elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then
THIS_JDK="$THIS/images/jdk"
OTHER_JDK="$OTHER/images/jdk"
echo "Selecting normal images for JDK compare"
- if [ -d "$THIS/images/jre" ] && [ -d "$OTHER/images/jre" ]; then
- THIS_JRE="$THIS/images/jre"
- OTHER_JRE="$OTHER/images/jre"
- echo "Selecting normal images for JRE compare"
- else
- echo "No normal JRE image found"
- fi
elif [ -d "$(ls -d $THIS/licensee-src/build/*/images/jdk 2> /dev/null)" ] \
&& [ -d "$(ls -d $OTHER/licensee-src/build/*/images/jdk 2> /dev/null)" ]
then
@@ -1341,9 +1316,7 @@
THIS="$(ls -d $THIS/licensee-src/build/*)"
OTHER="$(ls -d $OTHER/licensee-src/build/*)"
THIS_JDK="$THIS/images/jdk"
- THIS_JRE="$THIS/images/jre"
OTHER_JDK="$OTHER/images/jdk"
- OTHER_JRE="$OTHER/images/jre"
# Rewrite the path to tools that are used from the build
JIMAGE="$(echo "$JIMAGE" | $SED "s|$OLD_THIS|$THIS|g")"
JAVAP="$(echo "$JAVAP" | $SED "s|$OLD_THIS|$THIS|g")"
@@ -1358,17 +1331,13 @@
&& [ -d "$OTHER/images/jdk-bundle" -o -d "$OTHER/deploy/images/jdk-bundle" ]; then
if [ -d "$THIS/deploy/images/jdk-bundle" ]; then
THIS_JDK_BUNDLE="$THIS/deploy/images/jdk-bundle"
- THIS_JRE_BUNDLE="$THIS/deploy/images/jre-bundle"
else
THIS_JDK_BUNDLE="$THIS/images/jdk-bundle"
- THIS_JRE_BUNDLE="$THIS/images/jre-bundle"
fi
if [ -d "$OTHER/deploy/images/jdk-bundle" ]; then
OTHER_JDK_BUNDLE="$OTHER/deploy/images/jdk-bundle"
- OTHER_JRE_BUNDLE="$OTHER/deploy/images/jre-bundle"
else
OTHER_JDK_BUNDLE="$OTHER/images/jdk-bundle"
- OTHER_JRE_BUNDLE="$OTHER/images/jre-bundle"
fi
echo "Also comparing jdk macosx bundles"
echo " $THIS_JDK_BUNDLE"
@@ -1457,22 +1426,12 @@
echo -n "JDK "
compare_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
fi
- if [ -n "$THIS_JRE" ] && [ -n "$OTHER_JRE" ]; then
- echo -n "JRE "
- compare_dirs $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
- echo -n "JRE "
- compare_files $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
- fi
if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
echo -n "JDK Bundle "
compare_dirs $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
- echo -n "JRE Bundle "
- compare_dirs $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
echo -n "JDK Bundle "
compare_files $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
- echo -n "JRE Bundle "
- compare_files $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
fi
if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
echo -n "Docs "
@@ -1538,15 +1497,9 @@
echo -n "JDK "
compare_general_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
fi
- if [ -n "$THIS_JRE" ] && [ -n "$OTHER_JRE" ]; then
- echo -n "JRE "
- compare_general_files $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
- fi
if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
echo -n "JDK Bundle "
compare_general_files $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
- echo -n "JRE Bundle "
- compare_general_files $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
fi
if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
echo -n "Docs "
@@ -1615,10 +1568,6 @@
echo -n "JDK "
compare_permissions $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
fi
- if [ -n "$THIS_JRE" ] && [ -n "$OTHER_JRE" ]; then
- echo -n "JRE "
- compare_permissions $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
- fi
if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
fi
@@ -1637,15 +1586,9 @@
echo -n "JDK "
compare_file_types $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
fi
- if [ -n "$THIS_JRE" ] && [ -n "$OTHER_JRE" ]; then
- echo -n "JRE "
- compare_file_types $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
- fi
if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
echo -n "JDK Bundle "
compare_file_types $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
- echo -n "JRE Bundle "
- compare_file_types $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-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