diff options
-rwxr-xr-x | bootstrap.sh | 2 | ||||
-rwxr-xr-x | jrt_test/src/binref/compilejava.in | 12 | ||||
-rwxr-xr-x | jrt_test/src/binref/runjava.in | 15 | ||||
-rwxr-xr-x | lowercasing_test/src/binref/compilejava.in | 12 | ||||
-rwxr-xr-x | lowercasing_test/src/binref/runjava.in | 12 | ||||
-rwxr-xr-x | messagebus_test/src/binref/compilejava.in | 11 | ||||
-rwxr-xr-x | messagebus_test/src/binref/runjava.in | 12 |
7 files changed, 62 insertions, 14 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index b48f4b77836..79fe6d2c9bf 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -83,7 +83,7 @@ case "$MODE" in ;; full) echo "Building full set of dependencies." - mvn_install -am -pl jrt,linguistics,messagebus + mvn_install -am -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -pl jrt,linguistics,messagebus ;; default) echo "Building default set of dependencies." diff --git a/jrt_test/src/binref/compilejava.in b/jrt_test/src/binref/compilejava.in index c294a263641..312d05c7a1e 100755 --- a/jrt_test/src/binref/compilejava.in +++ b/jrt_test/src/binref/compilejava.in @@ -1,10 +1,18 @@ #!/bin/sh # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. unset VESPA_LOG_TARGET -CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar + +if [ -n $VESPA_CPP_TEST_JARS ]; then + CLASSPATH=$VESPA_CPP_TEST_JARS/jrt.jar + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/vespajlib.jar +else + CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar +fi + CLASSPATH=$CLASSPATH:@CMAKE_CURRENT_SOURCE_DIR@/../java/classes CLASSPATH=$CLASSPATH:. + if [ $# -lt 1 ]; then echo "usage: compilejava file ..." exit 1 diff --git a/jrt_test/src/binref/runjava.in b/jrt_test/src/binref/runjava.in index 7c4c299b488..2a3c69e0e36 100755 --- a/jrt_test/src/binref/runjava.in +++ b/jrt_test/src/binref/runjava.in @@ -1,11 +1,20 @@ #!/bin/sh # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. unset VESPA_LOG_TARGET -CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/security-utils/target/security-utils.jar + +if [ -n $VESPA_CPP_TEST_JARS ]; then + CLASSPATH=$VESPA_CPP_TEST_JARS/jrt.jar + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/vespajlib.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/security-utils/target/security-utils.jar +else + CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/security-utils/target/security-utils.jar +fi + CLASSPATH=$CLASSPATH:@CMAKE_CURRENT_SOURCE_DIR@/../java/classes CLASSPATH=$CLASSPATH:. + if [ $# -lt 1 ]; then echo "usage: runjava <class> [args]" exit 1 diff --git a/lowercasing_test/src/binref/compilejava.in b/lowercasing_test/src/binref/compilejava.in index c03601485ce..163a25123fc 100755 --- a/lowercasing_test/src/binref/compilejava.in +++ b/lowercasing_test/src/binref/compilejava.in @@ -1,10 +1,18 @@ #!/bin/sh # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. unset VESPA_LOG_TARGET -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/linguistics/target/linguistics.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar + +if [ -n $VESPA_CPP_TEST_JARS ]; then + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/linguistics.jar + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/vespajlib.jar +else + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/linguistics/target/linguistics.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar +fi + CLASSPATH=$CLASSPATH:@CMAKE_CURRENT_SOURCE_DIR@/../java/lowercasing_test.jar CLASSPATH=$CLASSPATH:. + if [ $# -lt 1 ]; then echo "usage: compilejava file ..." exit 1 diff --git a/lowercasing_test/src/binref/runjava.in b/lowercasing_test/src/binref/runjava.in index e252d06d1c1..911062e9619 100755 --- a/lowercasing_test/src/binref/runjava.in +++ b/lowercasing_test/src/binref/runjava.in @@ -1,10 +1,18 @@ #!/bin/sh # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. unset VESPA_LOG_TARGET -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/linguistics/target/linguistics.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar + +if [ -n $VESPA_CPP_TEST_JARS ]; then + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/linguistics.jar + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/vespajlib.jar +else + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/linguistics/target/linguistics.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar +fi + CLASSPATH=$CLASSPATH:@CMAKE_CURRENT_SOURCE_DIR@/../java/lowercasing_test.jar CLASSPATH=$CLASSPATH:. + if [ $# -lt 1 ]; then echo "usage: runjava <class> [args]" exit 1 diff --git a/messagebus_test/src/binref/compilejava.in b/messagebus_test/src/binref/compilejava.in index da5414e3ce4..b7c76f862a0 100755 --- a/messagebus_test/src/binref/compilejava.in +++ b/messagebus_test/src/binref/compilejava.in @@ -1,8 +1,15 @@ #!/bin/sh # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. unset VESPA_LOG_TARGET -CLASSPATH=@PROJECT_SOURCE_DIR@/messagebus/target/messagebus-jar-with-dependencies.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/component/target/component.jar + +if [ -n $VESPA_CPP_TEST_JARS ]; then + CLASSPATH=$VESPA_CPP_TEST_JARS/messagebus-jar-with-dependencies.jar + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/component.jar +else + CLASSPATH=@PROJECT_SOURCE_DIR@/messagebus/target/messagebus-jar-with-dependencies.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/component/target/component.jar +fi + CLASSPATH=$CLASSPATH:. if [ $# -lt 1 ]; then diff --git a/messagebus_test/src/binref/runjava.in b/messagebus_test/src/binref/runjava.in index c75e4d5cbc1..14540615ae6 100755 --- a/messagebus_test/src/binref/runjava.in +++ b/messagebus_test/src/binref/runjava.in @@ -2,9 +2,17 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. unset VESPA_LOG_TARGET unset LD_PRELOAD -CLASSPATH=@PROJECT_SOURCE_DIR@/messagebus/target/messagebus-jar-with-dependencies.jar -CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/component/target/component.jar + +if [ -n $VESPA_CPP_TEST_JARS ]; then + CLASSPATH=$VESPA_CPP_TEST_JARS/messagebus-jar-with-dependencies.jar + CLASSPATH=$CLASSPATH:$VESPA_CPP_TEST_JARS/component.jar +else + CLASSPATH=@PROJECT_SOURCE_DIR@/messagebus/target/messagebus-jar-with-dependencies.jar + CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/component/target/component.jar +fi + CLASSPATH=$CLASSPATH:. + if [ $# -lt 1 ]; then echo "usage: runjava <class> [args]" exit 1 |