zorba-coders team mailing list archive

[Rodolfo Ochoa <rodolfo.ochoa@xxxxxxxxx>]

Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/xqj_installers into lp:zorba.

Requested reviews:
  Juan Zacarias (juan457)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xqj_installers/+merge/108257

Install added for XQJ layer
-- 
https://code.launchpad.net/~zorba-coders/zorba/xqj_installers/+merge/108257
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'doc/CMakeLists.txt'
--- doc/CMakeLists.txt	2012-05-03 12:31:51 +0000
+++ doc/CMakeLists.txt	2012-05-31 22:43:20 +0000
@@ -91,6 +91,10 @@
   INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ruby/html  
         COMPONENT "doc"
         DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/ruby)
+
+  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xqj/html 
+        COMPONENT "doc"
+        DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqj)
 ENDIF (SWIG_FOUND)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zorba/html 

=== modified file 'swig/xqj/CMakeLists.txt'
--- swig/xqj/CMakeLists.txt	2012-05-03 12:31:51 +0000
+++ swig/xqj/CMakeLists.txt	2012-05-31 22:43:20 +0000
@@ -81,6 +81,13 @@
     SET_TESTS_PROPERTIES("swig_xqj" PROPERTIES FAIL_REGULAR_EXPRESSION "Failures;Errors")
   ENDIF(WIN32)
 
+  # Install section
+  FILE(GLOB XQJ_SWIG_FILES "${CMAKE_CURRENT_BINARY_DIR}/*.java")
+  IF(NOT WIN32)
+    INSTALL(FILES ${XQJ_SWIG_FILES} DESTINATION ${JAVA_SITEARCH_DIR})
+  ELSE(NOT WIN32)
+    INSTALL(FILES ${XQJ_SWIG_FILES} DESTINATION share/xqj COMPONENT "XQJ Binding")
+  ENDIF(NOT WIN32)
 
 ELSE (JAVA_INCLUDE_PATH)
   MESSAGE ( STATUS "SWIG Java: Not generating XQJ API because JNI headers not found.")