diff options
| author | Sven Gothel <[email protected]> | 2021-01-26 19:29:42 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2021-01-26 19:29:42 +0100 |
| commit | df624074383d6e3dfd9ae2060beb8fce9ad73064 (patch) | |
| tree | bb14a85db1ce9f7eda1e4765637176964b509539 /java_fat | |
| parent | e28989f1ea739c65c584a3e1e5eb4f812ffa146f (diff) | |
Move tests to 'jau.test' to not violate potentially sealed org.jar or jau. packages. Also ..
.. adding example in cmake to merge jar files -> test/java/CMakeLists.txt,
i.e. a big fat test jar file.
Diffstat (limited to 'java_fat')
| -rw-r--r-- | java_fat/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java_fat/manifest-fat.txt.in | 37 | ||||
| -rw-r--r-- | java_fat/manifest.txt.in | 15 |
3 files changed, 50 insertions, 4 deletions
diff --git a/java_fat/CMakeLists.txt b/java_fat/CMakeLists.txt index da11ddc..fcffc5f 100644 --- a/java_fat/CMakeLists.txt +++ b/java_fat/CMakeLists.txt @@ -39,7 +39,7 @@ add_custom_command (OUTPUT ${jaulib_jar_file} ${jaulib_fat_jar_file} ${jaulib_ja -C ${CMAKE_CURRENT_BINARY_DIR}/../java_pkg/${CMAKE_FILES_DIRECTORY}/jaulib_pkg_jar.dir/ org COMMAND ${JAR} --create --file ${jaulib_fat_jar_file} - --manifest ${CMAKE_CURRENT_BINARY_DIR}/manifest.txt + --manifest ${CMAKE_CURRENT_BINARY_DIR}/manifest-fat.txt -C ${CMAKE_CURRENT_BINARY_DIR}/../java_base/${CMAKE_FILES_DIRECTORY}/jaulib_base_jar.dir/ jau -C ${CMAKE_CURRENT_BINARY_DIR}/../java_base/${CMAKE_FILES_DIRECTORY}/jaulib_base_jar.dir/ org -C ${CMAKE_CURRENT_BINARY_DIR}/../java_jni/${CMAKE_FILES_DIRECTORY}/jaulib_jni_jar.dir/ jau diff --git a/java_fat/manifest-fat.txt.in b/java_fat/manifest-fat.txt.in new file mode 100644 index 0000000..50f0a68 --- /dev/null +++ b/java_fat/manifest-fat.txt.in @@ -0,0 +1,37 @@ +Manifest-Version: 1.0 +Bundle-Date: @BUILD_TSTAMP@ +Bundle-ManifestVersion: 2 +Bundle-Name: org.jau +Bundle-SymbolicName: org.jau +Bundle-Version: @VERSION_SHORT@ +Export-Package: org.jau +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.9))" +Package-Title: org.jau +Package-Vendor: Gothel Software +Package-Version: @VERSION_SHORT@ +Specification-Title: Jaulib Fat +Specification-Vendor: Gothel Software +Specification-Version: @VERSION_API@ +Implementation-Title: Jaulib Fat +Implementation-Vendor: Gothel Software +Implementation-Version: @VERSION@ +Implementation-Commit: @VERSION_SHA1@ +Implementation-URL: http://www.jausoft.com/ +Extension-Name: org.jau +Trusted-Library: true +Permissions: all-permissions +Application-Library-Allowable-Codebase: * +Main-Class: org.jau.base.JaulibVersion + +Name: org/jau +Sealed: true + +Name: jau/util +Sealed: true + +Name: jau/sys +Sealed: true + +Name: jau/pkg +Sealed: true + diff --git a/java_fat/manifest.txt.in b/java_fat/manifest.txt.in index 7132ad9..e163ae6 100644 --- a/java_fat/manifest.txt.in +++ b/java_fat/manifest.txt.in @@ -9,10 +9,10 @@ Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.9))" Package-Title: org.jau Package-Vendor: Gothel Software Package-Version: @VERSION_SHORT@ -Specification-Title: Jaulib Fat +Specification-Title: Jaulib Whole Specification-Vendor: Gothel Software Specification-Version: @VERSION_API@ -Implementation-Title: Jaulib Fat +Implementation-Title: Jaulib Whole Implementation-Vendor: Gothel Software Implementation-Version: @VERSION@ Implementation-Commit: @VERSION_SHA1@ @@ -24,5 +24,14 @@ Application-Library-Allowable-Codebase: * Main-Class: org.jau.base.JaulibVersion Name: org/jau -Sealed: false +Sealed: true + +Name: jau/util +Sealed: true + +Name: jau/sys +Sealed: true + +Name: jau/pkg +Sealed: true |