commit 07f51bd9d236d6a506150e91f5b46e06c5056f89
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Jan 21 13:04:21 2016 +0100
Remove support for version-specific JAR locations
doc/directory_layout.txt | 12 ------------
install | 7 -------
java-utils/java-functions | 37 -------------------------------------
macros.d/macros.jpackage | 17 -----------------
4 files changed, 0 insertions(+), 73 deletions(-)
---
diff --git a/doc/directory_layout.txt b/doc/directory_layout.txt
index 0532539..5bc7824 100644
--- a/doc/directory_layout.txt
+++ b/doc/directory_layout.txt
@@ -68,15 +68,3 @@ short description.
Directory containing Java configuration files. In particular it
contains main Java configuration file -- `java.conf`.
-
-*`%{_javadir}-ext`* -- `/usr/share/java-ext`::
-*`%{_javadir}-`+_x_._y_._z_+* -- `/usr/share/java-`+_x_._y_._z_+::
-*`%{_jnidir}-ext`* -- `/usr/lib/java-ext`::
-*`%{_jnidir}-`+_x_._y_._z_+* -- `/usr/lib/java-`+_x_._y_._z_+::
-
- These directories are rarely used and are retained mostly for
- compatibility with JPackage project. They are meant to contain
- JAR files that depend on particular Java standard version. Note
- that such JARs can (and usually are) placed in `%{_javadir}` or
- `%{_jnidir}`.
-
diff --git a/install b/install
index 66436f7..64cc47f 100755
--- a/install
+++ b/install
@@ -85,9 +85,7 @@ dir "${jvmcommondatadir}"
dir "${jvmcommonsysconfdir}"
dir "${javadir}"
dir "${javadir}-utils"
-dir "${javadir}-ext"
dir "${jnidir}"
-dir "${jnidir}-ext"
dir "${javadocdir}"
dir "${mavenpomdir}"
dir "${datadir}/maven-metadata"
@@ -95,11 +93,6 @@ dir "${rpmconfigdir}"
dir "${rpmconfigdir}/macros.d"
dir "${rpmconfigdir}/fileattrs"
-for ver in 1.5.0 1.6.0 1.7.0 1.8.0; do
- dir "${javadir}-${ver}"
- dir "${jnidir}-${ver}"
-done
-
inst_exec target/abs2rel "${bindir}"
inst_exec target/build-classpath "${bindir}"
inst_exec target/build-classpath-directory "${bindir}"
diff --git a/java-utils/java-functions b/java-utils/java-functions
index b92bf47..0758a18 100644
--- a/java-utils/java-functions
+++ b/java-utils/java-functions
@@ -301,45 +301,8 @@ run()
# Set JVM-related directories
set_jvm_dirs()
{
- local IFS
- local re
- local option
- local version
-
_set_java_home
- # 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"
- # java full version "J2RE 1.4.1 IBM build cxia321411-20030930"
- # java full version "Blackdown-1.4.1-01"
- # java version "1.5.0"
-
- re='\([[:digit:]]\{1,\}\.[[:digit:]]\{1,\}\(\.[[:digit:]]\{1,\}\)*\)'
- for option in -fullversion -version; do
- # Yuck, "grep -o" would be cleaner, but requires GNU grep >= 2.5.
- # This could be improved/simplified if sed had non-greedy matching.
- version=$("${JAVACMD}" $option 2>&1 | sed -n \
- -e '/\(openjdk\|java\) \(full \)*version
"/s/'$re'/<<<\1>>>/' \
- -e '/\(openjdk\|java\) \(full \)*version
"/s/.*<<<\([^>]\{1,\}\)>>>.*/\1/p')
- if [ -n "${version}" ]; then
- _log "Determined Java version to be ${version}"
- break
- fi
- done
-
- if [ -z "${version}" ]; then
- echo "$0: Unable to determine Java version"
- return 1
- fi
-
- # Jar repository for this Java standard
- IFS=:
- _javaverdirs=
- for dir in ${_javadirs}; do
- _javaverdirs="${_javaverdirs}${_javaverdirs:+:}${dir}-${version}"
- done
-
return 0
}
diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
index e86f3d7..c7b3b0c 100644
--- a/macros.d/macros.jpackage
+++ b/macros.d/macros.jpackage
@@ -59,28 +59,11 @@
# Directory where arch and version independent jars are installed.
# This has already been integrated in RH macros following our request.
#
-# By extension:
-# %{_javadir}-ext:
-# - version dependent jars
-# %{_javadir}-x.y.z:
-# - jars for Java standard x.y.z (usually symlinks to %{_javadir}-ext)
-# %{_javadir}-utils:
-# - Java-related scripts
-#
-# To simplify things only %{_javadir} is defined.
-#
%_javadir %{_datadir}/java
#
# Directory where arch-specific (JNI) version-independent jars are installed.
#
-# By extension:
-# %{_jnidir}-ext:
-# - version dependent jars
-# %{_jnidir}-x.y.z:
-# - jars for Java standard x.y.z (usually symlinks to %{_jnidir}-ext)
-# To simplify things only %{_jnidir} is defined.
-#
%_jnidir %{_prefix}/lib/java
#
Show replies by date