[ismrmrd] 192/281: adding Java XML header API docs to matlab install destination

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:01:13 UTC 2015


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit 4bc1b14e5963522c7ba58148b361bf21f1a72543
Author: Joseph Naegele <naegelejd at mail.nih.gov>
Date:   Thu Dec 5 11:33:32 2013 -0500

    adding Java XML header API docs to matlab install destination
---
 bindings/java/CMakeLists.txt | 5 ++++-
 bindings/java/make_jar.sh.in | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index 8790bd3..d0df47e 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -13,7 +13,7 @@ set_source_files_properties(${SWIG_SOURCES} PROPERTIES CPLUSPLUS ON)
 swig_add_module(jismrmrd java ${SWIG_SOURCES})
 swig_link_libraries(jismrmrd ${HDF5_LIBRARIES} ${Boost_LIBRARIES})
 
-## TODO: not use a unix shell script
+## TODO: not use a shell script
 configure_file(make_jar.sh.in make_jar.sh @ONLY)
 set_source_files_properties(ismrmrd.jar PROPERTIES GENERATED true)
 add_custom_command(
@@ -33,3 +33,6 @@ add_custom_command(
 install(TARGETS jismrmrd DESTINATION java)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ismrmrd.jar DESTINATION java)
 
+# Note: the API documentation is only for the XML header, and is installed
+# in ${INSTALL_PREFIX}/matlab/doc
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION matlab)
diff --git a/bindings/java/make_jar.sh.in b/bindings/java/make_jar.sh.in
index a04fa97..d23fa2d 100755
--- a/bindings/java/make_jar.sh.in
+++ b/bindings/java/make_jar.sh.in
@@ -9,5 +9,5 @@ javac org/ismrm/ismrmrd/xmlhdr/*.java
 # Build a big jar
 jar -cvf ismrmrd.jar org/ismrm/ismrmrd/*.class org/ismrm/ismrmrd/xmlhdr/*.class
 
-# Build the java docs
-javadoc -quiet -d ismrmrd.javadoc -subpackages org.ismrm.ismrmrd
+# Build the java docs only for the XML header API
+javadoc -quiet -d doc -subpackages org.ismrm.ismrmrd.xmlhdr

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git



More information about the debian-science-commits mailing list