|
Lines 370-379
java-pkg-simple_src_compile() {
Link Here
|
| 370 |
local target="$(java-pkg_get-target)" |
370 |
local target="$(java-pkg_get-target)" |
| 371 |
if [[ ${target#1.} -lt 9 ]]; then |
371 |
if [[ ${target#1.} -lt 9 ]]; then |
| 372 |
find "${JAVA_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${sources} |
372 |
find "${JAVA_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${sources} |
| 373 |
moduleinfo=$(find "${JAVA_SRC_DIR[@]}" -name module-info.java) |
|
|
| 374 |
else |
373 |
else |
| 375 |
find "${JAVA_SRC_DIR[@]}" -name \*.java > ${sources} |
374 |
find "${JAVA_SRC_DIR[@]}" -name \*.java > ${sources} |
| 376 |
fi |
375 |
fi |
|
|
376 |
moduleinfo=$(find "${JAVA_SRC_DIR[@]}" -name module-info.java) |
| 377 |
|
377 |
|
| 378 |
# create the target directory |
378 |
# create the target directory |
| 379 |
mkdir -p ${classes} || die "Could not create target directory" |
379 |
mkdir -p ${classes} || die "Could not create target directory" |
|
Lines 383-389
java-pkg-simple_src_compile() {
Link Here
|
| 383 |
java-pkg-simple_getclasspath |
383 |
java-pkg-simple_getclasspath |
| 384 |
java-pkg-simple_prepend_resources ${classes} "${JAVA_RESOURCE_DIRS[@]}" |
384 |
java-pkg-simple_prepend_resources ${classes} "${JAVA_RESOURCE_DIRS[@]}" |
| 385 |
|
385 |
|
| 386 |
if [[ -n ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then |
386 |
if [[ -z ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then |
| 387 |
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
387 |
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 388 |
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources} |
388 |
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources} |
| 389 |
else |
389 |
else |
|
Lines 393-399
java-pkg-simple_src_compile() {
Link Here
|
| 393 |
fi |
393 |
fi |
| 394 |
|
394 |
|
| 395 |
# handle module-info.java separately as it needs at least JDK 9 |
395 |
# handle module-info.java separately as it needs at least JDK 9 |
| 396 |
if [[ -n ${moduleinfo} ]]; then |
396 |
if [[ -n ${moduleinfo} ]] && [[ ${target#1.} -lt 9 ]]; then |
| 397 |
if java-pkg_is-vm-version-ge "9" ; then |
397 |
if java-pkg_is-vm-version-ge "9" ; then |
| 398 |
local tmp_source=${JAVA_PKG_WANT_SOURCE} tmp_target=${JAVA_PKG_WANT_TARGET} |
398 |
local tmp_source=${JAVA_PKG_WANT_SOURCE} tmp_target=${JAVA_PKG_WANT_TARGET} |
| 399 |
|
399 |
|
|
Lines 532-545
java-pkg-simple_src_test() {
Link Here
|
| 532 |
local target="$(java-pkg_get-target)" |
532 |
local target="$(java-pkg_get-target)" |
| 533 |
if [[ ${target#1.} -lt 9 ]]; then |
533 |
if [[ ${target#1.} -lt 9 ]]; then |
| 534 |
find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${test_sources} |
534 |
find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${test_sources} |
| 535 |
moduleinfo=$(find "${JAVA_TEST_SRC_DIR[@]}" -name module-info.java) |
|
|
| 536 |
else |
535 |
else |
| 537 |
find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java > ${test_sources} |
536 |
find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java > ${test_sources} |
| 538 |
fi |
537 |
fi |
|
|
538 |
moduleinfo=$(find "${JAVA_TEST_SRC_DIR[@]}" -name module-info.java) |
| 539 |
|
539 |
|
| 540 |
# compile |
540 |
# compile |
| 541 |
if [[ -s ${test_sources} ]]; then |
541 |
if [[ -s ${test_sources} ]]; then |
| 542 |
if [[ -n ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then |
542 |
if [[ -z ${moduleinfo} ]] || [[ ${target#1.} -lt 9 ]]; then |
| 543 |
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
543 |
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 544 |
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${test_sources} |
544 |
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${test_sources} |
| 545 |
else |
545 |
else |
|
Lines 550-556
java-pkg-simple_src_test() {
Link Here
|
| 550 |
fi |
550 |
fi |
| 551 |
|
551 |
|
| 552 |
# handle module-info.java separately as it needs at least JDK 9 |
552 |
# handle module-info.java separately as it needs at least JDK 9 |
| 553 |
if [[ -n ${moduleinfo} ]]; then |
553 |
if [[ -n ${moduleinfo} ]] && [[ ${target#1.} -lt 9 ]]; then |
| 554 |
if java-pkg_is-vm-version-ge "9" ; then |
554 |
if java-pkg_is-vm-version-ge "9" ; then |
| 555 |
local tmp_source=${JAVA_PKG_WANT_SOURCE} tmp_target=${JAVA_PKG_WANT_TARGET} |
555 |
local tmp_source=${JAVA_PKG_WANT_SOURCE} tmp_target=${JAVA_PKG_WANT_TARGET} |
| 556 |
|
556 |
|
| 557 |
- |
|
|
