Zorba

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

  1. zorba-win64
  2. Merge into trunk
Proposed by Juan Zacarias
Status: Merged
Merged at revision: 11587
Proposed branch: lp:~zorba-coders/zorba/zorba-win64
Merge into: lp:zorba
Diff against target: 71 lines (+26/-2)
3 files modified
CMakeCPack.cmake (+6/-1)
cmake_modules/Windows/ProxyFindModule.cmake (+15/-0)
src/debugger/socket.h (+5/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/zorba-win64
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+178846@code.launchpad.net

Commit message

Fixes for Windows64

Description of the change

Fixes for Windows64

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeCPack.cmake'
2--- CMakeCPack.cmake 2013-02-07 17:24:36 +0000
3+++ CMakeCPack.cmake 2013-08-06 20:42:37 +0000
4@@ -83,6 +83,11 @@
5 SET(CPACK_COMPONENT_THESAURUS_INSTALL_TYPES Full)
6 SET(CPACK_COMPONENT_CSHARP_SWIG_INSTALL_TYPES Full)
7
8+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_GROUP "external_modules")
9+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_DISPLAY_NAME "schema tools module")
10+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_DESCRIPTION "Install the functionalities of the schema tools module.")
11+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_INSTALL_TYPES Full)
12+
13 INCLUDE(${CMAKE_BINARY_DIR}/CMakeCPackModules.cmake)
14
15
16@@ -103,7 +108,7 @@
17
18 IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
19 IF(CMAKE_CL_64)
20- SET(CPACK_SYSTEM_NAME win64-${CMAKE_SYSTEM_PROCESSOR})
21+ SET(CPACK_SYSTEM_NAME win64-x64)
22 ELSE(CMAKE_CL_64)
23 SET(CPACK_SYSTEM_NAME win32-${CMAKE_SYSTEM_PROCESSOR})
24 ENDIF(CMAKE_CL_64)
25
26=== modified file 'cmake_modules/Windows/ProxyFindModule.cmake'
27--- cmake_modules/Windows/ProxyFindModule.cmake 2013-02-07 17:24:36 +0000
28+++ cmake_modules/Windows/ProxyFindModule.cmake 2013-08-06 20:42:37 +0000
29@@ -123,6 +123,21 @@
30
31 # if not already provided add the program files directory
32 SET (SEARCH_PATHS ${ZORBA_THIRD_PARTY_REQUIREMENTS})
33+
34+ STRING (REGEX MATCHALL "machine:x64" MACHINE_X64_FOUND "${CMAKE_EXE_LINKER_FLAGS}")
35+ IF(MACHINE_X64_FOUND)
36+ LIST (FIND SEARCH_PATHS "C:/Program Files" PRORAM_FILES_FOUND)
37+ IF (PRORAM_FILES_FOUND EQUAL -1)
38+ SET (SEARCH_PATHS "${SEARCH_PATHS}" "C:/Program Files")
39+ ENDIF (PRORAM_FILES_FOUND EQUAL -1)
40+ ELSE(MACHINE_X64_FOUND)
41+ LIST (FIND SEARCH_PATHS "$ENV{ProgramFiles}" PRORAM_FILES_FOUND)
42+ IF (PRORAM_FILES_FOUND EQUAL -1)
43+ SET (SEARCH_PATHS "${SEARCH_PATHS}" "$ENV{ProgramFiles}")
44+ ENDIF (PRORAM_FILES_FOUND EQUAL -1)
45+ ENDIF(MACHINE_X64_FOUND)
46+
47+
48 LIST (FIND SEARCH_PATHS "$ENV{ProgramFiles}" PRORAM_FILES_FOUND)
49 IF (PRORAM_FILES_FOUND EQUAL -1)
50 SET (SEARCH_PATHS "${SEARCH_PATHS}" "$ENV{ProgramFiles}")
51
52=== modified file 'src/debugger/socket.h'
53--- src/debugger/socket.h 2013-02-07 17:24:36 +0000
54+++ src/debugger/socket.h 2013-08-06 20:42:37 +0000
55@@ -21,12 +21,16 @@
56
57 #include <zorba/debugger_exception.h>
58
59-#ifdef WIN32
60+#ifdef _WIN64
61+ typedef unsigned __int64 SOCKET;
62+#else
63+#ifdef _WIN32
64 typedef unsigned int __w64 SOCKET;
65 #else
66 # define INVALID_SOCKET -1
67 typedef int SOCKET;
68 #endif
69+#endif
70
71 namespace zorba {
72

Subscribers

People subscribed via source and target branches