Merge lp:~zorba-coders/zorba/zorba-win64 into lp:zorba

[Juan Zacarias]

Fixes for Windows64

Fixes for Windows64

[Chris Hillery (ceejatec)]

review: Approve

[Juan Zacarias (juan457)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'CMakeCPack.cmake'
--- CMakeCPack.cmake	2013-02-07 17:24:36 +0000
+++ CMakeCPack.cmake	2013-08-06 20:42:37 +0000
@@ -83,6 +83,11 @@
 SET(CPACK_COMPONENT_THESAURUS_INSTALL_TYPES Full)
 SET(CPACK_COMPONENT_CSHARP_SWIG_INSTALL_TYPES Full)
 
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_GROUP "external_modules")
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_DISPLAY_NAME "schema tools module")
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_DESCRIPTION "Install the functionalities of the schema tools module.")
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_INSTALL_TYPES Full)
+
 INCLUDE(${CMAKE_BINARY_DIR}/CMakeCPackModules.cmake)
 
 
@@ -103,7 +108,7 @@
 
 IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
 IF(CMAKE_CL_64)
-  SET(CPACK_SYSTEM_NAME win64-${CMAKE_SYSTEM_PROCESSOR})
+  SET(CPACK_SYSTEM_NAME win64-x64)
 ELSE(CMAKE_CL_64)
   SET(CPACK_SYSTEM_NAME win32-${CMAKE_SYSTEM_PROCESSOR})
 ENDIF(CMAKE_CL_64)
 
=== modified file 'cmake_modules/Windows/ProxyFindModule.cmake'
--- cmake_modules/Windows/ProxyFindModule.cmake	2013-02-07 17:24:36 +0000
+++ cmake_modules/Windows/ProxyFindModule.cmake	2013-08-06 20:42:37 +0000
@@ -123,6 +123,21 @@
 
   # if not already provided add the program files directory
   SET (SEARCH_PATHS ${ZORBA_THIRD_PARTY_REQUIREMENTS})
+
+  STRING (REGEX MATCHALL "machine:x64" MACHINE_X64_FOUND "${CMAKE_EXE_LINKER_FLAGS}")
+  IF(MACHINE_X64_FOUND)
+    LIST (FIND SEARCH_PATHS "C:/Program Files" PRORAM_FILES_FOUND)
+    IF (PRORAM_FILES_FOUND EQUAL -1)
+      SET (SEARCH_PATHS "${SEARCH_PATHS}" "C:/Program Files")
+    ENDIF (PRORAM_FILES_FOUND EQUAL -1)
+  ELSE(MACHINE_X64_FOUND)
+    LIST (FIND SEARCH_PATHS "$ENV{ProgramFiles}" PRORAM_FILES_FOUND)
+    IF (PRORAM_FILES_FOUND EQUAL -1)
+      SET (SEARCH_PATHS "${SEARCH_PATHS}" "$ENV{ProgramFiles}")
+    ENDIF (PRORAM_FILES_FOUND EQUAL -1)
+  ENDIF(MACHINE_X64_FOUND)
+  
+  
   LIST (FIND SEARCH_PATHS "$ENV{ProgramFiles}" PRORAM_FILES_FOUND)
   IF (PRORAM_FILES_FOUND EQUAL -1)
     SET (SEARCH_PATHS "${SEARCH_PATHS}" "$ENV{ProgramFiles}")
 
=== modified file 'src/debugger/socket.h'
--- src/debugger/socket.h	2013-02-07 17:24:36 +0000
+++ src/debugger/socket.h	2013-08-06 20:42:37 +0000
@@ -21,12 +21,16 @@
 
 #include <zorba/debugger_exception.h>
 
-#ifdef WIN32
+#ifdef _WIN64
+  typedef unsigned __int64 SOCKET;
+#else
+#ifdef _WIN32
   typedef unsigned int __w64 SOCKET;
 #else
 # define INVALID_SOCKET -1
 typedef int SOCKET;
 #endif
+#endif
 
 namespace zorba {