gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-17 02:39:08 -07:00
Code Issues Projects Releases Wiki Activity

dev-java/asm: tweak variable style

Browse Source 
QA policy says we do ${foo}, not $foo, so tweak.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-12-10 03:38:45 +00:00
parent 7c5c644e38
commit e052612e59
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev-java/asm/asm-5.1-r1.ebuild
View File

@@ -39,6 +39,7 @@ src_prepare() {
}
src_install() {
local x
for x in output/dist/lib/*.jar ; do
java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
done

16
dev-java/asm/asm-9.3.ebuild
View File

@@ -29,14 +29,14 @@ src_compile() {
einfo "Compiling ${module}"
JAVA_RESOURCE_DIRS=()
JAVA_MAIN_CLASS=""
JAVA_SRC_DIR="$module/src/main/java"
JAVA_JAR_FILENAME="$module.jar"
JAVA_SRC_DIR="${module}/src/main/java"
JAVA_JAR_FILENAME="${module}.jar"
# Not all of the modules have resources.
if [[ -d $module/src/main/resources ]]; then \
JAVA_RESOURCE_DIRS="$module/src/main/resources"
if [[ -d ${module}/src/main/resources ]]; then \
JAVA_RESOURCE_DIRS="${module}/src/main/resources"
fi
java-pkg-simple_src_compile
JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
rm -r target || die
done
@@ -44,7 +44,7 @@ src_compile() {
JAVA_SRC_DIR=()
JAVA_JAR_FILENAME="ignoreme.jar"
for module in "${ASM_MODULES[@]}"; do
JAVA_SRC_DIR+=( "$module/src/main/java" )
JAVA_SRC_DIR+=( "${module}/src/main/java" )
done
java-pkg-simple_src_compile
fi
@@ -54,9 +54,9 @@ src_install() {
einstalldocs # https://bugs.gentoo.org/789582
local module
for module in "${ASM_MODULES[@]}"; do
java-pkg_dojar $module.jar
java-pkg_dojar ${module}.jar
if use source; then
java-pkg_dosrc "$module/src/main/java/*"
java-pkg_dosrc "${module}/src/main/java/*"
fi
done
if use doc; then

16
dev-java/asm/asm-9.4.ebuild
View File

@@ -55,11 +55,11 @@ src_prepare() {
src_compile() {
local module
for module in "${ASM_MODULES[@]}"; do
einfo "Compiling $module"
JAVA_JAR_FILENAME="$module.jar"
JAVA_SRC_DIR="$module/src/main/java"
einfo "Compiling ${module}"
JAVA_JAR_FILENAME="${module}.jar"
JAVA_SRC_DIR="${module}/src/main/java"
java-pkg-simple_src_compile
JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
rm -r target || die
done
@@ -68,8 +68,8 @@ src_compile() {
JAVA_JAR_FILENAME="ignoreme.jar"
JAVA_SRC_DIR=()
for module in "${ASM_MODULES[@]}"; do
rm "$module/src/main/java/module-info.java" || die
JAVA_SRC_DIR+=("$module/src/main/java")
rm "${module}/src/main/java/module-info.java" || die
JAVA_SRC_DIR+=("${module}/src/main/java")
done
java-pkg-simple_src_compile
fi
@@ -78,9 +78,9 @@ src_compile() {
src_install() {
local module
for module in "${ASM_MODULES[@]}"; do
java-pkg_dojar $module.jar
java-pkg_dojar ${module}.jar
if use source; then
java-pkg_dosrc "$module/src/main/java/*"
java-pkg_dosrc "${module}/src/main/java/*"
fi
done
if use doc; then