commit e0e4cad17058fa5d7957a2a4e5ac2ce72ead03f9
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Jan 21 12:45:44 2016 +0100
Remove support for JVM extensions
This removes the following user-visible API:
- /usr/lib/jvm-exports directory
- /usr/bin/jvmjar command
- JVM_LIBDIR environmental variable
- %_jvmjardir macro
- %add_jvm_extension macro
Reasons:
- rarely (if ever) used
- dropped in Java 9
bin/jvmjar | 65 ---------------------------------------------
build | 1 -
configure | 1 -
doc/directory_layout.txt | 1 -
install | 2 -
java-utils/java-functions | 6 +---
macros.d/macros.jpackage | 25 -----------------
7 files changed, 1 insertions(+), 100 deletions(-)
---
diff --git a/build b/build
index c2ba01a..42275be 100755
--- a/build
+++ b/build
@@ -78,7 +78,6 @@ expand bin/create-jar-links
expand bin/diff-jars
expand bin/find-jar
expand bin/gradle-local
-expand bin/jvmjar
expand bin/rebuild-jar-repository
expand bin/shade-jar
expand bin/xmvn-builddep
diff --git a/configure b/configure
index 0fa9781..13d9223 100755
--- a/configure
+++ b/configure
@@ -53,7 +53,6 @@ jvmcommonlibdir
jvmcommonsysconfdir
jvmdatadir
jvmdir
-jvmjardir
jvmlibdir
jvmprivdir
jvmsysconfdir
diff --git a/doc/directory_layout.txt b/doc/directory_layout.txt
index 907777d..0532539 100644
--- a/doc/directory_layout.txt
+++ b/doc/directory_layout.txt
@@ -52,7 +52,6 @@ short description.
Directories containing configuration files for Java Virtual
Machines (JVM).
-*`%{_jvmjardir}`* -- `/usr/lib/jvm-exports`::
*`%{_jvmprivdir}`* -- `/usr/lib/jvm-private`::
*`%{_jvmlibdir}`* -- `/usr/lib/jvm`::
*`%{_jvmdatadir}`* -- `/usr/share/jvm`::
diff --git a/install b/install
index bd0a94f..361c0b0 100755
--- a/install
+++ b/install
@@ -76,7 +76,6 @@ dir "${javaconfdir}"
dir "${javaconfdir}/security"
dir "${javaconfdir}/security/security.d"
dir "${jvmdir}"
-dir "${jvmjardir}"
dir "${jvmprivdir}"
dir "${jvmlibdir}"
dir "${jvmdatadir}"
@@ -110,7 +109,6 @@ inst_exec target/clean-binary-files "${bindir}"
inst_exec target/create-jar-links "${bindir}"
inst_exec target/diff-jars "${bindir}"
inst_exec target/find-jar "${bindir}"
-inst_exec target/jvmjar "${bindir}"
inst_exec target/rebuild-jar-repository "${bindir}"
inst_exec target/shade-jar "${bindir}"
inst_exec target/xmvn-builddep "${bindir}"
diff --git a/java-utils/java-functions b/java-utils/java-functions
index 00f952a..b92bf47 100644
--- a/java-utils/java-functions
+++ b/java-utils/java-functions
@@ -308,10 +308,6 @@ set_jvm_dirs()
_set_java_home
- # Jar repository provided by the JVM
- JVM_LIBDIR="${JVM_ROOT}"-exports/$(echo "${JAVA_HOME}" |\
- sed -n "s+${JVM_ROOT}/\([-_[:alnum:].]*\)\(.*\)+\1+p")
-
# Java standard version of the JVM. -fullversion seems to be lot faster
# to invoke than -version. Some examples:
# java full version "1.4.2_04-b05"
@@ -447,7 +443,7 @@ find_jar()
return ${?}
fi
- set -- ${JVM_LIBDIR} ${_javaverdirs} ${_javadirs}
+ set -- ${_javaverdirs} ${_javadirs}
_log "JAR search path is:"
for dir; do
diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
index 6b6646c..e86f3d7 100644
--- a/macros.d/macros.jpackage
+++ b/macros.d/macros.jpackage
@@ -16,11 +16,6 @@
%_jvmdir %{_prefix}/lib/jvm
#
-# Root directory where all Java VMs/SDK/JREs expose their jars
-#
-%_jvmjardir %{_prefix}/lib/jvm-exports
-
-#
# Root directory for all Java VM/SDK/JRE's private things.
#
%_jvmprivdir %{_prefix}/lib/jvm-private
@@ -118,26 +113,6 @@
%javac %{java_home}/bin/javac
%javadoc %{java_home}/bin/javadoc
-#==============================================================================
-# ---- Java extension handling macros
-
-#
-# add_jvm_extension should be used in %install by extension packages to declare
-# what extension jars they provide.
-#
-# For example a package that provides foo.jar which is the bar extension
-# under java 1.2 and 1.3 should do a:
-#
-# %install
-# ... # create foo.jar in %{javadir}-ext
-# %add_jvm_extension foo bar 1.2 1.3
-#
-# %files
-# %{javadir}-ext/foo.jar
-# %{javadir}-*/bar.jar
-#
-%add_jvm_extension JAVA_LIBDIR=%{buildroot}%{_javadir} %{_bindir}/jvmjar -l
-
#
# Standard JPackage script
Show replies by date