8202920: jvm.cfg generation incorrect
Reviewed-by: ihse, shade, dholmes, ksrini
This commit is contained in:
Erik Joelsson
parent
22ca6c6a40
commit
ad3144f97f
@ -79,76 +79,44 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
# In jvm.cfg, the first listed KNOWN variant is the default. On most build
|
||||||
# How to install jvm.cfg.
|
# configurations, that is the server variant.
|
||||||
#
|
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86)
|
||||||
ifeq ($(call check-jvm-variant, zero), true)
|
DEFAULT_CFG_VARIANT ?= client
|
||||||
JVMCFG_ARCH := zero
|
|
||||||
else
|
|
||||||
JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
|
|
||||||
endif
|
endif
|
||||||
|
DEFAULT_CFG_VARIANT ?= server
|
||||||
|
|
||||||
|
# Any variant other than server, client or minimal is represented as server in
|
||||||
|
# the cfg file.
|
||||||
|
VALID_CFG_VARIANTS := server client minimal
|
||||||
|
CFG_VARIANTS := $(filter $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)) \
|
||||||
|
$(if $(filter-out $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)), server)
|
||||||
|
|
||||||
|
# Change the order to put the default variant first if present.
|
||||||
|
ORDERED_CFG_VARIANTS := \
|
||||||
|
$(if $(filter $(DEFAULT_CFG_VARIANT), $(CFG_VARIANTS)), $(DEFAULT_CFG_VARIANT)) \
|
||||||
|
$(filter-out $(DEFAULT_CFG_VARIANT), $(CFG_VARIANTS))
|
||||||
|
|
||||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
|
||||||
JVMCFG_SRC := $(TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
|
|
||||||
else
|
|
||||||
JVMCFG_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
|
|
||||||
# Allow override by ALT_JVMCFG_SRC if it exists
|
|
||||||
JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC))
|
|
||||||
endif
|
|
||||||
JVMCFG := $(LIB_DST_DIR)/jvm.cfg
|
JVMCFG := $(LIB_DST_DIR)/jvm.cfg
|
||||||
|
|
||||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
|
define print-cfg-line
|
||||||
COPY_JVM_CFG_FILE := true
|
$(call LogInfo, Adding -$1 $2 to jvm.cfg)
|
||||||
else
|
$(PRINTF) -- "-$1 $2\n" >> $@ $(NEWLINE)
|
||||||
# On 32-bit machines we have three potential VMs: client, server and minimal.
|
endef
|
||||||
# Historically we usually have both client and server and so that is what the
|
|
||||||
# committed jvm.cfg expects (including platform specific ergonomics switches
|
|
||||||
# to decide whether to use client or server by default). So when we have anything
|
|
||||||
# other than client and server we need to define a new jvm.cfg file.
|
|
||||||
# The main problem is deciding whether to use aliases for the VMs that are not
|
|
||||||
# present and the current position is that we add aliases for client and server, but
|
|
||||||
# not for minimal.
|
|
||||||
CLIENT_AND_SERVER := $(call check-jvm-variant, client)+$(call check-jvm-variant, server)
|
|
||||||
ifeq ($(CLIENT_AND_SERVER), true+true)
|
|
||||||
COPY_JVM_CFG_FILE := true
|
|
||||||
else
|
|
||||||
# For zero, the default jvm.cfg file is sufficient
|
|
||||||
ifeq ($(call check-jvm-variant, zero), true)
|
|
||||||
COPY_JVM_CFG_FILE := true
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(COPY_JVM_CFG_FILE), true)
|
$(JVMCFG): $(call DependOnVariable, ORDERED_CFG_VARIANTS)
|
||||||
$(JVMCFG): $(JVMCFG_SRC)
|
$(call MakeTargetDir)
|
||||||
$(call install-file)
|
$(RM) $@
|
||||||
else
|
$(foreach v, $(ORDERED_CFG_VARIANTS), \
|
||||||
$(JVMCFG):
|
$(call print-cfg-line,$v,KNOWN) \
|
||||||
$(MKDIR) -p $(@D)
|
)
|
||||||
$(RM) $(@)
|
# If either of server or client aren't present, add IGNORE lines for
|
||||||
# Now check for other permutations
|
# them.
|
||||||
ifeq ($(call check-jvm-variant, server), true)
|
$(foreach v, server client, \
|
||||||
$(PRINTF) -- "-server KNOWN\n">>$(@)
|
$(if $(filter $v, $(ORDERED_CFG_VARIANTS)), , \
|
||||||
$(PRINTF) -- "-client ALIASED_TO -server\n">>$(@)
|
$(call print-cfg-line,$v,IGNORE) \
|
||||||
ifeq ($(call check-jvm-variant, minimal), true)
|
) \
|
||||||
$(PRINTF) -- "-minimal KNOWN\n">>$(@)
|
)
|
||||||
endif
|
|
||||||
else
|
|
||||||
ifeq ($(call check-jvm-variant, client), true)
|
|
||||||
$(PRINTF) -- "-client KNOWN\n">>$(@)
|
|
||||||
$(PRINTF) -- "-server ALIASED_TO -client\n">>$(@)
|
|
||||||
ifeq ($(call check-jvm-variant, minimal), true)
|
|
||||||
$(PRINTF) -- "-minimal KNOWN\n">>$(@)
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
ifeq ($(call check-jvm-variant, minimal), true)
|
|
||||||
$(PRINTF) -- "-minimal KNOWN\n">>$(@)
|
|
||||||
$(PRINTF) -- "-server ALIASED_TO -minimal\n">>$(@)
|
|
||||||
$(PRINTF) -- "-client ALIASED_TO -minimal\n">>$(@)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
TARGETS += $(JVMCFG)
|
TARGETS += $(JVMCFG)
|
||||||
|
|
||||||
|
|||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2012, 2013, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2003, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2003, 2013, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
# Copyright (c) 2011, 2016, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that this both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client KNOWN
|
|
||||||
-minimal KNOWN
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
# Copyright (c) 2001, 2013, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client KNOWN
|
|
||||||
-minimal KNOWN
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2002, 2013, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2011, 2015, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2011, 2015, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2011, 2016, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
# Copyright (c) 2001, 2016, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client KNOWN
|
|
||||||
-minimal KNOWN
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2001, 2013, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2009, 2013, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
# Copyright (c) 2003, 2013, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2001, 2013, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-client KNOWN
|
|
||||||
-server KNOWN
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Copyright (c) 2002, 2013, 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. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
# List of JVMs that can be used as an option to java, javac, etc.
|
|
||||||
# Order is important -- first in this list is the default JVM.
|
|
||||||
# NOTE that both this file and its format are UNSUPPORTED and
|
|
||||||
# WILL GO AWAY in a future release.
|
|
||||||
#
|
|
||||||
# You may also select a JVM in an arbitrary location with the
|
|
||||||
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
||||||
# and may not be available in a future release.
|
|
||||||
#
|
|
||||||
-server KNOWN
|
|
||||||
-client IGNORE
|
|
||||||
Loading…
Reference in New Issue
Block a user