| 1 |
commit: 3b44802bfa393667b8b3368a5444309e58edcc9b |
| 2 |
Author: Henning Sudbrock <github <AT> hsudbrock <DOT> de> |
| 3 |
AuthorDate: Sat Sep 5 15:13:23 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 5 15:39:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b44802b |
| 7 |
|
| 8 |
java-pkg-simple.eclass: Fix typos and comments |
| 9 |
|
| 10 |
Mostly fixes typos (most of them in comments, only one in an actual variable, |
| 11 |
'dependency'). |
| 12 |
|
| 13 |
Non-typos: |
| 14 |
* After the recent extensions of this eclass, it now supports resources - hence |
| 15 |
the change in the eclass description. |
| 16 |
* The usage description of java-pkg-simple_getclasspath mentions the optional |
| 17 |
parameter --runtime-only, which appears not to be provided by the function. |
| 18 |
|
| 19 |
Signed-off-by: Henning Sudbrock <github <AT> hsudbrock.de> |
| 20 |
Closes: https://github.com/gentoo/gentoo/pull/17425 |
| 21 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 22 |
|
| 23 |
eclass/java-pkg-simple.eclass | 25 ++++++++++++------------- |
| 24 |
1 file changed, 12 insertions(+), 13 deletions(-) |
| 25 |
|
| 26 |
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass |
| 27 |
index 560db83d77b..aad0c225303 100644 |
| 28 |
--- a/eclass/java-pkg-simple.eclass |
| 29 |
+++ b/eclass/java-pkg-simple.eclass |
| 30 |
@@ -1,4 +1,4 @@ |
| 31 |
-# Copyright 2004-2015 Gentoo Foundation |
| 32 |
+# Copyright 2004-2020 Gentoo Foundation |
| 33 |
# Distributed under the terms of the GNU General Public License v2 |
| 34 |
|
| 35 |
# @ECLASS: java-pkg-simple.eclass |
| 36 |
@@ -10,11 +10,10 @@ |
| 37 |
# @DESCRIPTION: |
| 38 |
# This class is intended to build pure Java packages from Java sources |
| 39 |
# without the use of any build instructions shipped with the sources. |
| 40 |
-# There is no support for resources besides the generated class files, |
| 41 |
-# or for generating source files, or for controlling the META-INF of |
| 42 |
-# the resulting jar, although these issues may be addressed by an |
| 43 |
-# ebuild by putting corresponding files into the target directory |
| 44 |
-# before calling the src_compile function of this eclass. |
| 45 |
+# There is no support for generating source files, or for controlling |
| 46 |
+# the META-INF of the resulting jar, although these issues may be |
| 47 |
+# addressed by an ebuild by putting corresponding files into the target |
| 48 |
+# directory before calling the src_compile function of this eclass. |
| 49 |
|
| 50 |
inherit java-utils-2 |
| 51 |
|
| 52 |
@@ -73,7 +72,7 @@ fi |
| 53 |
# @ECLASS-VARIABLE: JAVA_NEEDS_TOOLS |
| 54 |
# @DEFAULT_UNSET |
| 55 |
# @DESCRIPTION: |
| 56 |
-# add tools.jar to the gentoo.classpath. Should only be used |
| 57 |
+# Add tools.jar to the gentoo.classpath. Should only be used |
| 58 |
# for build-time purposes, the dependency is not recorded to |
| 59 |
# package.env. |
| 60 |
|
| 61 |
@@ -188,7 +187,7 @@ fi |
| 62 |
# It is almost equivalent to ${JAVA_RESOURCE_DIRS} in src_test. |
| 63 |
|
| 64 |
# @FUNCTION: java-pkg-simple_getclasspath |
| 65 |
-# @USAGE: java-pkg-simple_getclasspath [--runtime-only] |
| 66 |
+# @USAGE: java-pkg-simple_getclasspath |
| 67 |
# @INTERNAL |
| 68 |
# @DESCRIPTION: |
| 69 |
# Get proper ${classpath} from ${JAVA_GENTOO_CLASSPATH_EXTRA}, |
| 70 |
@@ -196,12 +195,12 @@ fi |
| 71 |
# ${JAVA_GENTOO_CLASSPATH}. We use it inside |
| 72 |
# java-pkg-simple_src_compile and java-pkg-simple_src_test. |
| 73 |
# |
| 74 |
-# Note that if you need to define a "classpath" variable before |
| 75 |
+# Note that the variable "classpath" needs to be defined before |
| 76 |
# calling this function. |
| 77 |
java-pkg-simple_getclasspath() { |
| 78 |
debug-print-function ${FUNCNAME} $* |
| 79 |
|
| 80 |
- local denpendency |
| 81 |
+ local dependency |
| 82 |
local deep_jars="--with-dependencies" |
| 83 |
local buildonly_jars="--build-only" |
| 84 |
|
| 85 |
@@ -242,7 +241,7 @@ java-pkg-simple_getclasspath() { |
| 86 |
# @INTERNAL |
| 87 |
# @DESCRIPTION: |
| 88 |
# use japi-compliance-checker the ensure the compabitily of \*.class files, |
| 89 |
-# Besides, use pkgdiff to ensure the compabilty of resources. |
| 90 |
+# Besides, use pkgdiff to ensure the compatibility of resources. |
| 91 |
java-pkg-simple_test_with_pkgdiff_() { |
| 92 |
debug-print-function ${FUNCNAME} $* |
| 93 |
|
| 94 |
@@ -418,7 +417,7 @@ java-pkg-simple_src_test() { |
| 95 |
local tests_to_run classpath |
| 96 |
|
| 97 |
# do not continue if the USE FLAG 'test' is explicitly unset |
| 98 |
- # or no ${JAVA_TESTING_FRSerializingCAMEWORKS} specified |
| 99 |
+ # or no ${JAVA_TESTING_FRAMEWORKS} is specified |
| 100 |
if ! has test ${JAVA_PKG_IUSE}; then |
| 101 |
return |
| 102 |
elif ! use test; then |
| 103 |
@@ -459,7 +458,7 @@ java-pkg-simple_src_test() { |
| 104 |
tests_to_run=${tests_to_run//\//.} |
| 105 |
|
| 106 |
# exclude extra test classes, usually corner cases |
| 107 |
- # that the code above cannot handle |
| 108 |
+ # that the code above cannot handle |
| 109 |
for class in "${JAVA_TEST_EXCLUDES[@]}"; do |
| 110 |
tests_to_run=${tests_to_run//${class}} |
| 111 |
done |
Archives