Merge lp:~zorba-coders/zorba/csharp-win-installer-fix into lp:zorba

[Juan Zacarias]

Fixed windows installer component options for c# Bindings

[lp:~zorba-coders/zorba/csharp-win-installer-fix]

10970. By Juan Zacarias on 2012-08-03

Windows Installer change: Added thesaurus and csharp Bindings to Full installation type

[Chris Hillery (ceejatec)]

Changes look good, but can you revert the line-endings change to NOTICE.xml?

review: Needs Fixing

[Chris Hillery (ceejatec)]

Er, NOTICE.txt, that is.

[lp:~zorba-coders/zorba/csharp-win-installer-fix]

10971. By Juan Zacarias on 2012-08-06

reverted change on NOTICE.txt

[Juan Zacarias (juan457)]

> Er, NOTICE.txt, that is.
Fixed

[Chris Hillery (ceejatec)]

review: Approve

[Rodolfo Ochoa (rodolfo-ochoa)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/csharp-win-installer-fix-2012-08-06T22-59-02.344Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job csharp-win-installer-fix-2012-08-06T22-59-02.344Z is finished. The final status was:

All tests succeeded!

=== modified file 'CMakeCPack.cmake'
--- CMakeCPack.cmake	2012-08-03 04:35:01 +0000
+++ CMakeCPack.cmake	2012-08-06 17:21:38 +0000
@@ -33,6 +33,7 @@
 SET(CPACK_COMPONENT_RUBY_SWIG_DISPLAY_NAME "Ruby API")
 SET(CPACK_COMPONENT_XQJ_SWIG_DISPLAY_NAME "Java XQJ API")
 SET(CPACK_COMPONENT_THESAURUS_DISPLAY_NAME "Thesaurus")
+SET(CPACK_COMPONENT_CSHARP_SWIG_DISPLAY_NAME "C# API")
 
 SET(CPACK_COMPONENT_UNSPECIFIED_DESCRIPTION "Zorba Required Files.")
 SET(CPACK_COMPONENT_DOC_DESCRIPTION "Files with the Description of different features of zorba.")
@@ -46,6 +47,7 @@
 SET(CPACK_COMPONENT_RUBY_SWIG_DESCRIPTION "API for Ruby")
 SET(CPACK_COMPONENT_XQJ_SWIG_DESCRIPTION "XQJ API for Java")
 SET(CPACK_COMPONENT_THESAURUS_DESCRIPTION "Thesaurus for Zorba")
+SET(CPACK_COMPONENT_CSHARP_SWIG_DESCRIPTION "API for C#")
 
 SET(CPACK_COMPONENT_DOC_GROUP "Documents")
 SET(CPACK_COMPONENT_PHP_EXAMPLES_GROUP "Documents")
@@ -58,6 +60,7 @@
 SET(CPACK_COMPONENT_PYTHON_SWIG_GROUP "APIs")
 SET(CPACK_COMPONENT_RUBY_SWIG_GROUP "APIs")
 SET(CPACK_COMPONENT_XQJ_SWIG_GROUP "APIs")
+SET(CPACK_COMPONENT_CSHARP_SWIG_GROUP "APIs")
 
 SET(CPACK_COMPONENT_GROUP_EXTERNAL_MODULES_DISPLAY_NAME "External Modules")
 SET(CPACK_COMPONENT_GROUP_EXTERNAL_MODULES_DESCRIPTION "Complete list of external modules.")
@@ -77,8 +80,8 @@
 SET(CPACK_COMPONENT_RUBY_SWIG_INSTALL_TYPES Full)
 SET(CPACK_COMPONENT_XQJ_SWIG_INSTALL_TYPES Full)
 SET(CPACK_COMPONENT_UNSPECIFIED_INSTALL_TYPES Full Simple Lite)
-SET(CPACK_COMPONENT_THESAURUS_INSTALL_TYPE Full)
-
+SET(CPACK_COMPONENT_THESAURUS_INSTALL_TYPES Full)
+SET(CPACK_COMPONENT_CSHARP_SWIG_INSTALL_TYPES Full)
 
 INCLUDE(${CMAKE_BINARY_DIR}/CMakeCPackModules.cmake)
 

=== modified file 'doc/CMakeLists.txt'
--- doc/CMakeLists.txt	2012-07-30 20:09:08 +0000
+++ doc/CMakeLists.txt	2012-08-06 17:21:38 +0000
@@ -97,6 +97,10 @@
   INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xqj/html 
         COMPONENT "doc"
         DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqj)
+        
+  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/csharp/html 
+        COMPONENT "doc"
+        DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/csharp)        
 ENDIF (SWIG_FOUND)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zorba/html 

=== modified file 'swig/csharp/CMakeLists.txt'
--- swig/csharp/CMakeLists.txt	2012-07-30 20:09:08 +0000
+++ swig/csharp/CMakeLists.txt	2012-08-06 17:21:38 +0000
@@ -38,16 +38,16 @@
   IF (MSVC_IDE)
     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/zorba_api.dll 
     DESTINATION share/csharp
-    COMPONENT "C# Bindings ")
+    COMPONENT csharp_swig)
   ELSE (MSVC_IDE)
     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.dll 
     DESTINATION share/csharp
-    COMPONENT "C# Bindings ")
+    COMPONENT csharp_swig)
   ENDIF (MSVC_IDE)
   
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_csharp.dll 
   DESTINATION share/csharp
-  COMPONENT "C# Bindings ")
+  COMPONENT csharp_swig)
 
   ADD_SUBDIRECTORY (tests)