diff options
-rw-r--r-- | java_fat/CMakeLists.txt | 2 | ||||
-rw-r--r-- | scripts/test_java.sh | 8 | ||||
-rw-r--r-- | test/java/CMakeLists.txt | 4 | ||||
-rw-r--r-- | test/java/manifest.txt.in | 2 | ||||
-rw-r--r-- | test/java/org/jau/pkg/TestJarUtil.java | 2 | ||||
-rw-r--r-- | test/java/org/jau/pkg/cache/TestTempJarCache.java | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/java_fat/CMakeLists.txt b/java_fat/CMakeLists.txt index 4636c64..da11ddc 100644 --- a/java_fat/CMakeLists.txt +++ b/java_fat/CMakeLists.txt @@ -10,7 +10,7 @@ # -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/MakeNativeJar.cmake set(jaulib_jar_file ${CMAKE_CURRENT_BINARY_DIR}/jaulib.jar CACHE FILEPATH "jaulib jar file" FORCE) -set(jaulib_fat_jar_file ${CMAKE_CURRENT_BINARY_DIR}/jaulib_fat.jar CACHE FILEPATH "jaulib fat jar file" FORCE) +set(jaulib_fat_jar_file ${CMAKE_CURRENT_BINARY_DIR}/jaulib-fat.jar CACHE FILEPATH "jaulib fat jar file" FORCE) set(jaulib_java_src_file ${CMAKE_CURRENT_BINARY_DIR}/jaulib-java-src.zip CACHE FILEPATH "jaulib java source file" FORCE) add_custom_command (OUTPUT ${jaulib_jar_file} ${jaulib_fat_jar_file} ${jaulib_java_src_file} diff --git a/scripts/test_java.sh b/scripts/test_java.sh index 71ba2ad..9d4934d 100644 --- a/scripts/test_java.sh +++ b/scripts/test_java.sh @@ -12,8 +12,8 @@ bname=`basename $0 .sh` dist_dir=$rootdir/dist-$archabi -if [ ! -e $dist_dir/lib/java/jaulib_test.jar ] ; then - echo "test exe $dist_dir/lib/java/jaulib_test.jar not existing" +if [ ! -e $dist_dir/lib/java/jaulib-test.jar ] ; then + echo "test exe $dist_dir/lib/java/jaulib-test.jar not existing" exit 1 fi @@ -40,9 +40,9 @@ runit() { echo logbasename $logbasename echo logfile $logfile - echo $EXE_WRAPPER java -cp /usr/share/java/junit4.jar:$dist_dir/lib/java/jaulib_test.jar $* + echo $EXE_WRAPPER java -cp /usr/share/java/junit4.jar:$dist_dir/lib/java/jaulib-test.jar $* - $EXE_WRAPPER java -cp /usr/share/java/junit4.jar:$dist_dir/lib/java/jaulib_test.jar $* + $EXE_WRAPPER java -cp /usr/share/java/junit4.jar:$dist_dir/lib/java/jaulib-test.jar $* } runit $* 2>&1 | tee $logfile diff --git a/test/java/CMakeLists.txt b/test/java/CMakeLists.txt index 58a7d66..9550ba4 100644 --- a/test/java/CMakeLists.txt +++ b/test/java/CMakeLists.txt @@ -4,7 +4,7 @@ find_jar(JUNIT_JAR NAMES junit4 junit PATHS "/usr/share/java") -set(jaulib_test_jar_file ${CMAKE_CURRENT_BINARY_DIR}/jaulib_test.jar CACHE FILEPATH "jaulib test jar file" FORCE) +set(jaulib_test_jar_file ${CMAKE_CURRENT_BINARY_DIR}/jaulib-test.jar CACHE FILEPATH "jaulib test jar file" FORCE) file(GLOB_RECURSE TEST_JAVA_SOURCES "*.java") @@ -19,7 +19,7 @@ add_jar(jaulib_test jau-test/info.txt INCLUDE_JARS ${jaulib_fat_jar_file} ${JUNIT_JAR} MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/manifest.txt - OUTPUT_NAME jaulib_test + OUTPUT_NAME jaulib-test ) add_dependencies(jaulib_test jaulib_fat_jar) diff --git a/test/java/manifest.txt.in b/test/java/manifest.txt.in index 3244085..1611a44 100644 --- a/test/java/manifest.txt.in +++ b/test/java/manifest.txt.in @@ -21,5 +21,5 @@ Extension-Name: org.jau.test Trusted-Library: true Permissions: all-permissions Application-Library-Allowable-Codebase: * -Class-Path: jaulib_fat.jar +Class-Path: jaulib-fat.jar Main-Class: org.jau.util.TestVersionInfo diff --git a/test/java/org/jau/pkg/TestJarUtil.java b/test/java/org/jau/pkg/TestJarUtil.java index f3d5f2c..aaccbe0 100644 --- a/test/java/org/jau/pkg/TestJarUtil.java +++ b/test/java/org/jau/pkg/TestJarUtil.java @@ -138,7 +138,7 @@ public class TestJarUtil extends JunitTracer { @Test public void testJarUtilFlat01() throws IOException, IllegalArgumentException, URISyntaxException { System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - validateJarUtil("jaulib_fat.jar", "org.jau.base.JaulibVersion", this.getClass().getClassLoader()); + validateJarUtil("jaulib-fat.jar", "org.jau.base.JaulibVersion", this.getClass().getClassLoader()); System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXX"); } diff --git a/test/java/org/jau/pkg/cache/TestTempJarCache.java b/test/java/org/jau/pkg/cache/TestTempJarCache.java index e577a94..da5b0a2 100644 --- a/test/java/org/jau/pkg/cache/TestTempJarCache.java +++ b/test/java/org/jau/pkg/cache/TestTempJarCache.java @@ -198,7 +198,7 @@ public class TestTempJarCache extends JunitTracer { public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException { if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; } // FIXME ?? final Uri.Encoded nativeJarName = Uri.Encoded.cast("jaulib_jni-natives-"+PlatformProps.os_and_arch+".jar"); - final Uri.Encoded nativeJarName = Uri.Encoded.cast("jaulib_fat.jar"); + final Uri.Encoded nativeJarName = Uri.Encoded.cast("jaulib-fat.jar"); final String libBaseName = "jaulib_jni_jni"; final ClassLoader cl = getClass().getClassLoader(); |