summaryrefslogtreecommitdiffstats
path: root/java_fat
diff options
context:
space:
mode:
Diffstat (limited to 'java_fat')
-rw-r--r--java_fat/CMakeLists.txt31
-rw-r--r--java_fat/manifest-fat.txt.in46
-rw-r--r--java_fat/manifest-fat2.txt.in (renamed from java_fat/manifest.txt.in)19
3 files changed, 85 insertions, 11 deletions
diff --git a/java_fat/CMakeLists.txt b/java_fat/CMakeLists.txt
index 4a641125..f29b6b09 100644
--- a/java_fat/CMakeLists.txt
+++ b/java_fat/CMakeLists.txt
@@ -10,10 +10,11 @@
# -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/MakeNativeJar.cmake
# set(direct_bt_jar_file ${CMAKE_CURRENT_BINARY_DIR}/direct_bt.jar CACHE FILEPATH "direct_bt jar file" FORCE)
-set(direct_bt_fat_jar_file ${CMAKE_CURRENT_BINARY_DIR}/direct_bt_fat.jar CACHE FILEPATH "direct_bt fat jar file" FORCE)
-set(direct_bt_java_src_file ${CMAKE_CURRENT_BINARY_DIR}/direct_bt_java_src.zip CACHE FILEPATH "direct_bt java source file" FORCE)
+set(direct_bt_fat_jar_file ${CMAKE_CURRENT_BINARY_DIR}/direct_bt-fat.jar CACHE FILEPATH "direct_bt fat jar file" FORCE)
+set(direct_bt_fat2_jar_file ${CMAKE_CURRENT_BINARY_DIR}/direct_bt-fat2.jar CACHE FILEPATH "direct_bt fat2 jar file" FORCE)
+set(direct_bt_java_src_file ${CMAKE_CURRENT_BINARY_DIR}/direct_bt-java-src.zip CACHE FILEPATH "direct_bt java source file" FORCE)
-add_custom_command (OUTPUT ${direct_bt_fat_jar_file} ${direct_bt_java_src_file}
+add_custom_command (OUTPUT ${direct_bt_fat_jar_file} ${direct_bt_fat2_jar_file} ${direct_bt_java_src_file}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND}
-D_srcdir=${CMAKE_CURRENT_BINARY_DIR}/../src/direct_bt
@@ -28,6 +29,20 @@ add_custom_command (OUTPUT ${direct_bt_fat_jar_file} ${direct_bt_java_src_file}
-D_dstbasename=${CMAKE_SHARED_LIBRARY_PREFIX}javadirect_bt${CMAKE_SHARED_LIBRARY_SUFFIX}
-P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FileCopyS2D.cmake
COMMAND ${CMAKE_COMMAND}
+ -D _dstdir:PATH='${CMAKE_CURRENT_BINARY_DIR}/temp'
+ -D _archives:FILEPATH="${jaulib_fat_jar_file}"
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/ExtractArchiveList.cmake
+ COMMAND ${JAR}
+ --create --file ${direct_bt_fat2_jar_file}
+ --manifest ${CMAKE_CURRENT_BINARY_DIR}/manifest-fat2.txt
+ -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ jau
+ -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ org
+ -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ natives
+ -C ${CMAKE_CURRENT_BINARY_DIR}/../java/${CMAKE_FILES_DIRECTORY}/direct_bt_jar.dir/ jau
+ -C ${CMAKE_CURRENT_BINARY_DIR}/../java/${CMAKE_FILES_DIRECTORY}/direct_bt_jar.dir/ org
+ -C ${CMAKE_CURRENT_BINARY_DIR}/ natives
+
+ COMMAND ${CMAKE_COMMAND}
-D_srcdir=${CMAKE_CURRENT_BINARY_DIR}/../src/tinyb
-D_dstdir=${CMAKE_CURRENT_BINARY_DIR}/natives/${OS_AND_ARCH}
-D_srcbasename=${CMAKE_SHARED_LIBRARY_PREFIX}tinyb${CMAKE_SHARED_LIBRARY_SUFFIX}.${tinyb_VERSION_STRING}
@@ -41,11 +56,15 @@ add_custom_command (OUTPUT ${direct_bt_fat_jar_file} ${direct_bt_java_src_file}
-P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FileCopyS2D.cmake
COMMAND ${JAR}
--create --file ${direct_bt_fat_jar_file}
- --manifest ${CMAKE_CURRENT_BINARY_DIR}/manifest.txt
+ --manifest ${CMAKE_CURRENT_BINARY_DIR}/manifest-fat.txt
+ -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ jau
+ -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ org
+ -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ natives
-C ${CMAKE_CURRENT_BINARY_DIR}/../java/${CMAKE_FILES_DIRECTORY}/direct_bt_jar.dir/ jau
-C ${CMAKE_CURRENT_BINARY_DIR}/../java/${CMAKE_FILES_DIRECTORY}/direct_bt_jar.dir/ org
-C ${CMAKE_CURRENT_BINARY_DIR}/../java/${CMAKE_FILES_DIRECTORY}/direct_bt_jar.dir/ tinyb
-C ${CMAKE_CURRENT_BINARY_DIR}/ natives
+
COMMAND ${JAR}
--create --file ${direct_bt_java_src_file}
--no-manifest
@@ -58,11 +77,11 @@ add_custom_command (OUTPUT ${direct_bt_fat_jar_file} ${direct_bt_java_src_file}
)
add_custom_target (direct_bt_fat_jar ALL
- DEPENDS ${direct_bt_fat_jar_file} ${direct_bt_java_src_file}
+ DEPENDS ${direct_bt_fat_jar_file} ${direct_bt_fat2_jar_file} ${direct_bt_java_src_file}
)
add_dependencies(direct_bt_fat_jar jaulib_fat_jar direct_bt tinyb direct_bt_jar javadirect_bt javatinyb)
-install (FILES ${direct_bt_fat_jar_file} ${direct_bt_java_src_file} DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java)
+install (FILES ${direct_bt_fat_jar_file} ${direct_bt_fat2_jar_file} ${direct_bt_java_src_file} DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java)
diff --git a/java_fat/manifest-fat.txt.in b/java_fat/manifest-fat.txt.in
new file mode 100644
index 00000000..c9f0c3b5
--- /dev/null
+++ b/java_fat/manifest-fat.txt.in
@@ -0,0 +1,46 @@
+Manifest-Version: 1.0
+Bundle-Date: @BUILD_TSTAMP@
+Bundle-ManifestVersion: 2
+Bundle-Name: org.direct_bt
+Bundle-SymbolicName: org.direct_bt
+Bundle-Version: @VERSION_SHORT@
+Export-Package: org.direct_bt
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.9))"
+Package-Title: org.direct_bt
+Package-Vendor: Gothel Software
+Package-Version: @VERSION_SHORT@
+Specification-Title: Direct-BT Jaulib Fat
+Specification-Vendor: Gothel Software
+Specification-Version: @VERSION_API@
+Implementation-Title: Direct-BT Jaulib Fat (w/ TinyB)
+Implementation-Vendor: Gothel Software
+Implementation-Version: @VERSION@
+Implementation-Commit: @VERSION_SHA1@
+Implementation-URL: http://www.jausoft.com/
+Extension-Name: org.direct_bt
+Trusted-Library: true
+Permissions: all-permissions
+Application-Library-Allowable-Codebase: *
+Main-Class: org.direct_bt.DirectBTVersion
+
+Name: org/jau
+Sealed: true
+
+Name: jau/util
+Sealed: true
+
+Name: jau/sys
+Sealed: true
+
+Name: jau/pkg
+Sealed: true
+
+Name: org/direct_bt/
+Sealed: true
+
+Name: tinyb/dbus/
+Sealed: true
+
+Name: jau/direct_bt/
+Sealed: true
+
diff --git a/java_fat/manifest.txt.in b/java_fat/manifest-fat2.txt.in
index eba8d645..46f4fd34 100644
--- a/java_fat/manifest.txt.in
+++ b/java_fat/manifest-fat2.txt.in
@@ -9,10 +9,10 @@ Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.9))"
Package-Title: org.direct_bt
Package-Vendor: Gothel Software
Package-Version: @VERSION_SHORT@
-Specification-Title: Direct-BT Fat
+Specification-Title: Direct-BT Jaulib Fat
Specification-Vendor: Gothel Software
Specification-Version: @VERSION_API@
-Implementation-Title: Direct-BT Fat (optionally with TinyB)
+Implementation-Title: Direct-BT Jaulib Fat (ex TinyB)
Implementation-Vendor: Gothel Software
Implementation-Version: @VERSION@
Implementation-Commit: @VERSION_SHA1@
@@ -21,12 +21,21 @@ Extension-Name: org.direct_bt
Trusted-Library: true
Permissions: all-permissions
Application-Library-Allowable-Codebase: *
-Class-Path: jaulib_fat.jar
+Main-Class: org.direct_bt.DirectBTVersion
-Name: org/direct_bt/
+Name: org/jau
+Sealed: true
+
+Name: jau/util
+Sealed: true
+
+Name: jau/sys
+Sealed: true
+
+Name: jau/pkg
Sealed: true
-Name: tinyb/dbus/
+Name: org/direct_bt/
Sealed: true
Name: jau/direct_bt/
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 08:54:11 +0000