|
Lines 367-373
java-pkg-simple_src_compile() {
Link Here
|
| 367 |
# gather sources |
367 |
# gather sources |
| 368 |
# if target < 9, we need to compile module-info.java separately |
368 |
# if target < 9, we need to compile module-info.java separately |
| 369 |
# as this feature is not supported before Java 9 |
369 |
# as this feature is not supported before Java 9 |
| 370 |
if [[ java-pkg_get-target -lt 9 ]]; then |
370 |
if [[ $(java-pkg_get-target) -lt 9 ]]; then |
| 371 |
find "${JAVA_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${sources} |
371 |
find "${JAVA_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${sources} |
| 372 |
moduleinfo=$(find "${JAVA_SRC_DIR[@]}" -name module-info.java) |
372 |
moduleinfo=$(find "${JAVA_SRC_DIR[@]}" -name module-info.java) |
| 373 |
else |
373 |
else |
|
Lines 382-388
java-pkg-simple_src_compile() {
Link Here
|
| 382 |
java-pkg-simple_getclasspath |
382 |
java-pkg-simple_getclasspath |
| 383 |
java-pkg-simple_prepend_resources ${classes} "${JAVA_RESOURCE_DIRS[@]}" |
383 |
java-pkg-simple_prepend_resources ${classes} "${JAVA_RESOURCE_DIRS[@]}" |
| 384 |
|
384 |
|
| 385 |
if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then |
385 |
if [[ -n ${moduleinfo} ]] || [[ $(java-pkg_get-target) -lt 9 ]]; then |
| 386 |
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
386 |
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 387 |
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources} |
387 |
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources} |
| 388 |
else |
388 |
else |
|
Lines 528-534
java-pkg-simple_src_test() {
Link Here
|
| 528 |
# gathering sources for testing |
528 |
# gathering sources for testing |
| 529 |
# if target < 9, we need to compile module-info.java separately |
529 |
# if target < 9, we need to compile module-info.java separately |
| 530 |
# as this feature is not supported before Java 9 |
530 |
# as this feature is not supported before Java 9 |
| 531 |
if [[ java-pkg_get-target -lt 9 ]]; then |
531 |
if [[ $(java-pkg_get-target) -lt 9 ]]; then |
| 532 |
find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${test_sources} |
532 |
find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${test_sources} |
| 533 |
moduleinfo=$(find "${JAVA_TEST_SRC_DIR[@]}" -name module-info.java) |
533 |
moduleinfo=$(find "${JAVA_TEST_SRC_DIR[@]}" -name module-info.java) |
| 534 |
else |
534 |
else |
|
Lines 537-543
java-pkg-simple_src_test() {
Link Here
|
| 537 |
|
537 |
|
| 538 |
# compile |
538 |
# compile |
| 539 |
if [[ -s ${test_sources} ]]; then |
539 |
if [[ -s ${test_sources} ]]; then |
| 540 |
if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then |
540 |
if [[ -n ${moduleinfo} ]] || [[ $(java-pkg_get-target) -lt 9 ]]; then |
| 541 |
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
541 |
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 542 |
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${test_sources} |
542 |
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${test_sources} |
| 543 |
else |
543 |
else |
| 544 |
- |
|
|
