1
=== added file '.bzrignore'
2
--- .bzrignore	1970-01-01 00:00:00 +0000
3
+++ .bzrignore	2013-01-25 00:15:35 +0000
4
@@ -0,0 +1,2 @@
5
1
CMakeLists.txt.user
6
2
build
7
0
3
8
=== modified file 'AUTHORS.txt'
9
--- AUTHORS.txt	2011-02-09 15:40:01 +0000
10
+++ AUTHORS.txt	2013-01-25 00:15:35 +0000
11
@@ -22,18 +22,24 @@
12
22
  * Matthias Brantner
22
  * Matthias Brantner
13
23
  * Nicolae Brinza
23
  * Nicolae Brinza
14
24
  * William Candillon
24
  * William Candillon
16
25
  * Dana Florescu                                                                                       
25
  * Dana Florescu
17
26
  * David Graf
26
  * David Graf
18
27
  * Chris Hillery
27
  * Chris Hillery
19
28
  * Donald Kossmann 
28
  * Donald Kossmann 
20
29
  * Tim Kraska
29
  * Tim Kraska
21
30
  * Paul Kunz
30
  * Paul Kunz
22
31
  * Carlos Lopez
23
31
  * Paul Lucas
32
  * Paul Lucas
24
32
  * Dan Muresan
33
  * Dan Muresan
25
33
  * Sorin Nasoi
34
  * Sorin Nasoi
26
35
  * Rodolfo Ochoa
27
34
  * Paul Pedersen
36
  * Paul Pedersen
28
35
  * Gabriel Petrovay
37
  * Gabriel Petrovay
29
36
  * Markus Pilman
38
  * Markus Pilman
30
37
  * Sam Rehman
39
  * Sam Rehman
31
40
  * Luis Rodriguez
32
41
  * Daniel Thomas
33
38
  * Daniel Turcanu
42
  * Daniel Turcanu
34
43
  * Till Westmann
35
44
  * Juan Zacarias
36
39
  * Markos Zaharioudakis
45
  * Markos Zaharioudakis
37
40
46
38
=== modified file 'CMakeCPack.cmake'
39
--- CMakeCPack.cmake	2009-10-30 16:24:51 +0000
40
+++ CMakeCPack.cmake	2013-01-25 00:15:35 +0000
41
@@ -17,6 +17,75 @@
42
17
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
17
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
43
18
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
18
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
44
19
19
45
20
46
21
SET(CPACK_NSIS_COMPONENT_INSTALL ON)
47
22
SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "FALSE")
48
23
49
24
SET(CPACK_COMPONENT_UNSPECIFIED_DISPLAY_NAME "Zorba")
50
25
SET(CPACK_COMPONENT_DOC_DISPLAY_NAME "Docs")
51
26
SET(CPACK_COMPONENT_PHP_EXAMPLES_DISPLAY_NAME "PHP Examples")
52
27
SET(CPACK_COMPONENT_CXX_EXAMPLES_DISPLAY_NAME "CXX Examples")
53
28
SET(CPACK_COMPONENT_PYTHON_EXAMPLES_DISPLAY_NAME "Python Examples")
54
29
SET(CPACK_COMPONENT_RUBY_EXAMPLES_DISPLAY_NAME "Ruby Examples")
55
30
SET(CPACK_COMPONENT_JAVA_SWIG_DISPLAY_NAME "Java API")
56
31
SET(CPACK_COMPONENT_PHP_SWIG_DISPLAY_NAME "PHP API")
57
32
SET(CPACK_COMPONENT_PYTHON_SWIG_DISPLAY_NAME "Python API")
58
33
SET(CPACK_COMPONENT_RUBY_SWIG_DISPLAY_NAME "Ruby API")
59
34
SET(CPACK_COMPONENT_XQJ_SWIG_DISPLAY_NAME "Java XQJ API")
60
35
SET(CPACK_COMPONENT_THESAURUS_DISPLAY_NAME "Thesaurus")
61
36
SET(CPACK_COMPONENT_CSHARP_SWIG_DISPLAY_NAME "C# API")
62
37
63
38
SET(CPACK_COMPONENT_UNSPECIFIED_DESCRIPTION "Zorba Required Files.")
64
39
SET(CPACK_COMPONENT_DOC_DESCRIPTION "Files with the Description of different features of zorba.")
65
40
SET(CPACK_COMPONENT_PHP_EXAMPLES_DESCRIPTION "Examples for the PHP extension.")
66
41
SET(CPACK_COMPONENT_PYTHON_EXAMPLES_DESCRIPTION "Examples for the Python extension.")
67
42
SET(CPACK_COMPONENT_RUBY_EXAMPLES_DESCRIPTION "Examples for the Ruby extension.")
68
43
SET(CPACK_COMPONENT_CXX_EXAMPLES_DESCRIPTION "Examples for CXX.")
69
44
SET(CPACK_COMPONENT_JAVA_SWIG_DESCRIPTION "API for Java")
70
45
SET(CPACK_COMPONENT_PHP_SWIG_DESCRIPTION "API for PHP")
71
46
SET(CPACK_COMPONENT_PYTHON_SWIG_DESCRIPTION "API for Python")
72
47
SET(CPACK_COMPONENT_RUBY_SWIG_DESCRIPTION "API for Ruby")
73
48
SET(CPACK_COMPONENT_XQJ_SWIG_DESCRIPTION "XQJ API for Java")
74
49
SET(CPACK_COMPONENT_THESAURUS_DESCRIPTION "Thesaurus for Zorba")
75
50
SET(CPACK_COMPONENT_CSHARP_SWIG_DESCRIPTION "API for C#")
76
51
77
52
SET(CPACK_COMPONENT_DOC_GROUP "Documents")
78
53
SET(CPACK_COMPONENT_PHP_EXAMPLES_GROUP "Documents")
79
54
SET(CPACK_COMPONENT_PYTHON_EXAMPLES_GROUP "Documents")
80
55
SET(CPACK_COMPONENT_RUBY_EXAMPLES_GROUP "Documents")
81
56
SET(CPACK_COMPONENT_CXX_EXAMPLES_GROUP "Documents")
82
57
83
58
SET(CPACK_COMPONENT_JAVA_SWIG_GROUP "APIs")
84
59
SET(CPACK_COMPONENT_PHP_SWIG_GROUP "APIs")
85
60
SET(CPACK_COMPONENT_PYTHON_SWIG_GROUP "APIs")
86
61
SET(CPACK_COMPONENT_RUBY_SWIG_GROUP "APIs")
87
62
SET(CPACK_COMPONENT_XQJ_SWIG_GROUP "APIs")
88
63
SET(CPACK_COMPONENT_CSHARP_SWIG_GROUP "APIs")
89
64
90
65
SET(CPACK_COMPONENT_GROUP_EXTERNAL_MODULES_DISPLAY_NAME "External Modules")
91
66
SET(CPACK_COMPONENT_GROUP_EXTERNAL_MODULES_DESCRIPTION "Complete list of external modules.")
92
67
SET(CPACK_COMPONENT_GROUP_DOCUMENTS_DESCRIPTION "Complete Documentation of Zorba and Modules.")
93
68
SET(CPACK_COMPONENT_GROUP_APIS_DESCRIPTION "APIs to work with zorba.")
94
69
95
70
SET(CPACK_ALL_INSTALL_TYPES Full Simple Lite)
96
71
97
72
SET(CPACK_COMPONENT_DOC_INSTALL_TYPES Full Simple)
98
73
SET(CPACK_COMPONENT_PHP_EXAMPLES_INSTALL_TYPES Full Simple)
99
74
SET(CPACK_COMPONENT_PYTHON_EXAMPLES_INSTALL_TYPES Full Simple)
100
75
SET(CPACK_COMPONENT_RUBY_EXAMPLES_INSTALL_TYPES Full Simple)
101
76
SET(CPACK_COMPONENT_CXX_EXAMPLES_INSTALL_TYPES Full Simple)
102
77
SET(CPACK_COMPONENT_JAVA_SWIG_INSTALL_TYPES Full)
103
78
SET(CPACK_COMPONENT_PYTHON_SWIG_INSTALL_TYPES Full)
104
79
SET(CPACK_COMPONENT_PHP_SWIG_INSTALL_TYPES Full)
105
80
SET(CPACK_COMPONENT_RUBY_SWIG_INSTALL_TYPES Full)
106
81
SET(CPACK_COMPONENT_XQJ_SWIG_INSTALL_TYPES Full)
107
82
SET(CPACK_COMPONENT_UNSPECIFIED_INSTALL_TYPES Full Simple Lite)
108
83
SET(CPACK_COMPONENT_THESAURUS_INSTALL_TYPES Full)
109
84
SET(CPACK_COMPONENT_CSHARP_SWIG_INSTALL_TYPES Full)
110
85
111
86
INCLUDE(${CMAKE_BINARY_DIR}/CMakeCPackModules.cmake)
112
87
113
88
114
20
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
89
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
115
21
               "${CMAKE_BINARY_DIR}/CMakeCPackOptions.cmake" @ONLY)
90
               "${CMAKE_BINARY_DIR}/CMakeCPackOptions.cmake" @ONLY)
116
22
SET(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CMakeCPackOptions.cmake")
91
SET(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CMakeCPackOptions.cmake")
117
23
92
118
=== modified file 'CMakeCPackOptions.cmake.in'
119
--- CMakeCPackOptions.cmake.in	2011-06-28 17:47:40 +0000
120
+++ CMakeCPackOptions.cmake.in	2013-01-25 00:15:35 +0000
121
@@ -22,13 +22,23 @@
122
22
22
123
23
# for Windows Null Soft Installer System ...
23
# for Windows Null Soft Installer System ...
124
24
if(CPACK_GENERATOR MATCHES "NSIS")
24
if(CPACK_GENERATOR MATCHES "NSIS")
125
25
  SET(CPACK_PACKAGE_EXECUTABLES "zorba" "Zorba Command Line Client" )
126
26
127
27
  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\zoba.exe")
128
28
  SET(CPACK_NSIS_DISPLAY_NAME "Zorba XQuery Processor ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
25
  SET(CPACK_NSIS_DISPLAY_NAME "Zorba XQuery Processor ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
129
29
  SET(CPACK_NSIS_HELP_LINK "http:\\\\http://www.zorba-xquery.org/")
26
  SET(CPACK_NSIS_HELP_LINK "http:\\\\http://www.zorba-xquery.org/")
130
30
  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\http://www.zorba-xquery.org/")
27
  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\http://www.zorba-xquery.org/")
131
31
  SET(CPACK_NSIS_CONTACT "info@flworfound.org")
28
  SET(CPACK_NSIS_CONTACT "info@flworfound.org")
132
29
  
133
30
  SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
134
31
    CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Zorba Command Line Client.lnk' 'cmd.exe' '/K set path=%path%;%JAVA_HOME%;%JAVA_HOME%\\client;%cd%\\bin;&echo Start using Zorba: zorba -q 1+1  or  zorba -f -q example.xq'
135
32
    CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Zorba Documentation.lnk' '$INSTDIR\\\\share\\\\doc\\\\zorba-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\\zorba\\\\html\\\\index.html'
136
33
    CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Modules Documentation.lnk' '$INSTDIR\\\\share\\\\doc\\\\zorba-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\\zorba\\\\xqdoc\\\\xhtml\\\\index.html'
137
34
    ")
138
35
  SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
139
36
    !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
140
37
    Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Zorba Command Line Client.lnk'
141
38
    Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Zorba Documentation.lnk'
142
39
    Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Modules Documentation.lnk' 
143
40
    ")
144
41
  
145
32
  SET(CPACK_NSIS_MODIFY_PATH ON)
42
  SET(CPACK_NSIS_MODIFY_PATH ON)
146
33
endif(CPACK_GENERATOR MATCHES "NSIS")
43
endif(CPACK_GENERATOR MATCHES "NSIS")
147
34
44
148
35
45
149
=== modified file 'CMakeCompiler.txt'
150
--- CMakeCompiler.txt	2011-01-19 12:48:17 +0000
151
+++ CMakeCompiler.txt	2013-01-25 00:15:35 +0000
152
@@ -13,11 +13,18 @@
153
13
# limitations under the License. 
13
# limitations under the License. 
154
14
14
155
15
15
161
16
IF (${CMAKE_CXX_COMPILER} MATCHES "clang")
16
# check if clang is used to compile c++
162
17
 SET (CLANG 1)
17
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
163
18
ELSE (${CMAKE_CXX_COMPILER} MATCHES "clang")
18
               ARGS --version
164
19
 SET (CLANG 0)
19
               OUTPUT_VARIABLE CXX_COMPILER_VERSION_OUTPUT
165
20
ENDIF(${CMAKE_CXX_COMPILER} MATCHES "clang")
20
)
166
21
STRING(REGEX MATCH "clang"
167
22
  CXX_IS_CLANG "${CXX_COMPILER_VERSION_OUTPUT}")
168
23
IF (CXX_IS_CLANG)
169
24
  SET (CLANG 1)
170
25
ELSE ()
171
26
  SET (CLANG 0)
172
27
ENDIF ()
173
21
28
174
22
#-----------------------------------------------------------------------------
29
#-----------------------------------------------------------------------------
175
23
# Let's use the highest warning level.
30
# Let's use the highest warning level.
176
@@ -108,6 +115,9 @@
177
108
  IF(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
115
  IF(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
178
109
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
116
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
179
110
  ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
117
  ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
180
118
  IF(NOT CMAKE_CXX_FLAGS MATCHES "-D_FILE_OFFSET_BITS")
181
119
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
182
120
  ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "-D_FILE_OFFSET_BITS")
183
111
  IF (UNIX AND NOT APPLE)
121
  IF (UNIX AND NOT APPLE)
184
112
    IF (NOT CMAKE_SHARED_LINKER_FLAGS MATCHES "as-needed")
122
    IF (NOT CMAKE_SHARED_LINKER_FLAGS MATCHES "as-needed")
185
113
      SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
123
      SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
186
@@ -231,3 +241,24 @@
187
231
    ENDIF (NOT CMAKE_C_FLAGS MATCHES "-fvisibility")
241
    ENDIF (NOT CMAKE_C_FLAGS MATCHES "-fvisibility")
188
232
  ENDIF ( ZORBA_GNUCOMPILER_MAJOR_VERSION GREATER 3 )
242
  ENDIF ( ZORBA_GNUCOMPILER_MAJOR_VERSION GREATER 3 )
189
233
ENDIF(CMAKE_COMPILER_IS_GNUCC)
243
ENDIF(CMAKE_COMPILER_IS_GNUCC)
190
244
191
245
IF (APPLE)
192
246
  # Needed for CFUUID*() functions in util/uuid.c.
193
247
  SET(CMAKE_SHARED_LINKER_FLAGS "-framework CoreFoundation ${CMAKE_SHARED_LINKER_FLAGS}")
194
248
ELSEIF (WIN32)
195
249
  # Needed for UuidCreateSequential() function in util/uuid.c.
196
250
  SET(requiredlibs ${requiredlibs} "Rpcrt4")
197
251
ELSEIF (ZORBA_HAVE_UUID_H)
198
252
  # Needed for uuid_generate() function in util/uuid.c.
199
253
  SET(requiredlibs ${requiredlibs} "uuid")
200
254
  # Double-check that we can link against the required library.
201
255
  CHECK_LIBRARY_EXISTS(uuid uuid_generate "" LIBUUID_EXISTS)
202
256
  IF (NOT LIBUUID_EXISTS)
203
257
    MESSAGE (FATAL_ERROR "Could not find libuuid - required on Linux!")
204
258
  ENDIF (NOT LIBUUID_EXISTS)
205
259
ELSE (APPLE)
206
260
  # We're not Apple or Win32, and we didn't find uuid.h - can't compile
207
261
  MESSAGE (FATAL_ERROR "Could not find uuid/uuid.h header, which is "
208
262
    "required on Linux. On Ubuntu, the 'uuid-dev' package is required; "
209
263
    "look for similar packages on other platforms.")
210
264
ENDIF (APPLE)
211
234
265
212
=== modified file 'CMakeConfiguration.txt'
213
--- CMakeConfiguration.txt	2011-07-01 10:27:23 +0000
214
+++ CMakeConfiguration.txt	2013-01-25 00:15:35 +0000
215
@@ -70,10 +70,6 @@
216
70
SET(ZORBA_FOR_ONE_THREAD_ONLY OFF CACHE BOOL "compile zorba for single threaded use")
70
SET(ZORBA_FOR_ONE_THREAD_ONLY OFF CACHE BOOL "compile zorba for single threaded use")
217
71
MESSAGE(STATUS "ZORBA_FOR_ONE_THREAD_ONLY:            " ${ZORBA_FOR_ONE_THREAD_ONLY})
71
MESSAGE(STATUS "ZORBA_FOR_ONE_THREAD_ONLY:            " ${ZORBA_FOR_ONE_THREAD_ONLY})
218
72
72
219
73
# by default the zorba command line client is deactivated until it gets to a more stable and userfriendly state
220
74
SET(ZORBA_WITH_DEBUGGER_CLIENT OFF CACHE BOOL "build and install zorbas command line debugger client")
221
75
MESSAGE(STATUS "ZORBA_WITH_DEBUGGER_CLIENT:           " ${ZORBA_WITH_DEBUGGER_CLIENT})
222
76
223
77
IF (DEFINED UNIX)
73
IF (DEFINED UNIX)
224
78
  IF (NOT DEFINED ZORBA_HAVE_PTHREAD_H AND NOT DEFINED ZORBA_FOR_ONE_THREAD_ONLY)
74
  IF (NOT DEFINED ZORBA_HAVE_PTHREAD_H AND NOT DEFINED ZORBA_FOR_ONE_THREAD_ONLY)
225
79
    MESSAGE(FATAL_ERROR "pthread is not available")
75
    MESSAGE(FATAL_ERROR "pthread is not available")
226
@@ -96,11 +92,16 @@
227
96
SET(ZORBA_TEST_TIMEOUT_VALUE 60 CACHE INTEGER "default test timeout value")
92
SET(ZORBA_TEST_TIMEOUT_VALUE 60 CACHE INTEGER "default test timeout value")
228
97
MESSAGE(STATUS "ZORBA_TEST_TIMEOUT_VALUE:             " ${ZORBA_TEST_TIMEOUT_VALUE})
93
MESSAGE(STATUS "ZORBA_TEST_TIMEOUT_VALUE:             " ${ZORBA_TEST_TIMEOUT_VALUE})
229
98
94
230
95
SET(ZORBA_VERIFY_PEER_SSL_CERTIFICATE OFF CACHE BOOL "Disable root certificate validation")
231
96
MESSAGE(STATUS "ZORBA_VERIFY_PEER_SSL_CERTIFICATE:    " ${ZORBA_VERIFY_PEER_SSL_CERTIFICATE})
232
97
233
99
IF(${ZORBA_WITH_CODE_PROFILE})
98
IF(${ZORBA_WITH_CODE_PROFILE})
234
100
  SET(ZORBA_BUILD_STATIC_LIBRARY ON CACHE BOOL "build a static library, e.g. when creating a profile")
99
  SET(ZORBA_BUILD_STATIC_LIBRARY ON CACHE BOOL "build a static library, e.g. when creating a profile")
235
101
ELSE(${ZORBA_WITH_CODE_PROFILE})
100
ELSE(${ZORBA_WITH_CODE_PROFILE})
236
102
  SET(ZORBA_BUILD_STATIC_LIBRARY OFF CACHE BOOL "build a static library, e.g. when creating a release")
101
  SET(ZORBA_BUILD_STATIC_LIBRARY OFF CACHE BOOL "build a static library, e.g. when creating a release")
237
103
ENDIF(${ZORBA_WITH_CODE_PROFILE})
102
ENDIF(${ZORBA_WITH_CODE_PROFILE})
238
103
MESSAGE(STATUS "ZORBA_WITH_CODE_PROFILE:              " ${ZORBA_WITH_CODE_PROFILE})
239
104
240
104
MESSAGE(STATUS "ZORBA_BUILD_STATIC_LIBRARY:           " ${ZORBA_BUILD_STATIC_LIBRARY})
105
MESSAGE(STATUS "ZORBA_BUILD_STATIC_LIBRARY:           " ${ZORBA_BUILD_STATIC_LIBRARY})
241
105
106
242
106
IF(MSVC AND NOT ZORBA_BUILD_STATIC_LIBRARY)
107
IF(MSVC AND NOT ZORBA_BUILD_STATIC_LIBRARY)
243
@@ -112,28 +113,36 @@
244
112
113
245
113
# We need the path to the zorba executable because it will be used during the
114
# We need the path to the zorba executable because it will be used during the
246
114
# build to generate source code and documentation.
115
# build to generate source code and documentation.
248
115
SET(ZORBA_EXE_SCRIPT "${CMAKE_BINARY_DIR}/bin/zorba")
116
SET(ZORBA_EXE "${CMAKE_BINARY_DIR}/bin/zorba")
249
116
IF(WIN32)
117
IF(WIN32)
251
117
  SET(ZORBA_EXE_SCRIPT "${ZORBA_EXE_SCRIPT}.bat")
118
  SET(ZORBA_EXE "${ZORBA_EXE}.bat")
252
118
ENDIF(WIN32)
119
ENDIF(WIN32)
255
119
SET(ZORBA_EXE_SCRIPT ${ZORBA_EXE_SCRIPT} CACHE STRING "executable used for generating the runtime")
120
SET(ZORBA_EXE ${ZORBA_EXE} CACHE STRING "executable used for generating the runtime")
256
120
MESSAGE(STATUS "ZORBA_EXE_SCRIPT:                      " ${ZORBA_EXE_SCRIPT})
121
MESSAGE(STATUS "ZORBA_EXE:                            " ${ZORBA_EXE})
257
121
122
258
122
# flags for debugging the parser
123
# flags for debugging the parser
259
123
SET(ZORBA_DEBUG_PARSER OFF CACHE BOOL "debug the parser")
124
SET(ZORBA_DEBUG_PARSER OFF CACHE BOOL "debug the parser")
260
124
MESSAGE(STATUS "ZORBA_DEBUG_PARSER:                   " ${ZORBA_DEBUG_PARSER})
125
MESSAGE(STATUS "ZORBA_DEBUG_PARSER:                   " ${ZORBA_DEBUG_PARSER})
261
125
126
269
126
SET(ZORBA_DEBUG_STRING OFF CACHE BOOL "debug strings")
127
# if not set by the user, set ZORBA_DEBUG_STRING to ON for Debug and RelWithDebInfo builds
270
127
MESSAGE(STATUS "ZORBA_DEBUG_STRING:                   " ${ZORBA_DEBUG_STRING})
128
IF (NOT ZORBA_DEBUG_STRING)
271
128
129
  IF (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
272
129
SET(ZORBA_NO_UNICODE OFF CACHE BOOL "disable ICU")
130
    SET (ZORBA_DEBUG_STRING ON)
273
130
MESSAGE(STATUS "ZORBA_NO_UNICODE:                     " ${ZORBA_NO_UNICODE})
131
  ELSE (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
274
131
132
    SET (ZORBA_DEBUG_STRING OFF)
275
132
IF (ZORBA_NO_UNICODE)
133
  ENDIF (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
276
134
ENDIF (NOT ZORBA_DEBUG_STRING)
277
135
SET (ZORBA_DEBUG_STRING ${ZORBA_DEBUG_STRING} CACHE BOOL "debug strings")
278
136
MESSAGE (STATUS "ZORBA_DEBUG_STRING:                   " ${ZORBA_DEBUG_STRING})
279
137
280
138
SET(ZORBA_NO_ICU OFF CACHE BOOL "disable ICU")
281
139
MESSAGE(STATUS "ZORBA_NO_ICU:                         " ${ZORBA_NO_ICU})
282
140
283
141
IF (ZORBA_NO_ICU)
284
133
  SET (no_full_text ON)
142
  SET (no_full_text ON)
286
134
ELSE (ZORBA_NO_UNICODE)
143
ELSE (ZORBA_NO_ICU)
287
135
  SET (no_full_text OFF)
144
  SET (no_full_text OFF)
289
136
ENDIF (ZORBA_NO_UNICODE)
145
ENDIF (ZORBA_NO_ICU)
290
137
SET (ZORBA_NO_FULL_TEXT ${no_full_text} CACHE BOOL "disable XQuery Full-Text support")
146
SET (ZORBA_NO_FULL_TEXT ${no_full_text} CACHE BOOL "disable XQuery Full-Text support")
291
138
MESSAGE(STATUS "ZORBA_NO_FULL_TEXT:                   " ${ZORBA_NO_FULL_TEXT})
147
MESSAGE(STATUS "ZORBA_NO_FULL_TEXT:                   " ${ZORBA_NO_FULL_TEXT})
292
139
148
293
@@ -143,13 +152,20 @@
294
143
SET(ZORBA_WITH_BIG_INTEGER OFF CACHE BOOL "enable arbitrary precision integers")
152
SET(ZORBA_WITH_BIG_INTEGER OFF CACHE BOOL "enable arbitrary precision integers")
295
144
MESSAGE(STATUS "ZORBA_WITH_BIG_INTEGER:               " ${ZORBA_WITH_BIG_INTEGER})
153
MESSAGE(STATUS "ZORBA_WITH_BIG_INTEGER:               " ${ZORBA_WITH_BIG_INTEGER})
296
145
154
300
146
IF (SWIG_FOUND)
155
SET(ZORBA_WITH_JSON ON CACHE BOOL "enable integrated JSON support")
301
147
  SET (use_swig ON)
156
MESSAGE(STATUS "ZORBA_WITH_JSON:                      " ${ZORBA_WITH_JSON})
302
148
ELSE (SWIG_FOUND)
157
303
158
SET(ZORBA_WITH_THESAURUS ON CACHE BOOL
304
159
    "enable installation of default English Wordnet thesaurus")
305
160
MESSAGE(STATUS "ZORBA_WITH_THESAURUS:                 " ${ZORBA_WITH_THESAURUS})
306
161
307
162
IF (ZORBA_SUPPRESS_SWIG)
308
163
  SET (no_swig ON)
309
164
ELSE (ZORBA_SUPPRESS_SWIG)
310
149
  SET (no_swig OFF)
165
  SET (no_swig OFF)
314
150
ENDIF (SWIG_FOUND)
166
ENDIF (ZORBA_SUPPRESS_SWIG)
315
151
SET(ZORBA_USE_SWIG ${no_swig} CACHE BOOL "use Swig to generate api for Python, Php and Ruby")
167
SET(ZORBA_SUPPRESS_SWIG ${no_swig} CACHE BOOL "use Swig to generate api for Python, Php and Ruby")
316
152
MESSAGE(STATUS "ZORBA_USE_SWIG:                       " ${ZORBA_USE_SWIG})
168
MESSAGE(STATUS "ZORBA_SUPPRESS_SWIG [ON/OFF]:         " ${no_swig})
317
153
169
318
154
SET(ZORBA_XQUERYX OFF CACHE BOOL "Activate capability to compile XQueryX code (on/off)")
170
SET(ZORBA_XQUERYX OFF CACHE BOOL "Activate capability to compile XQueryX code (on/off)")
319
155
MESSAGE(STATUS "ZORBA_XQUERYX:                        " ${ZORBA_XQUERYX})
171
MESSAGE(STATUS "ZORBA_XQUERYX:                        " ${ZORBA_XQUERYX})
320
156
172
321
=== modified file 'CMakeLists.txt'
322
--- CMakeLists.txt	2011-07-06 20:43:46 +0000
323
+++ CMakeLists.txt	2013-01-25 00:15:35 +0000
324
@@ -22,9 +22,6 @@
325
22
SET(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
22
SET(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
326
23
SET(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
23
SET(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
327
24
24
328
25
# Enable RPaths in installed binaries
329
26
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
330
27
331
28
INCLUDE(${CMAKE_SOURCE_DIR}/cmake_modules/CMakeCompareVersionStrings.cmake)
25
INCLUDE(${CMAKE_SOURCE_DIR}/cmake_modules/CMakeCompareVersionStrings.cmake)
332
29
26
333
30
cmake_minimum_required(VERSION 2.6)
27
cmake_minimum_required(VERSION 2.6)
334
@@ -52,58 +49,62 @@
335
52
  MESSAGE(FATAL_ERROR "Please create a separate build directory and call CMake again")
49
  MESSAGE(FATAL_ERROR "Please create a separate build directory and call CMake again")
336
53
ENDIF(${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
50
ENDIF(${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
337
54
51
354
55
IF (MSVC)
52
# set the default build type to release
355
56
  IF (CMAKE_BUILD_TYPE)
53
# NOTE: the "NMake Makefiles" generator will always set the default build type to "Debug"
356
57
    MESSAGE (STATUS "You provided CMAKE_BUILD_TYPE but the Visual Studio generator cannot make use of it. So I'd better clear it now! Sorry! :(")
54
IF (NOT CMAKE_BUILD_TYPE)
357
58
    SET (CMAKE_BUILD_TYPE)
55
  SET (CMAKE_BUILD_TYPE Release CACHE STRING
358
59
  ELSE (CMAKE_BUILD_TYPE)
56
       "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
359
60
    MESSAGE (STATUS "No CMAKE_BUILD_TYPE was provided, which is exactly what the Visual Studio generator expects from you. Very good! Weiter machen! :)")
57
       FORCE)
360
61
  ENDIF(CMAKE_BUILD_TYPE)
58
ENDIF (NOT CMAKE_BUILD_TYPE)
345
62
ELSE(MSVC)
346
63
  # set the default build type to release
347
64
  # NOTE: the "NMake Makefiles" generator will always set the default build type to "Debug"
348
65
  IF(NOT CMAKE_BUILD_TYPE)
349
66
    SET(CMAKE_BUILD_TYPE Release CACHE STRING
350
67
        "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
351
68
        FORCE)
352
69
  ENDIF(NOT CMAKE_BUILD_TYPE)
353
70
ENDIF(MSVC)
361
71
59
362
72
# set the default installation directory to "dist" in the build directory
60
# set the default installation directory to "dist" in the build directory
363
73
IF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
61
IF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
368
74
  SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/dist CACHE STRING
62
  SET (CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/dist CACHE STRING
369
75
      "Set the defalt installation directory to \"dist\" in the binary directory." FORCE)
63
       "Set the defalt installation directory to \"dist\" in the binary directory." FORCE)
370
76
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
64
ENDIF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
371
77
65
372
66
# Enable RPaths in installed binaries
373
67
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
374
68
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
375
69
376
70
# turn on the folder grouping used by IDEs (VS or XCode)
377
71
SET(ZORBA_USE_TARGET_FOLDERS ON CACHE BOOL "Activate use of target grouping into folders")
378
72
IF(ZORBA_USE_TARGET_FOLDERS)
379
73
  SET_PROPERTY (GLOBAL PROPERTY USE_FOLDERS ON)
380
74
ENDIF(ZORBA_USE_TARGET_FOLDERS)
381
78
75
382
79
###############################################################################
76
###############################################################################
383
80
# Check for system include files, features, etc.
77
# Check for system include files, features, etc.
384
81
###############################################################################
78
###############################################################################
385
79
INCLUDE(CheckCXXSourceCompiles)
386
80
INCLUDE(CheckFunctionExists)
387
81
INCLUDE(CheckIncludeFileCXX)
388
82
INCLUDE(CheckIncludeFiles)
82
INCLUDE(CheckIncludeFiles)
389
83
INCLUDE(CheckLibraryExists)
390
84
INCLUDE(CheckStructHasMember)
391
83
INCLUDE(CheckSymbolExists)
85
INCLUDE(CheckSymbolExists)
394
84
INCLUDE(CheckFunctionExists)
86
INCLUDE(CheckTypeSize)
393
85
INCLUDE(CheckLibraryExists)
395
86
INCLUDE(CheckVariableExists)
87
INCLUDE(CheckVariableExists)
396
87
INCLUDE(CheckIncludeFileCXX)
397
88
INCLUDE(CheckTypeSize)
398
89
INCLUDE(CheckCXXSourceCompiles)
399
90
88
400
91
CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h"      ZORBA_HAVE_SYS_MOUNT_H)
401
92
CHECK_INCLUDE_FILES ("unicode/utypes.h"             ZORBA_HAVE_UTYPES_H)
402
93
CHECK_INCLUDE_FILES ("unicode/coll.h"               ZORBA_HAVE_COLL_H)
89
CHECK_INCLUDE_FILES ("unicode/coll.h"               ZORBA_HAVE_COLL_H)
404
94
CHECK_INCLUDE_FILES ("unicode/ustring.h"            ZORBA_HAVE_USTRING_H)
90
CHECK_INCLUDE_FILES ("iconv.h"                      ZORBA_HAVE_ICONV_H)
405
95
CHECK_INCLUDE_FILES ("inttypes.h"                   ZORBA_HAVE_INTTYPES_H)
91
CHECK_INCLUDE_FILES ("inttypes.h"                   ZORBA_HAVE_INTTYPES_H)
406
92
CHECK_INCLUDE_FILES ("limits.h"                     ZORBA_HAVE_LIMITS_H)
407
96
CHECK_INCLUDE_FILES ("stdint.h"                     ZORBA_HAVE_STDINT_H)
93
CHECK_INCLUDE_FILES ("stdint.h"                     ZORBA_HAVE_STDINT_H)
408
97
CHECK_INCLUDE_FILES ("stdlib.h"                     ZORBA_HAVE_STDLIB_H)
94
CHECK_INCLUDE_FILES ("stdlib.h"                     ZORBA_HAVE_STDLIB_H)
410
98
CHECK_INCLUDE_FILES ("limits.h"                     ZORBA_HAVE_LIMITS_H)
95
CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h"      ZORBA_HAVE_SYS_MOUNT_H)
411
99
CHECK_INCLUDE_FILES ("sys/types.h"                  ZORBA_HAVE_SYS_TYPES_H)
96
CHECK_INCLUDE_FILES ("sys/types.h"                  ZORBA_HAVE_SYS_TYPES_H)
413
100
CHECK_INCLUDE_FILES ("iconv.h"                      ZORBA_HAVE_ICONV_H)
97
CHECK_INCLUDE_FILES ("tzfile.h"                     ZORBA_HAVE_TZFILE_H)
414
98
CHECK_INCLUDE_FILES ("unicode/ustring.h"            ZORBA_HAVE_USTRING_H)
415
99
CHECK_INCLUDE_FILES ("unicode/utypes.h"             ZORBA_HAVE_UTYPES_H)
416
100
417
101
IF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.4")
101
IF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.4")
418
102
  # execinfo is found by this macro when cross compiling for Mac OS X 10.4
102
  # execinfo is found by this macro when cross compiling for Mac OS X 10.4
419
103
  # although it shouldn't be found for this platform
103
  # although it shouldn't be found for this platform
420
104
  CHECK_INCLUDE_FILES ("execinfo.h"                   ZORBA_HAVE_EXECINFO_H)
104
  CHECK_INCLUDE_FILES ("execinfo.h"                   ZORBA_HAVE_EXECINFO_H)
421
105
ENDIF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.4")
105
ENDIF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.4")
422
106
CHECK_INCLUDE_FILE_CXX ("FlexLexer.h"               ZORBA_HAVE_FLEXLEXER_H)
106
CHECK_INCLUDE_FILE_CXX ("FlexLexer.h"               ZORBA_HAVE_FLEXLEXER_H)
423
107
CHECK_INCLUDE_FILES ("uuid/uuid.h"                  ZORBA_HAVE_UUID_H)
424
107
108
425
108
CHECK_FUNCTION_EXISTS (strtof                     ZORBA_HAVE_STRTOF_FUNCTION)
109
CHECK_FUNCTION_EXISTS (strtof                     ZORBA_HAVE_STRTOF_FUNCTION)
426
109
CHECK_FUNCTION_EXISTS (strtoll                    ZORBA_HAVE_STRTOLL_FUNCTION)
110
CHECK_FUNCTION_EXISTS (strtoll                    ZORBA_HAVE_STRTOLL_FUNCTION)
427
@@ -126,23 +127,93 @@
428
126
CHECK_TYPE_SIZE("__int32" ZORBA_HAVE_MS_INT32) 
127
CHECK_TYPE_SIZE("__int32" ZORBA_HAVE_MS_INT32) 
429
127
CHECK_TYPE_SIZE("int64_t" ZORBA_HAVE_INT64_T) 
128
CHECK_TYPE_SIZE("int64_t" ZORBA_HAVE_INT64_T) 
430
128
129
433
129
CHECK_CXX_SOURCE_COMPILES ("int main() { int *p = nullptr; }" ZORBA_CXX_NULLPTR)
130
CHECK_STRUCT_HAS_MEMBER("struct tm" tm_gmtoff time.h 	ZORBA_HAVE_STRUCT_TM_TM_GMTOFF)
434
130
CHECK_CXX_SOURCE_COMPILES ("int main() { static_assert(1,\"\"); }" ZORBA_CXX_STATIC_ASSERT)
131
CHECK_STRUCT_HAS_MEMBER("struct tm" __tm_gmtoff time.h 	ZORBA_HAVE_STRUCT_TM___TM_GMTOFF)
435
132
436
133
# C++ built-in type sizes
437
134
CHECK_TYPE_SIZE("double" ZORBA_SIZEOF_DOUBLE BUILTIN_TYPES_ONLY) 
438
135
CHECK_TYPE_SIZE("float" ZORBA_SIZEOF_FLOAT BUILTIN_TYPES_ONLY) 
439
136
CHECK_TYPE_SIZE("int" ZORBA_SIZEOF_INT BUILTIN_TYPES_ONLY) 
440
137
CHECK_TYPE_SIZE("long" ZORBA_SIZEOF_LONG BUILTIN_TYPES_ONLY) 
441
138
CHECK_TYPE_SIZE("long long" ZORBA_SIZEOF_LONG_LONG BUILTIN_TYPES_ONLY) 
442
139
CHECK_TYPE_SIZE("void*" ZORBA_SIZEOF_POINTER BUILTIN_TYPES_ONLY) 
443
140
CHECK_TYPE_SIZE("short" ZORBA_SIZEOF_SHORT BUILTIN_TYPES_ONLY) 
444
141
CHECK_TYPE_SIZE("size_t" ZORBA_SIZEOF_SIZE_T) 
445
142
SET(CMAKE_EXTRA_INCLUDE_FILES wchar.h)
446
143
CHECK_TYPE_SIZE("wchar_t" ZORBA_SIZEOF_WCHAR_T)
447
144
SET(CMAKE_EXTRA_INCLUDE_FILES)
448
145
449
146
# C++11 langauge features
450
147
CHECK_CXX_SOURCE_COMPILES(
451
148
  "int main() { int *p = nullptr; }" ZORBA_CXX_NULLPTR)
452
149
CHECK_CXX_SOURCE_COMPILES(
453
150
  "int main() { static_assert(1,\"\"); }" ZORBA_CXX_STATIC_ASSERT)
454
151
455
152
# C++11 standard library types
456
153
CHECK_CXX_SOURCE_COMPILES (
457
154
  "#include <type_traits>
458
155
  int main() { std::enable_if<true,int> x; }" ZORBA_HAVE_ENABLE_IF)
459
156
CHECK_CXX_SOURCE_COMPILES ("
460
157
  #include <memory>
461
158
  int main() { std::unique_ptr<int> p; }" ZORBA_HAVE_UNIQUE_PTR)
462
159
CHECK_CXX_SOURCE_COMPILES (
463
160
  "#include <unordered_map>
464
161
  int main() { std::unordered_map<int,int> m; }" ZORBA_HAVE_UNORDERED_MAP)
465
162
CHECK_CXX_SOURCE_COMPILES (
466
163
  "#include <unordered_set>
467
164
  int main() { std::unordered_set<int> s; }" ZORBA_HAVE_UNORDERED_SET)
468
131
165
469
132
################################################################################
166
################################################################################
470
133
# Various cmake macros
167
# Various cmake macros
471
134
168
473
135
IF(WIN32)
169
SET (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules ${CMAKE_MODULE_PATH})
474
170
IF (WIN32)
475
136
  # On Windows we use proxy modules that try to guess first the location
171
  # On Windows we use proxy modules that try to guess first the location
476
137
  # of the required third party libraries. This will search in order in:
172
  # of the required third party libraries. This will search in order in:
477
138
  # 1. the path pointed by ZORBA_THIRD_PARTY_REQUIREMENTS
173
  # 1. the path pointed by ZORBA_THIRD_PARTY_REQUIREMENTS
478
139
  # 2. the Program Files directory available on the users computer
174
  # 2. the Program Files directory available on the users computer
479
140
  # 3. the PATH environment variable
175
  # 3. the PATH environment variable
480
141
  # The logic is implemented by the macros in the ProxyFindModule.cmake module.
176
  # The logic is implemented by the macros in the ProxyFindModule.cmake module.
485
142
  LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules/Windows")
177
  SET (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules/Windows ${CMAKE_MODULE_PATH})
486
143
  INCLUDE(ProxyFindModule)
178
  INCLUDE (ProxyFindModule)
487
144
ENDIF(WIN32)
179
ENDIF (WIN32)
488
145
LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
180
489
181
################################################################################
490
182
# This section is used for batch script and Visual Studio Project file generation. 
491
183
# Each executable on Windows needs a bat script and in the Visual Studio build a \
492
184
# pre-generated Visual Studio Project file in order to set the PATH to the required DLLs.
493
185
# For this we use CACHE variables to gather all the information generated
494
186
# throughout the cmake execution (required DLLs, list of scripts to generate).
495
187
# The generation occurs only at the end of CMake execution (through the macro
496
188
# ZORBA_GENERATE_EXE_HELPERS_WIN32) when ALL the requirements have been found.
497
189
# E.g. zorba.exe needs in PATH all the DLLs of all external modules, etc.
498
190
IF (WIN32)
499
191
  # Clear all the variables because they are used only for this build.
500
192
  SET (ZORBA_REQUIRED_DLLS ""
501
193
    CACHE STRING "List of DLLs that must be installed" FORCE
502
194
  )
503
195
  SET (ZORBA_REQUIRED_DLL_PATHS ""
504
196
    CACHE STRING "List of paths executable require in order to find the required DLLs" FORCE
505
197
  )
506
198
  SET (ZORBA_EXE_SCRIPT_LIST ""
507
199
    CACHE STRING "List of Windows batch scripts to be generated, one for each executable" FORCE
508
200
  )
509
201
  IF (MSVC_IDE)
510
202
    SET (ZORBA_VC_PROJECT_FILE_LIST ""
511
203
      CACHE STRING "List of Visual Studio project files to be generated, one for each executable" FORCE
512
204
    )
513
205
  ENDIF(MSVC_IDE)
514
206
515
207
  # Moreover, mark it as advanced since the CMake GUI user should not see this.
516
208
  MARK_AS_ADVANCED (FORCE ZORBA_REQUIRED_DLLS)
517
209
  MARK_AS_ADVANCED (FORCE ZORBA_REQUIRED_DLL_PATHS)
518
210
  MARK_AS_ADVANCED (FORCE ZORBA_EXE_SCRIPT_LIST)
519
211
  IF (MSVC_IDE)
520
212
    MARK_AS_ADVANCED (FORCE ZORBA_VC_PROJECT_FILE_LIST)
521
213
  ENDIF(MSVC_IDE)
522
214
ENDIF (WIN32)
523
215
################################################################################
524
216
525
146
217
526
147
# ZorbaModule includes a number of generally-useful utility functions,
218
# ZorbaModule includes a number of generally-useful utility functions,
527
148
# including expected_failure().  Include it now (very early) to ensure
219
# including expected_failure().  Include it now (very early) to ensure
528
@@ -212,11 +283,21 @@
529
212
MESSAGE(STATUS "Looking for LibXml2")
283
MESSAGE(STATUS "Looking for LibXml2")
530
213
FIND_PACKAGE(LibXml2)
284
FIND_PACKAGE(LibXml2)
531
214
IF(LIBXML2_FOUND)
285
IF(LIBXML2_FOUND)
537
215
  MESSAGE(STATUS "Found LIBXML2 library -- " ${LIBXML2_LIBRARIES})
286
  # Now check LibXml2's version
538
216
    
287
  FILE(STRINGS ${LIBXML2_INCLUDE_DIR}/libxml/xmlversion.h LIBXML2_VERSION_TMP REGEX 
539
217
  INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
288
       "^#define[ \t]+LIBXML_DOTTED_VERSION[ \t]+\".*\"")
540
218
  SET(requiredlibs-store ${requiredlibs-store} ${LIBXML2_LIBRARIES})
289
  STRING(REGEX REPLACE "^#define[ \t]+LIBXML_DOTTED_VERSION[ \t]+\"(.*)\"" "\\1" 
541
219
  SET(CXXFLAGS ${CXXFLAGS} ${LIBXML2_DEFINITONS})
290
         LIBXML2_VERSION ${LIBXML2_VERSION_TMP})
542
291
         
543
292
  IF(LIBXML2_VERSION VERSION_EQUAL "2.7.0" OR LIBXML2_VERSION VERSION_GREATER "2.7.0")
544
293
    MESSAGE(STATUS "Found LIBXML2 library -- " ${LIBXML2_LIBRARIES})
545
294
    INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
546
295
    SET(requiredlibs-store ${requiredlibs-store} ${LIBXML2_LIBRARIES})
547
296
    SET(CXXFLAGS ${CXXFLAGS} ${LIBXML2_DEFINITONS})
548
297
  ELSE(LIBXML2_VERSION VERSION_EQUAL "2.7.0" OR LIBXML2_VERSION VERSION_GREATER "2.7.0")
549
298
    MESSAGE(FATAL_ERROR "The libxml2 library version 2.7.0 or higher is required in order to build Zorba.")
550
299
  ENDIF(LIBXML2_VERSION VERSION_EQUAL "2.7.0" OR LIBXML2_VERSION VERSION_GREATER "2.7.0")
551
300
552
220
ELSE(LIBXML2_FOUND)
301
ELSE(LIBXML2_FOUND)
553
221
  MESSAGE(FATAL_ERROR "The libxml2 library and headers are required in order to build simple store.")
302
  MESSAGE(FATAL_ERROR "The libxml2 library and headers are required in order to build simple store.")
554
222
ENDIF(LIBXML2_FOUND)
303
ENDIF(LIBXML2_FOUND)
555
@@ -265,15 +346,29 @@
556
265
#
346
#
557
266
# Xerces-C part 1 - finding in default locations
347
# Xerces-C part 1 - finding in default locations
558
267
#
348
#
562
268
MESSAGE(STATUS "Looking for Xerces-C")
349
MESSAGE (STATUS "Looking for Xerces-C")
563
269
FIND_PACKAGE(XercesC)
350
FIND_PACKAGE (XercesC)
564
270
MESSAGE(STATUS "")
351
MESSAGE (STATUS "")
565
352
566
353
#
567
354
# shlwapi
568
355
#
569
356
IF(WIN32)
570
357
    SET(requiredlibs ${requiredlibs} "shlwapi")
571
358
ENDIF(WIN32)
572
271
359
573
272
#
360
#
574
273
# SWIG
361
# SWIG
575
274
#
362
#
576
275
IF (NOT ZORBA_SUPPRESS_SWIG)
363
IF (NOT ZORBA_SUPPRESS_SWIG)
577
276
  FIND_PACKAGE (SWIG)
364
  FIND_PACKAGE (SWIG)
578
365
579
366
  COMPARE_VERSION_STRINGS("${SWIG_VERSION}" "1.3.40" result)
580
367
  IF(result LESS 0)
581
368
    MESSAGE(WARNING "You need at least SWIG version 1.3.40")
582
369
  ENDIF(result LESS 0)
583
370
584
371
585
277
  IF (SWIG_FOUND)
372
  IF (SWIG_FOUND)
586
278
    # this will be used both in swig and doc sub-directories
373
    # this will be used both in swig and doc sub-directories
587
279
374
588
@@ -281,13 +376,19 @@
589
281
    # PHP5
376
    # PHP5
590
282
    #
377
    #
591
283
    FIND_PACKAGE (PHP5)
378
    FIND_PACKAGE (PHP5)
592
379
593
380
    #
594
381
    # Python
595
382
    #
596
383
    FIND_PACKAGE (PythonInterp)
597
384
    FIND_PACKAGE (PythonLibs)
598
385
    
599
284
  ELSE (SWIG_FOUND)
386
  ELSE (SWIG_FOUND)
600
285
    MESSAGE (STATUS "SWIG not found => no language bindings are generated.")  
387
    MESSAGE (STATUS "SWIG not found => no language bindings are generated.")  
601
286
  ENDIF (SWIG_FOUND)
388
  ENDIF (SWIG_FOUND)
602
287
ELSE (NOT ZORBA_SUPPRESS_SWIG)
389
ELSE (NOT ZORBA_SUPPRESS_SWIG)
603
288
  MESSAGE (STATUS "SWIG is disabled => no language bindings are generated.")  
390
  MESSAGE (STATUS "SWIG is disabled => no language bindings are generated.")  
604
289
ENDIF (NOT ZORBA_SUPPRESS_SWIG)
391
ENDIF (NOT ZORBA_SUPPRESS_SWIG)
605
290
MESSAGE (STATUS "")
606
291
392
607
292
393
608
293
LIST(APPEND requiredlibs ${requiredlibs-store})
394
LIST(APPEND requiredlibs ${requiredlibs-store})
609
@@ -349,11 +450,14 @@
610
349
    " - build without XMLSchema support")
450
    " - build without XMLSchema support")
611
350
ENDIF (NOT ZORBA_NO_XMLSCHEMA)
451
ENDIF (NOT ZORBA_NO_XMLSCHEMA)
612
351
452
613
352
LIST(APPEND requiredlibs ${requiredlibs-store})
614
353
615
354
616
355
IF(WIN32)
453
IF(WIN32)
617
356
  SET(requiredlibs ${requiredlibs} wsock32)
454
  SET(requiredlibs ${requiredlibs} wsock32)
618
455
  
619
456
  # Clear those variables because this is used only for this build.
620
457
  # A cache variable is needed since this must be modified by subdirectories
621
458
  # and be visible at this level when ZORBA_GENERATE_EXE_HELPERS_WIN32 is called
622
459
  SET(ZORBA_EXE_SCRIPT_LIST "" CACHE STRING "List of bat scripts" FORCE)
623
460
  SET(ZORBA_VC_PROJECT_FILE_LIST "" CACHE STRING "List of VC project files" FORCE)
624
357
ENDIF(WIN32)
461
ENDIF(WIN32)
625
358
462
626
359
################################################################################
463
################################################################################
627
@@ -373,12 +477,37 @@
628
373
INCLUDE_DIRECTORIES(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/include)
477
INCLUDE_DIRECTORIES(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/include)
629
374
478
630
375
# zorba versioning
479
# zorba versioning
633
376
SET(ZORBA_MAJOR_NUMBER "1")
480
SET(ZORBA_MAJOR_NUMBER "2")
634
377
SET(ZORBA_MINOR_NUMBER "5")
481
SET(ZORBA_MINOR_NUMBER "8")
635
378
SET(ZORBA_PATCH_NUMBER "0")
482
SET(ZORBA_PATCH_NUMBER "0")
636
379
SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
483
SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
637
380
MESSAGE(STATUS "Zorba version number: ${ZORBA_VERSION}")
484
MESSAGE(STATUS "Zorba version number: ${ZORBA_VERSION}")
638
381
485
639
486
SET(ZORBA_LIB_DIRNAME "lib" CACHE STRING
640
487
  "directory name for libs (may want to set to 'lib64' on 64-bit Linux platforms)")
641
488
642
489
# Directories for modules and schemas. "Core" are those which are
643
490
# shipped with Zorba and must be present for correct Zorba
644
491
# functionality. "Non-core" are developed independently of Zorba and
645
492
# have different version lifecycles.
646
493
#
647
494
# URI dir is for things resolved by URI - specifically modules (.xq
648
495
# files) and schemas (.xsd files) - which are platform-
649
496
# independent. Lib dir is for platform-specific files, specifically
650
497
# shared libraries for module external functions.
651
498
SET(ZORBA_NONCORE_URI_DIR "share/zorba/uris"
652
499
  CACHE STRING "Path (relative to installdir) to non-core modules/schemas")
653
500
MARK_AS_ADVANCED(ZORBA_NONCORE_URI_DIR)
654
501
SET(ZORBA_CORE_URI_DIR "${ZORBA_NONCORE_URI_DIR}/core/${ZORBA_VERSION}"
655
502
  CACHE STRING "Path (relative to installdir) to core modules/schemas")
656
503
MARK_AS_ADVANCED(ZORBA_CORE_URI_DIR)
657
504
SET(ZORBA_NONCORE_LIB_DIR "${ZORBA_LIB_DIRNAME}/zorba"
658
505
  CACHE STRING "Path (relative to installdir) to non-core libraries")
659
506
MARK_AS_ADVANCED(ZORBA_NONCORE_LIB_DIR)
660
507
SET(ZORBA_CORE_LIB_DIR "${ZORBA_NONCORE_LIB_DIR}/core/${ZORBA_VERSION}"
661
508
  CACHE STRING "Path (relative to installdir) to core libraries")
662
509
MARK_AS_ADVANCED(ZORBA_CORE_LIB_DIR)
663
510
664
382
# add compiler variables
511
# add compiler variables
665
383
ADD_DEFINITIONS(${DEFINITIONS})
512
ADD_DEFINITIONS(${DEFINITIONS})
666
384
513
667
@@ -405,39 +534,53 @@
668
405
ENDIF(APPLE)
534
ENDIF(APPLE)
669
406
535
670
407
536
671
408
################################################################################
672
409
#                                                                              #
673
410
# Tell CMake to process the sub-directories                                    #
674
411
#                                                                              #
675
412
################################################################################
676
413
677
414
SET (ZORBA_MODULES_DIR "${CMAKE_SOURCE_DIR}/../zorba_modules"
537
SET (ZORBA_MODULES_DIR "${CMAKE_SOURCE_DIR}/../zorba_modules"
678
415
  CACHE PATH "Path to directory (outside of Zorba svn root) containing external modules to add to the build")
538
  CACHE PATH "Path to directory (outside of Zorba svn root) containing external modules to add to the build")
679
416
539
680
540
# Subdir of the installation directory for CMake files, relative to
681
541
# CMAKE_INSTALL_PREFIX.
682
542
IF (WIN32)
683
543
  SET(ZORBA_CMAKE_DIR "cmake" CACHE STRING
684
544
    "Relative path to CMake files in Zorba installation")
685
545
ELSE (WIN32)
686
546
  SET(ZORBA_CMAKE_DIR "share/cmake/zorba-${ZORBA_VERSION}" CACHE STRING
687
547
    "Relative path to CMake files in Zorba installation")
688
548
ENDIF (WIN32)
689
549
690
550
################################################################################
691
551
#                                                                              #
692
552
# Tell CMake to process the sub-directories                                    #
693
553
#                                                                              #
694
554
################################################################################
695
555
696
417
ADD_SUBDIRECTORY(scripts)
556
ADD_SUBDIRECTORY(scripts)
697
418
ADD_SUBDIRECTORY(cmake_modules)
557
ADD_SUBDIRECTORY(cmake_modules)
698
419
558
703
420
# Subdirectory ordering: We need to include "test" before "config" so
559
# Subdirectory ordering: We need to include "bin" before "test" so
704
421
# ZorbaConfig knows about testdriver. We need to include "config"
560
# that test/fots can add zorbacmd-based tests. We need to include
705
422
# before "modules" so external modules will be able to find
561
# "test" before "config" so ZorbaConfig knows about testdriver. We
706
423
# ZorbaConfig.cmake.
562
# need to include "config" before "modules" so external modules will
707
563
# be able to find ZorbaConfig.cmake. We need to include "modules"
708
564
# before "include" so config.h can know eg. whether we found CURL. We
709
565
# need to include "modules" before "doc" so xqdoc can know what
710
566
# non-core modules are available.
711
567
712
568
ADD_SUBDIRECTORY(bin)
713
424
569
714
425
ADD_SUBDIRECTORY(test)
570
ADD_SUBDIRECTORY(test)
715
426
ADD_SUBDIRECTORY(config)
571
ADD_SUBDIRECTORY(config)
716
427
ADD_SUBDIRECTORY(include)
717
428
ADD_SUBDIRECTORY(doc)
718
429
ADD_SUBDIRECTORY(schemas)
572
ADD_SUBDIRECTORY(schemas)
719
430
ADD_SUBDIRECTORY(modules)
573
ADD_SUBDIRECTORY(modules)
720
574
ADD_SUBDIRECTORY(doc)
721
575
ADD_SUBDIRECTORY(include)
722
431
576
723
432
ADD_DEFINITIONS(-Dzorba_EXPORTS)
577
ADD_DEFINITIONS(-Dzorba_EXPORTS)
724
433
ADD_SUBDIRECTORY(src)
578
ADD_SUBDIRECTORY(src)
725
434
REMOVE_DEFINITIONS(-Dzorba_EXPORTS)
579
REMOVE_DEFINITIONS(-Dzorba_EXPORTS)
726
435
580
732
436
IF(ZORBA_USE_SWIG)
581
IF (SWIG_FOUND)
733
437
  ADD_SUBDIRECTORY(swig)
582
  ADD_SUBDIRECTORY (swig)
734
438
ENDIF(ZORBA_USE_SWIG)
583
ENDIF (SWIG_FOUND)
730
439
731
440
ADD_SUBDIRECTORY(bin)
735
441
584
736
442
# add the uninstall support
585
# add the uninstall support
737
443
# QQQ move to config/
586
# QQQ move to config/
738
@@ -466,5 +609,16 @@
739
466
ENDIF (APPLE AND UNIVERSAL)
609
ENDIF (APPLE AND UNIVERSAL)
740
467
610
741
468
IF (WIN32)
611
IF (WIN32)
743
469
  ZORBA_GENERATE_EXE_SCRIPTS_WIN32 ()
612
  ZORBA_GENERATE_EXE_HELPERS_WIN32 ()
744
470
ENDIF (WIN32)
613
ENDIF (WIN32)
745
614
746
615
# This must be done last! Create the one top-level target which
747
616
# depends on all generated (copied) module/schema files.
748
617
DONE_DECLARING_ZORBA_URIS()
749
618
750
619
# This dependency makes sure that the error and warning definition
751
620
# modules are generated before trying to install them as zorba modules.
752
621
# This dependency is zorba-only related, which is why it's added here
753
622
# and not within zorba-modules, which is for general use in other
754
623
# non-zorba modules.
755
624
ADD_DEPENDENCIES(check_core_uris gen_diag_modules)
756
471
625
757
=== modified file 'CPackSourceConfig.cmake.in'
758
--- CPackSourceConfig.cmake.in	2009-10-30 16:24:51 +0000
759
+++ CPackSourceConfig.cmake.in	2013-01-25 00:15:35 +0000
760
@@ -19,7 +19,7 @@
761
19
19
762
20
SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
20
SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
763
21
SET(CPACK_GENERATOR "TGZ;TZ")
21
SET(CPACK_GENERATOR "TGZ;TZ")
765
22
SET(CPACK_IGNORE_FILES "test/coverity/;dist/;_CPack_Packages/;build/;build./;CVS/;/\\.svn/;\\.swp$;\\.#;/#")
22
SET(CPACK_IGNORE_FILES "test/coverity/;dist/;_CPack_Packages/;build/;build./;CVS/;/\\.svn/;\\.swp$;\\.#;/#;\\.bzr/")
766
23
SET(CPACK_INSTALLED_DIRECTORIES "@CMAKE_SOURCE_DIR@;/")
23
SET(CPACK_INSTALLED_DIRECTORIES "@CMAKE_SOURCE_DIR@;/")
767
24
SET(CPACK_INSTALL_CMAKE_PROJECTS "")
24
SET(CPACK_INSTALL_CMAKE_PROJECTS "")
768
25
SET(CPACK_MODULE_PATH "")
25
SET(CPACK_MODULE_PATH "")
769
26
26
770
=== modified file 'ChangeLog'
771
--- ChangeLog	2011-06-08 06:57:13 +0000
772
+++ ChangeLog	2013-01-25 00:15:35 +0000
773
@@ -1,27 +1,479 @@
774
1
Zorba - The XQuery Processor
1
Zorba - The XQuery Processor
775
2
2
776
3
777
4
version 2.8
778
5
779
6
New Features:
780
7
  * New external module for interfacing with Couchbase Server.
781
8
  * New external module for interfacing with SQLite Database.
782
9
  * New external module for interfacing with Oracle NoSQL Database.
783
10
  * New external module for interfacing with relational databases via JDBC.
784
11
  * New external info-extraction module for querying concepts and entities in
785
12
    natural language text.
786
13
  * New built-in module to (de)reference XML nodes or JSON objects and
787
14
    arrays that are stored in a collection
788
15
  * Implemented JSONiq's json-doc() function.
789
16
  * http-uri-resolution feature to disable HTTP when resolving URIs.
790
17
  * Option to specify that parse-json() strips the top-level array.
791
18
  * Extended cast and castable expression to allow any simple target type
792
19
    (as specified by XQuery 3.0).
793
20
  * The XQXQ (XQuery-for-XQuery) module became part of the Zorba core.
794
21
  * The datetime module became part of the Zorba core.
795
22
  * In the datetime module, added parse-date(), parse-dateTime(), parse-time(),
796
23
    and utc-offset().
797
24
  * Includes test driver for W3C XQuery 3.0 Test Suite (aka FOTS).
798
25
799
26
Optimizations:
800
27
  * Various optimizations in the implementation of the optimizer rules.
801
28
  * Better computation of the static type for global variables.
802
29
  * Optimization of comparison operators when untypedAtomic items are involved.
803
30
  * Improved computation of static type for fn:data function.
804
31
  * Fixed iteration over the components of a window clause; this improves static
805
32
    type computation of expressions referencing window vars.
806
33
  * No need to cast xs:untypedAtomic to xs:string in order-by expression.
807
34
  * Convert LET variables whose domain sequence has exactly one item to FOR vars.
808
35
809
36
Bug Fixes/Other Changes:
810
37
  * Fixed bug #949064  (faulty QName should be printed in the error message)
811
38
  * Fixed bug #1072644 (broken parser error location)
812
39
  * Fixed bug #868640 (Node lifetime is shorter than expected due to let
813
40
      variable inlining)
814
41
  * Fixed bugs #1081626 (Segmentation fault in a side-effecting FLWOR),
815
42
      #1079488 (streaming segfault)
816
43
  * Fixed bug #1062093 (bug in var reference iterators with an associated
817
44
      position that is negative)
818
45
  * Fixed bug #1073978 (FOTS: option default ns not supported)
819
46
  * Fixed bug #1061222 (bad message for errors in index key type declaration)
820
47
  * Fixed bug #1065175 (preceding::node()[1] returns wrong results)
821
48
  * Fixed bug #1065321 (following:text() doesn't return results in doc order)
822
49
  * Fixed bug #1067706 (wrong const folding in mutually recursive udfs)
823
50
  * Fixed bug #1021492 (while computing the "sources" of a prolog var, skip
824
51
      any var-setting exprs that appear in non-used (and non-optimized) functions).
825
52
  * Fixed bug #1070551 (zerr:ZOSE0003 stream read failure)
826
53
  * Fixed bug #992304 (Compiling library modules could load data from wrong
827
54
    source)
828
55
  * Fixed bug #1043294 (XQST0036 not used in XQuery 3.0).
829
56
  * Fixed bug in castable expr when the target type is xs:QName.
830
57
  * Fixed bug in testing if a sequence type is subtype of node(xs:untyped)
831
58
  * Fixed mustCopyInputNodes() method of no-copy, and jsoniq functions.
832
59
  * Fixed bugs related to casting to user-defined types.
833
60
834
61
835
62
version 2.7
836
63
837
64
New Features:
838
65
  * XQuery 3.0 simple map operator http://www.w3.org/TR/xquery-30/#id-map-operator
839
66
  * Copy function added to the node module
840
67
  * Allow prolog variables to be referenced before they are declared (XQuery 3.0 feature)
841
68
  * Module http://www.jsoniq.org/modules/function-library with handy JSONiq functions
842
69
  * jn:parse-json can parse multiple top-level JSON items
843
70
  * New semantics of null for comparison and arithmetics operations
844
71
  * xml:parse (fragment parsing) now allows for a DOCTYPE declaration at the
845
72
    beginning of the XML document (requested in bug #1016606).
846
73
  * Roundtripping of JSON items has been moved from the serializer to encoding functions.
847
74
  * Added uuid to public API.
848
75
  * Best-effort serialization of atomic values in JSON items.
849
76
  * Positional pagination support for index probes
850
77
  * Recognize the {http://www.zorba-xquery.com/extensions}no-copy pragma to avoid
851
78
    copying nodes before insertion into a collection.
852
79
  * Added createUntypedAtomic to API's ItemFactory.
853
80
  * new xqDoc feature; reporting collections and indexes
854
81
  * new xqDoc function parameter to enable/disable xqDoc generation of certain
855
82
    components
856
83
  * Adding new external module read-pdf, it converts PDF documents to text or rendered images.
857
84
858
85
Optimizations:
859
86
  * Improved memory management for compiler expressions (no more ref counting)
860
87
  * Extended optimization rules (for variable inlining/elimination and positional
861
88
    predicate rewrite) to general flwor expressions.
862
89
  * Early optimization of positional predicates to subsequence expressions: now
863
90
    done at translation time, if possible.
864
91
  * For non-mutable global variables, assign a type based on their initializing expr.
865
92
  * Use char* instead of zstring as the hashmap key in json objects
866
93
  * Removed document-order sorting after the index value probe functions.
867
94
  * Optimize positional predicates involving inequality (convert them to subsequence)
868
95
  * Optimize positional predicate that is in CNF with other predicates.
869
96
  * Optimized runtime group iterator based on latest group-by semantics.
870
97
  * Removed two unnecessary steps from optimizer.
871
98
872
99
Bug Fixes/Other Changes:
873
100
  * Fixed bug #1006960 (taking construction mode into account during no-copy rule)
874
101
  * Fixed bug #950621 (Removed two-arg version of fn:parse-xml(); use XML module
875
102
    function xml:parse() instead)
876
103
  * Fixed bug #867227 (Improved error message for missing commas)
877
104
  * Fixed memory leak during runtime group-by"
878
105
  * Fixed bug #1024033 and #1023170 (segfaults in parse-xml:parse())
879
106
  * Fixed bug #898792 (Dynamically computed strings can now be cast to xs:QName)
880
107
  * Fixed bug in determining the IsId property of constructed attribute nodes
881
108
  * Fixed bug #1034990 (text serialization with jsoniq fails)
882
109
  * Fixed bugs #899364 and 899363 (throw XQST0103 in case of non-distinct window
883
110
    variables)
884
111
  * Fixed bug #923686 (implicitly declare global context size and context position
885
112
    variables in main module and provide api function to assign values to these
886
113
    variables)
887
114
  * Fixed bug #899366 (enforce the type declaration of a window variable)
888
115
  * Fixed bug #1034942 (improper variable inlining inside general flwor expr)
889
116
  * Fixed bug #1024892 (index declaration references udf declared after the index)
890
117
  * Fixed bug #1038410 (Memory leaks in parser, trace iterator, and general index)
891
118
  * Fixed bug #1046411 (automatic boxing of multi-item sequence appearing as the
892
119
    value of an object pair)
893
120
  * Fixed bug #1046410 (automatic conversion to null of empty sequence appearing
894
121
    as the value of an object pair)
895
122
  * Fixed bug #1039488 (inserting more than one pair at once in a JSON object)
896
123
  * Fixed bug #1042840 (QName pool free-list corruption)
897
124
  * Fixed bug #866984 (better error message for an eval error)
898
125
  * Fixed bug #1047538 (SourceFinder::findLocalNodeSources missing json expressions)
899
126
  * Fixed bug #932374 (FOTS fn:matches failing tests)
900
127
  * Fixed #1052383 (accessing context item in eval expr)
901
128
  * Fixed bug #1046559 (dynamic resolution between function invocation and jsoniq
902
129
    navigation)
903
130
  * Fixed bug #932884 (HTML and XHTML serialization of empty elements)
904
131
  * Fixed bug #1046415 (pair name cast to string)
905
132
  * Fixed bug #1045902 (file:last-modified returns current date time)
906
133
  * Fixed bug #1043976 (compiler warning in serializer code)
907
134
  * Fixed bug #866994 (a better error message when collection iterator not open)
908
135
  * Fixed bug #1039254 (allow empty sequence as position value in positional LET
909
136
    var iterator)
910
137
911
138
912
139
version 2.6
913
140
914
141
New Features:
915
142
  * Include first-class support for JSON data by implementing the JSONiq spec
916
143
  - see http://jsoniq.org/ for more information. This feature is enabled by default.
917
144
  * Implemented the new EQName syntax (use Q{namespace}local instead of "namespace":local)
918
145
  * New function Item::isSeekable for streamable content (xs:string and xs:base64Binary)
919
146
  * Implemented the latest W3C specification for the group by clause (backwards incompatible)
920
147
  * New ft:tokenize-nodes() function to full-text module
921
148
  * New XQuery 3.0 function fn:parse-xml-fragment#1
922
149
  * New ItemFactory function that allows creating dateTime items without timezone
923
150
  * Added support for transient maps to the
924
151
    http://www.zorba-xquery.com/modules/store/data-structures/unordered-map module.
925
152
  * Added support for fragments to fn:path
926
153
  * Positional pagination support for collections
927
154
  * http://www.zorba-xquery.com/modules/archive module for creating,
928
155
    reading, and updating various (compressed) archives (e.g. zip, tar.gz,
929
156
    or tar.bz2)
930
157
  * Incremental maintenance for general indexes
931
158
  * New function in the http://www.zorba-xquery.com/modules/store/static/indexes/dml
932
159
    module which returns the value of all keys contained in an index
933
160
934
161
Optimizations:
935
162
  * Optimization of comparison operations
936
163
  * Tighter hoisting of expressions (also fixes bug #967428)
937
164
  * Optimized hash sets used by fn:distinct-values and nodes-distinct
938
165
  * Optimized hash function used for nodes (also fixes bug #1010051)
939
166
  * Rewrite of plan serializer internals, resulting in big performance improvement
940
167
  * Avoid treat expr for checking that the value of a non-external
941
168
    global variable conforms to the type declaration of the variable
942
169
  * Streaming execution for tumbling windows (also fixes bug #1010051)
943
170
944
171
Bug Fixes/Other Changes:
945
172
  * Fixed bug #1025622 (Incorrect JSON serialization of supplementary plane code points)
946
173
  * Fixed bug #1016606 (DOCTYPE in the input of the parse-fragment function)
947
174
  * Fixed bug #1002993 (bug during revalidation after update; improper condition
948
175
    for calling TypeOps::get_atomic_type_code() from
949
176
    SchemaValidatorImpl::isPossibleSimpleContentRevalImpl())
950
177
  * Fixed bug #867357 (Improved parser error messages)
951
178
  * Fixed bug #1026379 ("q" flag for fn:replace() is ignored)
952
179
  * Fixed bug #932314 (non-comparable values must be treated as distinct by
953
180
    fn:distinct-values)
954
181
  * Fixed bug #1015580 (Add base64_streambuf / replace inefficient base64 code)
955
182
  * Fixed bug #1022557 (subsequence function applied on window variable)
956
183
  * Fixed bug #9910884 (raise XUST0001 in trycatch with mixed updating and simple clauses)
957
184
  * Fixed bug #854506 (ugly type error messages) and partial fix for bug #867008
958
185
  * Fixed bug #1008082 (bug in transform expr when a copy var is not used anywhere)
959
186
  * Fixed bug #898066 (Stringstream & fn:trace)
960
187
  * Fixed numbering of items in fn:trace starts with one
961
188
  * Fixed bug #1003023$ (optimizer problems due to common subexpression after
962
189
    var folding into if-then-else)
963
190
  * Fixed bug #1006166 (disabling 2 functions with the same qname)
964
191
  * Fixed bug #960083 (improper error handling of NaN comparisons)
965
192
  * Fixed bug #878508 (JsonML serialization not escaping characters)
966
193
  * The XML plan serialization format is not supported anymore
967
194
968
195
969
196
version 2.5
970
197
971
198
New Features:
972
199
  * New XQuery 3.0 functions
973
200
    - fn:available-environment-variables
974
201
    - fn:environment-variables
975
202
    - fn:uri-collection
976
203
    - fn:unparsed-text
977
204
    - fn:unparsed-text-available
978
205
    - fn:has-children#0
979
206
    - fn:nilled#0
980
207
    - fn:path
981
208
  * Added base64:decode#2 function which also does transcoding
982
209
  * Extended API for Python, Java, PHP and Ruby
983
210
  * Added JVM classpath to zorbacmd and to Zorba API
984
211
  * Added full-text module
985
212
  * Added support for NO_ICU (to not use ICU for unicode processing)
986
213
  * Added XQJ support
987
214
  * Added CollectionManager and DocumentManager support for XQJ
988
215
  * Added new API EntityKind SOME_CONTENT
989
216
  * Added new API StreamResource which is able to specify whether a
990
217
    stream is seekable or not.
991
218
  * Added new functions in the fetch module and the StaticContext to fetch
992
219
    resources as binary
993
220
  * Added non-core schema-tools module for getting sample XMLSchema from
994
221
    XML instances and sample XML instances from XMLSchema.
995
222
996
223
Optimizations:
997
224
  * optimized insertion into a collection (don't copy it if the node was
998
225
    created by an element constructor and is not used anywhere else in the query)
999
226
  * Fixed performance problem with the findNodeSources function of the no-copy rule
1000
227
1001
228
Bug Fixes/Other Changes:
1002
229
  * Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query)
1003
230
  * Fixed bug #1001463 (type not available during computation of function caching)
1004
231
  * Fixed bug #1002867 (resulting base64 in http-client is wrong)
1005
232
  * Fixed bugs #905028 (Allow to set base URI to undefined)
1006
233
  * Fixed bugs #931501 and #866987 (improved error messages for fn:format-number()
1007
234
  * fn:format-number raises FODF1310 instead of XTDE1310
1008
235
  * Fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
1009
236
  * Fixed bug #862971 (no error upon duplicate function declarations)
1010
237
  * Fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
1011
238
  * Fixed bug #986075 (encountering flwor expr with no clauses)
1012
239
  * Fixed bug #967864 (var substitution did not update theFreeVars property)
1013
240
  * Fixed bug #891650 (context size var not always declared within path expr)
1014
241
  * Fixed bug #948879 (--uri-path doesn't work with fetch:content())
1015
242
  * Fixed bug in MarkNodeCopyProps rule (static cast to replace_expr without chaing the expr kind first)
1016
243
  * Fixed bug in window iterator (binding the end vars in the output tuple stream)
1017
244
  * Fixed bug #866547 (protect index-join rule from general flwor)
1018
245
  * Fixed bug #867253 (cdml:delete-nodes should only remove root nodes)
1019
246
  * Fixed bug #967428 (do not hoist index creation outside a try-catch)
1020
247
  * Fixed bug #872234 (prevent a rewritting to take place in case of sequential expr)
1021
248
  * Fixed bug #966706 (key uniqueness of index not enforced during incremental refresh)
1022
249
  * Fixed bug #906494 (default compile with D_FILE_OFFSET_BITS=64)
1023
250
  * Fixed bug #988412 (date:current-dateTime daylight saving)
1024
251
  * Fixed bug #912586, #912593 and #912722 (assertion failures with lax validation)
1025
252
  * Fixed bug #986377 (do not apply any updates on collection if it is to be truncated)
1026
253
  * Fixed bug #921458 (file:read-text-lines() blocking)
1027
254
  * Fixed bug #981405 (do not hoist expr containing try-catch variables out of the associated try-catch expression)
1028
255
  * Fixed bug #996084 (crash in Streamable*Item with file module)
1029
256
  * Fixed bug #947627 (throw XQST0099 if more than one declarations of context item type in same module)
1030
257
  * Fixed bug #980526 (no-copy rule bug due to global var being set in "distant" udf)
1031
258
  * Fixed bug #949910 (has-children may be invoked on all nodes)
1032
259
  * Fixed Bug #933490 (Error ItemFactoryImpl::createBase64Binary with istream)
1033
260
  * Fixed bug #867112 (Diagnostic Handler was not working on external APIs)
1034
261
  * Fixed bug #857842 (Assertion failed with simple content element with comments)
1035
262
  * Fixed bug #928626 (no setting classpath in xsl-fo module)
1036
263
1037
264
version 2.2
1038
265
1039
266
New Features:
1040
267
  * Add --compile-plan (-c) and --execute-plan (-e) options to zorba command line.
1041
268
  * Add XQuery 3.0 concat operator (http://www.w3.org/TR/xquery-30/#id-string-concat-expr)
1042
269
  * New URI module providing percent-decoding functions.
1043
270
  * The core parse-xml module is now able to parse input files in a streaming mode. A number of new options have also been added.
1044
271
  * LibXml2 version 2.7.0 or higher is now required in order to build Zorba.
1045
272
  * Added index management function to the C++ api's StaticCollectionManager.
1046
273
  * Added createDayTimeDuration, createYearMonthDuration, createDocumentNode, createCommentNode, createPiNode to api's ItemFactory.
1047
274
  * Fixed bug #905050 (setting and getting the context item type via the c++ api).
1048
275
  * Added split function to the string module that allows for streamable tokenization but doesn't have regular expression
1049
276
  * Add new XQuery interface for the PHP bindings.
1050
277
  * Added two API methods StaticContext::getFunctions to introspect the functions of a static context
1051
278
  * Added API method Item::getNamespaceBindings().
1052
279
  * Added a transcoding streambuffer to the API which allows transcoding arbitrary encodings
1053
280
    from and to UTF-8
1054
281
  * file:read-text is able to handle arbitrary encodings (fixes bug #867159)
1055
282
  * http:send-request is able to handle arbitrary encodings
1056
283
  * Added API method StaticContext::getNamespaceBindings() (see bug #905035)
1057
284
  * New version of the JSON converter module in the core of Zorba (no external dependencies anymore)
1058
285
  * Added truncate function to the collection modules for efficient deletion of all nodes in a collection.
1059
286
1060
287
1061
288
Optimization:
1062
289
  * No-copy optimization: avoids copying nodes during node-constructor expressions.
1063
290
  * Added external function annotations %ann:propagates-input-nodes and
1064
291
    %ann:must-copy-input-nodes to be used by the no-copy optimization.
1065
292
  * Caching of results for recursive functions with atomic parameter and return types.
1066
293
  * Added %ann:cache and %ann:no-cache to enable or disable caching of results of functions with atomic parameter and return types.
1067
294
  * Types-related optimizations for runtime operators (comparisons, FnBoolean, Or, And,
1068
295
    Compare, instance-of, cast, castable, treat, promote).
1069
296
  * More efficient implementation for base64Binary items
1070
297
  * Preallocate and reuse temp sequence iterator for LetVarITerator
1071
298
    and CtxVarIterator.
1072
299
  * Enhanced push-down of positional predicate into LetVarITerator
1073
300
    and CtxVarIterator.
1074
301
  * Change the implementation of the free-vars annotation and got rid
1075
302
    of the annotations map in expressions.
1076
303
1077
304
Bug Fixes/Other Changes:
1078
305
  * Fixed bug 923015 (clone() not implemented for full-text expressions)
1079
306
  * Fixed bug 917923 (bug in copying outer var values into the eval dynamic context)
1080
307
  * Fixed bug 867509 (Can not handle largest xs:unsignedLong values)
1081
308
  * Fixed bug 924063 (sentence is incorrectly incremented when token characters end without sentence terminator)
1082
309
  * Fixed bug 909126 (bug in cloning of var_expr)
1083
310
  * Fixed bug 928631 (external builtin function were not executed in the module they
1084
311
    were declared)
1085
312
  * Fixed bug in destruction of exit_catcher_expr
1086
313
  * Fixed bug #867024 (error messages)
1087
314
  * Fixed bug #957580 (stream read failure in StringToCodepointsIteartor)
1088
315
  * Fixed bug #911585 (management of variables during eval)
1089
316
  * Fixed bug #866423 (fn:empty and fn:exists iterators must reset their input in
1090
317
    case of early-out)
1091
318
  * Fixed bug #955574 (http-client "hangs" if following a POST request)
1092
319
  * Fixed bug #945241 (StaticCollectionManager::declaredIndexes() and temporary indexes)
1093
320
  * Fixed bug #872288 (reset recursive flag during node rename)
1094
321
  * Fixed bug #905041 (allow for the default element and function namespaces to be
1095
322
    set multiple times via the c++ api).
1096
323
  * Fixed bug #907872 (segfault when returning an input ItemSequence from an external function).
1097
324
  * Fixed bug in codegen: do not create a materialize clause if one exists already
1098
325
    support.
1099
326
  * Fixed bug involving positional var and groupby
1100
327
  * Fixed bug #867266 (do not hoist updating expressions)
1101
328
  * Fixed bug #867022 (added location and params to some XPTY0004 errors)
1102
329
  * zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors
1103
330
  * Fixed bug #917981 (disallow declaring same module twice).
1104
331
  * Deprecated StaticContext:getNamespaceURIByPrefix()
1105
332
  * Fixed bug #943788 (streamable string is not seekable)
1106
333
  * Fixed bug #921624 (slow queries with bogus example.com schema URIs)
1107
334
  * Fixed bug #918211 (xqueryx fulltext w3c conformance generation)
1108
335
  * Fixed bug #918157 (Add XQFTTS to validation queue)
1109
336
  * Fixed bug with unversioned modules with C++ external functions
1110
337
  * Fixed bug #912579 (validate-in-place on non-root elements)
1111
338
  * Fixed bug #891209 (validation with xsi:type returns untyped)
1112
339
  * Fixed bug #952829 (Nondeterministic annotation doesn't seem to be checked)
1113
340
  * Fixed bug #951772 (Comment node crashes serialization)
1114
341
  * Fixed bug #945241 (StaticCollectionManager::declaredIndexes() and temporary indexes)
1115
342
1116
343
1117
344
version 2.1
1118
345
1119
346
New Features:
1120
347
  * New node-position module. This module allows to obtain a representation of a node position, which
1121
348
    can be used to assess structural relationships with other nodes.
1122
349
  * New node-reference module. References can be obtained for any node, and
1123
350
       different nodes cannot have the same identifier.
1124
351
  * Custom Full-text thesaurus using Zorba URI resolver mechanism.
1125
352
  * Modified C++ API to add isSequential, getExternalVariables,
1126
353
       isBoundContextItem and isBoundExternalVariable Functions
1127
354
  * Collection allows to retrieve information about the type
1128
355
  and the annotations of a static collection.
1129
356
  * Implemented the probe-index-range-value for general indexes
1130
357
  * Added ExternalFunctionParameter class to be registered in the DynamicContext
1131
358
  * New module for compiling and executing XQueries from XQuery (xqxq)
1132
359
  * External functions are allowed to be updating (i.e. return a pending update list)
1133
360
1134
361
Optimization:
1135
362
  * Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a
1136
363
  sequence of integers)
1137
364
  * Optimization for count(collection()) expressions
1138
365
  * Optimization of the fn:substring function in the case when its $start and $length arguments
1139
366
  are integers
1140
367
1141
368
Bug Fixes/Other Changes:
1142
369
  * Fixed bug #3403291 (build for Fedora 15)
1143
370
  * Fixed bug #3397293 (Incorrect XQueryX error message)
1144
371
  * Fixed bug #3398637 (Nested element constructors cause loss of namespace bindings)
1145
372
  * Fixed bug #3401592 (Undo of Create Collection doesn't work)
1146
373
  * Fixed bug #3404689 (assignment problem in flwor)
1147
374
  * Fix for bug #3404450 (testdriver_mt problem: caching and validation of docs)
1148
375
  * Fixed installation bug to not install the .so for test modules
1149
376
  * Fixed bug #3390410 (Adding a node to a collection causes out of bound in vector)
1150
377
  * Fixed bug #3406200 (node types were not being moved to new tree during node detach)
1151
378
  * Fixed bug #3406191 (Namespace bindings lost after update due to bug in node detach)
1152
379
  * Fixed bug #3290122 (ZDST0003 needs collection name)
1153
380
  * Fixed bug #3406272 (merging of adjacent text nodes must be done after all
1154
381
    updates have been applied).
1155
382
  * Don't raise warnings for unknown annotations.
1156
383
  * Fixed bug #3409344 (during detach, if the node being detached is the root of
1157
384
    its tree, it should be detached from the tree as well; otherwise memory
1158
385
    corruption will occur)
1159
386
  * Fixed bug # (Should not destroy the parent of a node that is being detached
1160
387
    before the detach is done).
1161
388
  * Added const qualifier to StaticContext::getAuditEvent()
1162
389
  * Fixed bug #3408181 (available-collection() returns undeclared collections)
1163
390
  * Fixed bug #859465 (Fatal error if a PUL contains two deactivate IC primitives)
1164
391
  * Fixed bug #859467 (Fatal error if a PUL contains two activate Foreign Key primitives)
1165
392
  * Fixed bug #859468 (Fatal error if a PUL contains two activate Simple IC primitives)
1166
393
  * Fixed bug #859522 (Fatal error if a PUL contains two delete document primitives)
1167
394
  * Fixed bug #859968 (Using put on an attribute produces an invalid XDM instance and may cause segmentation faults)
1168
395
  * Fixed bug #855314 (should not fold a constant expr that returns an error item)
1169
396
  * Fixed bug when parsing a document with a base-uri attribute.
1170
397
  * Fixed bug #863320 (Sentence is incorrectly incremented when token characters end without sentence terminator)
1171
398
  * Fixed bug #863730 (static delete-node* functions don't raise ZDDY0012)
1172
399
  * Implemented the probe-index-range-value for general indexes
1173
400
  * Removed ZSTR0005 and ZSTR0006 error codes
1174
401
  * Fixed bug #867662 ("nullptr" warning)
1175
402
  * Fixed bug #868258 (Assertion failure with two delete collection)
1176
403
  * Fixed bug #871623 and #871629 (assertion failures with insertions in dynamic collections)
1177
404
  * Fixed bug #867262 (allow reuse of iterator over ExtFuncArgItemSequence)
1178
405
  * Fixed bug #869024 (segmentation fault with node-reference)
1179
406
  * Fixed bug #869025 (segmentation fault with node-reference)
1180
407
  * New node-reference module. References can be obtained for any node, and
1181
408
      different nodes cannot have the same identifier.
1182
409
  * Fixed bug #872697  (segmentation fault with validation of NMTOKENS)
1183
410
  * General index cannot be declared as unique if the type of its key is
1184
411
    xs:anyAtomicType or xs:untypedAtomic.
1185
412
  * Added undo for node revalidation
1186
413
  * Optimization for count(collection()) expressions
1187
414
  * Fixed bug #872796  (validate-in-place can interfere with other update primitives)
1188
415
  * Fixed bug #872799 (validate-in-place can set incorrect types)
1189
416
  * Fixed bug #855715 (Invalid escaped characters in regex not caught)
1190
417
  * Fixed bug #868325 (fn:analyze-string fails with some recursive subgroups)
1191
418
  * Fixed bug #872697 (segmentation fault with validation of NMTOKENS)
1192
419
  * General index cannot be declared as unique if the type of its key is
1193
420
  xs:anyAtomicType or xs:untypedAtomic.
1194
421
  * Added undo for node revalidation
1195
422
  * Optimization for count(collection()) expressions
1196
423
  * Fixed bug #867133 (SWIG PHP build failure on Mac OSX)
1197
424
  * Fixed bug #872796 (validate-in-place can interfere with other update primitives)
1198
425
  * Fixed bug #872799 (validate-in-place can set incorrect types)
1199
426
  * Fixed bug #872850 (Serialization of Tumbling Window For fails)
1200
427
  * Fixed bug #855715 (Invalid escaped characters in regex not caught)
1201
428
  * Fixed bug #862089 (Split binary/xq install directories for modules) by
1202
429
  splitting "module path" into separate URI and Library paths
1203
430
  * New node-position module. This module allows to obtain a representation of a node position, which
1204
431
    can be used to assess structural relationships with other nodes.
1205
432
  * Fixed bug #872502 (validation of the JSON module xqdoc fails)
1206
433
  * Fixed bug #897619 (testdriver_mt can not run the XQueryX tests)
1207
434
  * Fixed bug #867107 (xqdoc dependency to zorba is wrong)
1208
435
  * Fixed bug #897616 (Fix the generation of the XQFTTS report results for
1209
436
  W3C)
1210
437
1211
438
version 2.0.3
1212
439
  * Fixed bug #867662 ("nullptr" warning)
1213
440
  * documentation improvements
1214
441
1215
442
version 2.0.2
1216
443
  * Fixed bug #3401971 (node-by-reference on dynamic collections)
1217
444
  * documentation improvements
1218
445
  * installer improvements
1219
446
  * Fixed bug #3403291 (build for Fedora 15)
1220
447
  * Don't install the .so for test modules
1221
448
  * Fix for running ctest on Windows
1222
449
1223
450
version 2.0.1
1224
451
1225
452
  * Custom Full-text stemming.
1226
453
  * Custom Full-text tokenization.
1227
454
  * Fixed scripting bug where apply statement was considered a sequential expr even if the source expr was non-updating and non-sequential.
1228
455
  * Fixed bug #3394400 (Element replacement, really unexpected result)
1229
456
  * Fixed bug #3394588 (Unexpected error during pul undo)
1230
457
  * Fixed bugs #3398511 and #3398552 with "make install"
1231
458
  * Fixed bug #3398521 for compiling with ZORBA_NO_XMLSCHEMA
1232
459
1233
3
version 2.0
460
version 2.0
1255
4
  * Removed the --install-path zorba command line argument. This functionality was duplicating
461
  * Zorba 2.0 is a major rewrite of previous versions. It doesn't claim to
1256
5
    the existing --module-path argument
462
    preserve backwards compatibility with any 1.X version.
1257
6
  * zorba executable deletes the output file (if one is provided) in case the execution fails
463
    Host language API changes have been made to the following components:
1258
7
  * changed the error codes returned by the zorba executable (using different codes for
464
    - External functions API
1259
8
    different locations where the execution might fail)
465
    - XmlDataManager
1260
9
  * Removed the XQuery 1.1 "outer for" construct, and replaced it with "allowing empty"
466
    - Error reporting
1261
10
  * Added the XQuery 1.1 functions and variables annotations. Removed the "deterministic" 
467
    - Debugger API
1262
11
    and "nondeterministic" keywords, which were replaced by the "%deterministic" and 
468
    XQuery language and API changes have been made to the following components:
1263
12
    "%nondeterministic" annotations.
469
    - XQuery Scripting Extension
1264
13
  * Changed the singature of ExternalModule::getExternalFunction. The const modified was removed
470
    - Function APIs
1265
14
    to allow for lazy instantiation of the function objects. Also, the localname is passed as
471
    - XQuery Data Definition Facility
1266
15
    as a const reference.
472
    - XQuery modules and module versioning
1267
16
  * renamed the fn:parse function (XQuery Functions and Operators 1.1) to fn:parse-xml
473
    - Changes to conform with the latest XQuery 3.0
1268
17
    (XQuery Functions and Operators 3.0)
474
    - Namespaces of annotations, errors, collations.
1269
18
  * added the fn:serialize function (XQuery Functions and Operators 3.0)
475
  * In addition to host language API and XQuery language improvements,
1270
19
  * removed the serialize module (http://www.zorba-xquery.com/modules/serialize) since this
476
    plenty of bug fixes and optimizations have been made.
1250
20
    functionality is now covered by the built-in function fn:serialize
1251
21
  * updated the file module to the new http://expath.org/ file module specification. The new module is now in the http://expath.org/ns/file namespace
1252
22
  * the XML Schema atomic types are now serialized including the "xs" prefix (used in sax2 serialization,
1253
23
 debuger, etc.)
1254
24
  * zorba uses now DBGP as the debugger protocol
1271
25
477
1272
26
version 1.4
478
version 1.4
1273
27
  * added a datetime library module with nondeterministic functions
479
  * added a datetime library module with nondeterministic functions
1274
28
480
1275
=== modified file 'KNOWN_ISSUES.txt'
1276
--- KNOWN_ISSUES.txt	2011-07-01 14:37:20 +0000
1277
+++ KNOWN_ISSUES.txt	2013-01-25 00:15:35 +0000
1278
@@ -1,41 +1,52 @@
1282
1
  ----------------------------
1
This is a list of issues that we are aware of but are not imlemeneted or fixed:
1280
2
  FLWOR Foundation - Zorba 2.0
1281
3
  ----------------------------
1283
4
2
1285
5
This is a list of issues that we are aware of but are not fixed in this version:
3
Zorba Version 2.0
1286
6
4
1287
7
* Floating-point precision problems.
5
* Floating-point precision problems.
1288
8
  For details, see the following bugs:
6
  For details, see the following bugs:
1292
9
  - 2204089 <https://sourceforge.net/tracker2/?func=detail&aid=2204089&group_id=226244&atid=1067586>
7
  - 2204089 <https://bugs.launchpad.net/zorba/+bug/sf-2204089>
1293
10
  - 2205034 <https://sourceforge.net/tracker2/?func=detail&aid=2205034&group_id=226244&atid=1067586>
8
  - 2205034 <https://bugs.launchpad.net/zorba/+bug/sf-2205034>
1294
11
  - 2210851 <https://sourceforge.net/tracker2/?func=detail&aid=2210851&group_id=226244&atid=1067586>
9
  - 2210851 <https://bugs.launchpad.net/zorba/+bug/sf-2210851>
1295
12
10
1296
13
* When using the (now default) xs:integer representation of a C++ "long long",
11
* When using the (now default) xs:integer representation of a C++ "long long",
1297
14
  the largest xs:unsignedLong values are not handled correctly.
12
  the largest xs:unsignedLong values are not handled correctly.
1298
15
  For details, see the following bug:
13
  For details, see the following bug:
1300
16
  - 3323548 <https://sourceforge.net/tracker/?func=detail&aid=3323548&group_id=226244&atid=1067586>
14
  - 3323548 <https://bugs.launchpad.net/zorba/+bug/sf-3323548>
1301
17
15
1302
18
* Zorba uses ICU for regular expressions that does not support range
16
* Zorba uses ICU for regular expressions that does not support range
1306
19
  subtraction.
17
  subtraction.  For details, see the following bug:
1307
20
  For details, see the following bug:
18
  - 3150856 <https://bugs.launchpad.net/zorba/+bug/sf-3150856>
1305
21
  - 3150856 <https://sourceforge.net/tracker/?func=detail&aid=3150856&group_id=226244&atid=1067586>
1308
22
19
1309
23
* If you link against ICU <= 3.8.1, you can get wrong results when using \s to
20
* If you link against ICU <= 3.8.1, you can get wrong results when using \s to
1313
24
  match a white space character.
21
  match a white space character. For details, see following bug:
1314
25
  For details, see following bug:
22
  - 3155900 <https://bugs.launchpad.net/zorba/+bug/sf-3155900>
1312
26
  - 3155900 <https://sourceforge.net/tracker/?func=detail&aid=3155900&group_id=226244&atid=1067586>
1315
27
23
1316
28
* A known bug in Xerces < 3.0, when an .xsd contains an any wildcard with
24
* A known bug in Xerces < 3.0, when an .xsd contains an any wildcard with
1317
29
  namespace #others and the instance contains an element without a namespace,
25
  namespace #others and the instance contains an element without a namespace,
1318
30
  there should still be an error.  See "Definitive XMLSchema" by Priscilla
26
  there should still be an error.  See "Definitive XMLSchema" by Priscilla
1319
31
  Wamsley, p. 279. This was fixed in Xerses > 3.0.
27
  Wamsley, p. 279. This was fixed in Xerses > 3.0.
1320
32
  For details, see following bug:
28
  For details, see following bug:
1322
33
  - 3137594 <https://sourceforge.net/tracker/index.php?func=detail&aid=3137594&group_id=226244&atid=1067586>
29
  - 3137594 <https://bugs.launchpad.net/zorba/+bug/sf-3137594>
1323
34
30
1324
35
* XQuery Full-Text is mostly, but not completely, implemented.
31
* XQuery Full-Text is mostly, but not completely, implemented.
1325
36
  For details, see following bugs:
32
  For details, see following bugs:
1328
37
  - 3187470 <https://sourceforge.net/tracker/?func=detail&aid=3187470&group_id=226244&atid=1067586>
33
  - 3172383 <https://bugs.launchpad.net/zorba/+bug/sf-3172383>
1329
38
  - 3187462 <https://sourceforge.net/tracker/?func=detail&aid=3187462&group_id=226244&atid=1067586>
34
  - 3187470 <https://bugs.launchpad.net/zorba/+bug/sf-3187470>
1330
35
  - 3187462 <https://bugs.launchpad.net/zorba/+bug/sf-3187462>
1331
39
36
1332
40
* The serializer currently doesn't implement character maps as specified
37
* The serializer currently doesn't implement character maps as specified
1333
41
  (http://www.w3.org/TR/xslt-xquery-serialization/#character-maps)
38
  (http://www.w3.org/TR/xslt-xquery-serialization/#character-maps)
1334
39
1335
40
* In the 2.0 release, setting the CMake variables ZORBA_NO_ICU to
1336
41
  ON is not supported.
1337
42
1338
43
* The PHP language binding is not supported on Mac OS X. For details,
1339
44
  see the following bug:
1340
45
  - <https://bugs.launchpad.net/zorba/+bug/sf-3371525>
1341
46
1342
47
* Generating the XQDoc documentation on Windows using nmake is broken,
1343
48
  see the following bug:
1344
49
  - <https://bugs.launchpad.net/zorba/+bug/sf-3393173>
1345
50
1346
51
* The Scripting Extension's features break and continue are not
1347
52
  implemented if used within a FLWOR Statement.
1348
42
53
1349
=== added file 'NOTICE.txt'
1350
--- NOTICE.txt	1970-01-01 00:00:00 +0000
1351
+++ NOTICE.txt	2013-01-25 00:15:35 +0000
1352
@@ -0,0 +1,740 @@
1353
1
-----------
1354
2
Zorba 2.8.0
1355
3
-----------
1356
4
1357
5
(Note: This file is generated automatically from NOTICE.xml.
1358
6
Please do not modify this file directly.)
1359
7
1360
8
1361
9
1362
10
1363
11
Apache 2
1364
12
1365
13
      Copyright 2006-2011 The FLWOR Foundation
1366
14
1367
15
      See LICENSE.txt for license information.
1368
16
1369
17
      ------------------------
1370
18
      This product includes software developed at
1371
19
      The FLWOR Foundation (http://www.flworfound.org/).
1372
20
1373
21
      ------------------------
1374
22
      Portions of this software were developed at the Systems
1375
23
      Group of the ETH Zurich, Switzerland.
1376
24
    
1377
25
1378
26
Other files used by this project:
1379
27
----------------------------------------------------
1380
28
1381
29
src/zorbatypes/m_apm.h
1382
30
src/zorbatypes/mapm/
1383
31
1384
32
Copyright: 1999-2007 Michael C. Ring
1385
33
Website: http://www.tc.umn.edu/~ringx004/mapm-main.html
1386
34
1387
35
      This software is Freeware.
1388
36
1389
37
      Permission to use, copy, and distribute this software and its
1390
38
      documentation for any purpose with or without fee is hereby granted,
1391
39
      provided that the above copyright notice appear in all copies and
1392
40
      that both that copyright notice and this permission notice appear
1393
41
      in supporting documentation.
1394
42
1395
43
      Permission to modify the software is granted. Permission to distribute
1396
44
      the modified code is granted. Modifications are to be distributed by
1397
45
      using the file 'license.txt' as a template to modify the file header.
1398
46
      'license.txt' is available in the official MAPM distribution.
1399
47
1400
48
      To distribute modified source code, insert the file 'license.txt'
1401
49
      at the top of all modified source code files and edit accordingly.
1402
50
1403
51
      This software is provided "as is" without express or implied warranty.
1404
52
    
1405
53
----------------------------------------------------
1406
54
1407
55
src/zorbamisc/config/stdint.h
1408
56
1409
57
Copyright: 2006 Alexander Chemeris
1410
58
1411
59
1412
60
      Redistribution and use in source and binary forms, with or without
1413
61
      modification, are permitted provided that the following conditions are met:
1414
62
1415
63
      1. Redistributions of source code must retain the above copyright notice,
1416
64
      this list of conditions and the following disclaimer.
1417
65
1418
66
      2. Redistributions in binary form must reproduce the above copyright
1419
67
      notice, this list of conditions and the following disclaimer in the
1420
68
      documentation and/or other materials provided with the distribution.
1421
69
1422
70
      3. The name of the author may be used to endorse or promote products
1423
71
      derived from this software without specific prior written permission.
1424
72
1425
73
      THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
1426
74
      WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
1427
75
      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
1428
76
      EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1429
77
      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
1430
78
      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
1431
79
      OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
1432
80
      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
1433
81
      OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
1434
82
      ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1435
83
    
1436
84
----------------------------------------------------
1437
85
1438
86
src/zorbautils/stemmer/
1439
87
1440
88
Copyright: 2001 Dr. Martin Porter
1441
89
1442
90
1443
91
      All the software given out on this Snowball site is covered by the BSD
1444
92
      License (see http://www.opensource.org/licenses/bsd-license.html), with
1445
93
      Copyright (c) 2001, Dr Martin Porter, and (for the Java developments)
1446
94
      Copyright (c) 2002, Richard Boulton.
1447
95
1448
96
      Essentially, all this means is that you can do what you like with the code,
1449
97
      except claim another Copyright for it, or claim that it is issued under a
1450
98
      different license. The software is also issued without warranties, which
1451
99
      means that if anyone suffers through its use, they cannot come back and sue
1452
100
      you. You also have to alert anyone to whom you give the Snowball software to
1453
101
      the fact that it is covered by the BSD license.
1454
102
1455
103
      We have not bothered to insert the licensing arrangement into the text of
1456
104
      the Snowball software.
1457
105
    
1458
106
----------------------------------------------------
1459
107
1460
108
src/util/less.h
1461
109
1462
110
Copyright: 1998 Paul J. Lucas
1463
111
1464
112
1465
113
      Redistribution and use in source and binary forms, with or without
1466
114
      modification, are permitted provided that the following conditions are met:
1467
115
1468
116
      o  Redistributions of source code must retain the above copyright notice,
1469
117
      this list of conditions and the following disclaimer.
1470
118
1471
119
      o  Redistributions in binary form must reproduce the above copyright
1472
120
      notice, this list of conditions and the following disclaimer in the
1473
121
      documentation and/or other materials provided with the distribution.
1474
122
1475
123
      o  The name of the author may not be used to endorse or promote products
1476
124
      derived from this software without specific prior written permission.
1477
125
1478
126
      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1479
127
      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1480
128
      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
1481
129
      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
1482
130
      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
1483
131
      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
1484
132
      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
1485
133
      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
1486
134
      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
1487
135
      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
1488
136
      POSSIBILITY OF SUCH DAMAGE.
1489
137
    
1490
138
----------------------------------------------------
1491
139
1492
140
src/util/auto_vector.h (has been modified)
1493
141
1494
142
Copyright: 2003 Reliable Software
1495
143
1496
144
1497
145
      Redistribution and use in source and binary forms, with or without
1498
146
      modification, are permitted provided that the following conditions are met:
1499
147
1500
148
      o  Redistributions of source code must retain the above copyright notice,
1501
149
      this list of conditions and the following disclaimer.
1502
150
1503
151
      o  Redistributions in binary form must reproduce the above copyright
1504
152
      notice, this list of conditions and the following disclaimer in the
1505
153
      documentation and/or other materials provided with the distribution.
1506
154
1507
155
      o  The name of the author may not be used to endorse or promote products
1508
156
      derived from this software without specific prior written permission.
1509
157
1510
158
      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1511
159
      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1512
160
      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
1513
161
      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
1514
162
      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
1515
163
      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
1516
164
      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
1517
165
      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
1518
166
      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
1519
167
      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
1520
168
      POSSIBILITY OF SUCH DAMAGE.
1521
169
    
1522
170
----------------------------------------------------
1523
171
1524
172
cmake_modules/FindBoost.cmake
1525
173
1526
174
Copyright: 
1527
175
      2006-2008 Andreas Schneider <mail@cynapses.org>
1528
176
      2007      Wengo
1529
177
      2007      Mike Jackson
1530
178
      2008      Andreas Pakulat <apaku@gmx.de>
1531
179
    
1532
180
1533
181
1534
182
      Redistribution AND use is allowed according to the terms of the New BSD license.
1535
183
      For details see the accompanying COPYING-CMAKE-SCRIPTS file.
1536
184
    
1537
185
----------------------------------------------------
1538
186
1539
187
cmake_modules/FindJNI.cmake
1540
188
cmake_modules/FindPythonLibs.cmake
1541
189
cmake_modules/FindSWIG.cmake
1542
190
1543
191
Copyright: 2001-2009 Kitware, Inc.
1544
192
1545
193
1546
194
      Distributed under the OSI-approved BSD License (the "License");
1547
195
      see accompanying file Copyright.txt for details.
1548
196
1549
197
      This software is distributed WITHOUT ANY WARRANTY; without even the
1550
198
      implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1551
199
      See the License for more information.
1552
200
1553
201
      CMake - Cross Platform Makefile Generator
1554
202
      Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
1555
203
      All rights reserved.
1556
204
1557
205
      Redistribution and use in source and binary forms, with or without
1558
206
      modification, are permitted provided that the following conditions
1559
207
      are met:
1560
208
1561
209
      * Redistributions of source code must retain the above copyright
1562
210
      notice, this list of conditions and the following disclaimer.
1563
211
1564
212
      * Redistributions in binary form must reproduce the above copyright
1565
213
      notice, this list of conditions and the following disclaimer in the
1566
214
      documentation and/or other materials provided with the distribution.
1567
215
1568
216
      * Neither the names of Kitware, Inc., the Insight Software Consortium,
1569
217
      nor the names of their contributors may be used to endorse or promote
1570
218
      products derived from this software without specific prior written
1571
219
      permission.
1572
220
1573
221
      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1574
222
      "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1575
223
      LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1576
224
      A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1577
225
      HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1578
226
      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1579
227
      LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1580
228
      DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1581
229
      THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1582
230
      (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1583
231
      OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1584
232
1585
233
      ------------------------------------------------------------------------------
1586
234
1587
235
      The above copyright and license notice applies to distributions of
1588
236
      CMake in source and binary form.  Some source files contain additional
1589
237
      notices of original copyright by their contributors; see each source
1590
238
      for details.  Third-party software packages supplied with CMake under
1591
239
      compatible licenses provide their own copyright notices documented in
1592
240
      corresponding subdirectories.
1593
241
1594
242
      ------------------------------------------------------------------------------
1595
243
1596
244
      CMake was initially developed by Kitware with the following sponsorship:
1597
245
1598
246
      * National Library of Medicine at the National Institutes of Health
1599
247
      as part of the Insight Segmentation and Registration Toolkit (ITK).
1600
248
1601
249
      * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
1602
250
      Visualization Initiative.
1603
251
1604
252
      * National Alliance for Medical Image Computing (NAMIC) is funded by the
1605
253
      National Institutes of Health through the NIH Roadmap for Medical Research,
1606
254
      Grant U54 EB005149.
1607
255
1608
256
      * Kitware, Inc.
1609
257
    
1610
258
----------------------------------------------------
1611
259
1612
260
/xml.xsd
1613
261
1614
262
Copyright: 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
1615
263
1616
264
1617
265
      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1618
266
1619
267
      W3C Software Notice and License
1620
268
1621
269
      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
1622
270
1623
271
      License
1624
272
1625
273
      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
1626
274
1627
275
      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
1628
276
      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
1629
277
      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
1630
278
      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
1631
279
1632
280
      Disclaimers
1633
281
1634
282
      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
1635
283
1636
284
      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
1637
285
1638
286
      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
1639
287
    
1640
288
----------------------------------------------------
1641
289
1642
290
schemas/xslt-xquery-serialization.xsd
1643
291
1644
292
Copyright: 2010 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
1645
293
1646
294
1647
295
      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1648
296
1649
297
      W3C Software Notice and License
1650
298
1651
299
      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
1652
300
1653
301
      License
1654
302
1655
303
      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
1656
304
1657
305
      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
1658
306
      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
1659
307
      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
1660
308
      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
1661
309
1662
310
      Disclaimers
1663
311
1664
312
      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
1665
313
1666
314
      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
1667
315
1668
316
      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
1669
317
    
1670
318
----------------------------------------------------
1671
319
1672
320
modules/w3c/xpath-functions.xsd
1673
321
1674
322
Copyright: 2005 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
1675
323
1676
324
1677
325
      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1678
326
1679
327
      W3C Software Notice and License
1680
328
1681
329
      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
1682
330
1683
331
      License
1684
332
1685
333
      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
1686
334
1687
335
      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
1688
336
      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
1689
337
      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
1690
338
      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
1691
339
1692
340
      Disclaimers
1693
341
1694
342
      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
1695
343
1696
344
      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
1697
345
1698
346
      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
1699
347
    
1700
348
----------------------------------------------------
1701
349
1702
350
include/xqc.h
1703
351
1704
352
Copyright: 2008, Matthias Brantner, John Snelson
1705
353
1706
354
1707
355
      * All rights reserved.
1708
356
      *
1709
357
      * Redistribution and use in source and binary forms, with or without
1710
358
      * modification, are permitted provided that the following conditions are met:
1711
359
      *
1712
360
      *     * Redistributions of source code must retain the above copyright notice,
1713
361
      *       this list of conditions and the following disclaimer.
1714
362
      *     * Redistributions in binary form must reproduce the above copyright
1715
363
      *       notice, this list of conditions and the following disclaimer in the
1716
364
      *       documentation and/or other materials provided with the distribution.
1717
365
      *     * Neither the name of the developers nor the names of contributors may be
1718
366
      *       used to endorse or promote products derived from this software without
1719
367
      *       specific prior written permission.
1720
368
      *
1721
369
      * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1722
370
      * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1723
371
      * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
1724
372
      * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
1725
373
      * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
1726
374
      * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
1727
375
      * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
1728
376
      * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
1729
377
      * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
1730
378
      * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
1731
379
      * POSSIBILITY OF SUCH DAMAGE.
1732
380
    
1733
381
----------------------------------------------------
1734
382
1735
383
modules/functx/functx.xq
1736
384
1737
385
Copyright: 2007 Datypic
1738
386
1739
387
1740
388
      : This library is free software; you can redistribute it and/or
1741
389
      : modify it under the terms of the GNU Lesser General Public
1742
390
      : License as published by the Free Software Foundation; either
1743
391
      : version 2.1 of the License.
1744
392
1745
393
      : This library is distributed in the hope that it will be useful,
1746
394
      : but WITHOUT ANY WARRANTY; without even the implied warranty of
1747
395
      : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
1748
396
      : Lesser General Public License for more details.
1749
397
1750
398
      : You should have received a copy of the GNU Lesser General Public
1751
399
      : License along with this library; if not, write to the Free Software
1752
400
      : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
1753
401
    
1754
402
----------------------------------------------------
1755
403
1756
404
src/compiler/parser/FlexLexer.h
1757
405
1758
406
Copyright: 1993 The Regents of the University of California
1759
407
1760
408
1761
409
      // All rights reserved.
1762
410
      //
1763
411
      // This code is derived from software contributed to Berkeley by
1764
412
      // Kent Williams and Tom Epperly.
1765
413
      //
1766
414
      //  Redistribution and use in source and binary forms, with or without
1767
415
      //  modification, are permitted provided that the following conditions
1768
416
      //  are met:
1769
417
1770
418
      //  1. Redistributions of source code must retain the above copyright
1771
419
      //  notice, this list of conditions and the following disclaimer.
1772
420
      //  2. Redistributions in binary form must reproduce the above copyright
1773
421
      //  notice, this list of conditions and the following disclaimer in the
1774
422
      //  documentation and/or other materials provided with the distribution.
1775
423
1776
424
      //  Neither the name of the University nor the names of its contributors
1777
425
      //  may be used to endorse or promote products derived from this software
1778
426
      //  without specific prior written permission.
1779
427
1780
428
      //  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
1781
429
      //  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
1782
430
      //  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1783
431
      //  PURPOSE.
1784
432
    
1785
433
----------------------------------------------------
1786
434
1787
435
src/diagnostics/StackWalker.cpp
1788
436
src/diagnostics/StackWalker.h
1789
437
1790
438
Copyright: 2005 Jochen Kalmbach 
1791
439
1792
440
1793
441
      Under BSD License: http://www.opensource.org/licenses/bsd-license.php
1794
442
    
1795
443
----------------------------------------------------
1796
444
1797
445
src/util/singleton.h
1798
446
src/util/threads.h
1799
447
1800
448
Copyright: 2001 Andrei Alexandrescu
1801
449
1802
450
1803
451
      This code accompanies the book:
1804
452
      Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design
1805
453
          Patterns Applied". Copyright (c) 2001. Addison-Wesley.
1806
454
      Permission to use, copy, modify, distribute and sell this software for any
1807
455
          purpose is hereby granted without fee, provided that the above copyright
1808
456
          notice appear in all copies and that both that copyright notice and this
1809
457
          permission notice appear in supporting documentation.
1810
458
      The author or Addison-Wesley Longman make no representations about the
1811
459
          suitability of this software for any purpose. It is provided "as is"
1812
460
          without express or implied warranty.
1813
461
    
1814
462
1815
463
External libraries used by this project:
1816
464
----------------------------------------------------
1817
465
1818
466
Name: LIBXML2
1819
467
Preferred version: 2.2.16 or higher
1820
468
Is mandatory: true
1821
469
Website: http://xmlsoft.org/
1822
470
License: MIT
1823
471
Copyright: 1998-2002 Daniel Veillard.  All Rights Reserved.
1824
472
External notice: 
1825
473
1826
474
      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
1827
475
1828
476
      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
1829
477
1830
478
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1831
479
1832
480
      Except as contained in this notice, the name of Daniel Veillard shall not
1833
481
      be used in advertising or otherwise to promote the sale, use or other deal-
1834
482
      ings in this Software without prior written authorization from him.
1835
483
    
1836
484
----------------------------------------------------
1837
485
1838
486
Name: LIBXSLT
1839
487
Preferred version: 1.1.26
1840
488
Is mandatory: false
1841
489
Website: http://xmlsoft.org/XSLT/
1842
490
License: MIT
1843
491
Copyright: 2001-2002 Daniel Veillard.  All Rights Reserved.
1844
492
External notice: 
1845
493
1846
494
      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
1847
495
1848
496
      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
1849
497
1850
498
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1851
499
1852
500
1853
501
      Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from him.
1854
502
1855
503
    
1856
504
----------------------------------------------------
1857
505
1858
506
Name: ICU4C
1859
507
Preferred version: 3.6 or higher
1860
508
Is mandatory: true
1861
509
Website: http://www.icu-project.org/
1862
510
License: ICU License
1863
511
Copyright: 1995-2011 International Business Machines Corporation and others 
1864
512
External notice: 
1865
513
1866
514
      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
1867
515
1868
516
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1869
517
1870
518
      Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
1871
519
    
1872
520
----------------------------------------------------
1873
521
1874
522
Name: CURL
1875
523
Preferred version: above 7.12
1876
524
Is mandatory: false
1877
525
Website: http://curl.haxx.se/
1878
526
License: MIT/X derivate license
1879
527
Copyright: 1996 - 2011, Daniel Stenberg, <daniel@haxx.se>.
1880
528
External notice: 
1881
529
1882
530
      All rights reserved.
1883
531
1884
532
      Permission to use, copy, modify, and distribute this software for any purpose
1885
533
      with or without fee is hereby granted, provided that the above copyright
1886
534
      notice and this permission notice appear in all copies.
1887
535
1888
536
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1889
537
      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1890
538
      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
1891
539
      NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
1892
540
      DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
1893
541
      OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
1894
542
      OR OTHER DEALINGS IN THE SOFTWARE.
1895
543
1896
544
      Except as contained in this notice, the name of a copyright holder shall not
1897
545
      be used in advertising or otherwise to promote the sale, use or other dealings
1898
546
      in this Software without prior written authorization of the copyright holder.
1899
547
    
1900
548
----------------------------------------------------
1901
549
1902
550
Name: ICONV
1903
551
Preferred version: above 1.12
1904
552
Is mandatory: true
1905
553
Website: http://www.gnu.org/software/libiconv/
1906
554
License: LGPL
1907
555
Copyright: 1998, 2010 Free Software Foundation, Inc.
1908
556
External notice: 
1909
557
1910
558
----------------------------------------------------
1911
559
1912
560
Name: ZLIB
1913
561
Preferred version: 1.2.5
1914
562
Is mandatory: true
1915
563
Website: http://www.zlib.net/
1916
564
Copyright: 1995-2004 Jean-loup Gailly and Mark Adler
1917
565
External notice: 
1918
566
1919
567
      This software is provided 'as-is', without any express or implied
1920
568
      warranty.  In no event will the authors be held liable for any damages
1921
569
      arising from the use of this software.
1922
570
1923
571
      Permission is granted to anyone to use this software for any purpose,
1924
572
      including commercial applications, and to alter it and redistribute it
1925
573
      freely, subject to the following restrictions:
1926
574
1927
575
      1. The origin of this software must not be misrepresented; you must not
1928
576
      claim that you wrote the original software. If you use this software
1929
577
      in a product, an acknowledgment in the product documentation would be
1930
578
      appreciated but is not required.
1931
579
      2. Altered source versions must be plainly marked as such, and must not be
1932
580
      misrepresented as being the original software.
1933
581
      3. This notice may not be removed or altered from any source distribution.
1934
582
1935
583
      Jean-loup Gailly jloup@gzip.org
1936
584
      Mark Adler madler@alumni.caltech.edu
1937
585
    
1938
586
----------------------------------------------------
1939
587
1940
588
Name: XERCES
1941
589
Preferred version: 2.8.0 or higher
1942
590
Is mandatory: true
1943
591
Website: http://xerces.apache.org/xerces-c/
1944
592
License: Apache 2
1945
593
Copyright: Copyright © 1999-2010 The Apache Software Foundation. All Rights Reserved.
1946
594
External notice: 
1947
595
1948
596
      http://www.apache.org/licenses/LICENSE-2.0
1949
597
    
1950
598
----------------------------------------------------
1951
599
1952
600
Name: BOOST (boost_filesystem)
1953
601
Preferred version: 1.32 or higher
1954
602
Is mandatory: false
1955
603
Website: http://www.boost.org/
1956
604
License: Boost Software License v1.0
1957
605
Copyright: 
1958
606
      Beman Dawes, David Abrahams, 1998-2005.
1959
607
      Rene Rivera 2004-2007
1960
608
    
1961
609
External notice: 
1962
610
1963
611
      Permission is hereby granted, free of charge, to any person or organization
1964
612
      obtaining a copy of the software and accompanying documentation covered by
1965
613
      this license (the "Software") to use, reproduce, display, distribute,
1966
614
      execute, and transmit the Software, and to prepare derivative works of the
1967
615
      Software, and to permit third-parties to whom the Software is furnished to
1968
616
      do so, all subject to the following:
1969
617
1970
618
      The copyright notices in the Software and this entire statement, including
1971
619
      the above license grant, this restriction and the following disclaimer,
1972
620
      must be included in all copies of the Software, in whole or in part, and
1973
621
      all derivative works of the Software, unless such copies or derivative
1974
622
      works are solely in the form of machine-executable object code generated by
1975
623
      a source language processor.
1976
624
1977
625
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1978
626
      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1979
627
      FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
1980
628
      SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
1981
629
      FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
1982
630
      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
1983
631
      DEALINGS IN THE SOFTWARE.
1984
632
    
1985
633
1986
634
External applications used by this project:
1987
635
----------------------------------------------------
1988
636
1989
637
Name: FLEX
1990
638
Preferred version: 2.5.33
1991
639
Is mandatory: false
1992
640
Website: http://flex.sourceforge.net/
1993
641
Copyright: 
1994
642
      2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The Flex Project.
1995
643
      1990, 1997 The Regents of the University of California. All rights reserved.
1996
644
    
1997
645
External notice: 
1998
646
1999
647
      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
2000
648
2001
649
      1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2002
650
      2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
2003
651
      
2004
652
      Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
2005
653
2006
654
      THIS SOFTWARE IS PROVIDED “AS IS” AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
2007
655
    
2008
656
----------------------------------------------------
2009
657
2010
658
Name: BISON
2011
659
Preferred version: 2.4 or higher
2012
660
Is mandatory: false
2013
661
Website: http://www.gnu.org/software/bison/
2014
662
License: GPL
2015
663
Copyright: 1998, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2016
664
External notice: 
2017
665
2018
666
----------------------------------------------------
2019
667
2020
668
Name: DOXYGEN
2021
669
Preferred version: v1.7.4 
2022
670
Is mandatory: false
2023
671
Website: www.doxygen.org
2024
672
License: GPL
2025
673
Copyright: 1997-2011 by Dimitri van Heesch
2026
674
External notice: 
2027
675
2028
676
      Permission to use, copy, modify, and distribute this software and its documentation under the terms of the GNU General Public License is hereby granted.
2029
677
      No representations are made about the suitability of this software for any purpose. 
2030
678
      It is provided "as is" without express or implied warranty. 
2031
679
      See the GNU General Public License for more details.
2032
680
2033
681
      Documents produced by doxygen are derivative works derived from the input used in their production; they are not affected by this license.
2034
682
    
2035
683
----------------------------------------------------
2036
684
2037
685
Name: CMAKE
2038
686
Preferred version: 2.8.4
2039
687
Is mandatory: true
2040
688
Website: http://www.cmake.org/
2041
689
License: Creative Commons Attribution-NoDerivs 3.0 Unported License
2042
690
Copyright: 2000-2009 Kitware, Inc., Insight Software Consortium. All rights reserved.
2043
691
External notice: 
2044
692
2045
693
      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
2046
694
2047
695
      Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2048
696
2049
697
      Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
2050
698
2051
699
      Neither the names of Kitware, Inc., the Insight Software Consortium, nor the names of their contributors may be used to endorse or promote products derived from this software without specific prior written permission.
2052
700
2053
701
      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2054
702
    
2055
703
----------------------------------------------------
2056
704
2057
705
Name: SWIG
2058
706
Preferred version: 2.0.4 or above
2059
707
Is mandatory: false
2060
708
Website: http://www.swig.org/
2061
709
License: GPL
2062
710
Copyright: 
2063
711
      1995-2011 The SWIG Developers
2064
712
      2005-2006 Arizona Board of Regents (University of Arizona).
2065
713
      1998-2005 University of Chicago.
2066
714
      1995-1998 The University of Utah and the Regents of the University of California
2067
715
    
2068
716
External notice: 
2069
717
2070
718
      SWIG is free software: you can redistribute it and/or modify it
2071
719
      under the terms of the GNU General Public License as published by
2072
720
      the Free Software Foundation, either version 3 of the License, or
2073
721
      (at your option) any later version. See the LICENSE-GPL file for
2074
722
      the full terms of the GNU General Public license version 3.
2075
723
2076
724
      Portions of SWIG are also licensed under the terms of the licenses
2077
725
      in the file LICENSE-UNIVERSITIES. You must observe the terms of
2078
726
      these licenses, as well as the terms of the GNU General Public License,
2079
727
      when you distribute SWIG.
2080
728
2081
729
      The SWIG library and examples, under the Lib and Examples top level
2082
730
      directories, are distributed under the following terms:
2083
731
2084
732
      You may copy, modify, distribute, and make derivative works based on
2085
733
      this software, in source code or object code form, without
2086
734
      restriction. If you distribute the software to others, you may do
2087
735
      so according to the terms of your choice. This software is offered as
2088
736
      is, without warranty of any kind.
2089
737
2090
738
      See the COPYRIGHT file for a list of contributors to SWIG and their
2091
739
      copyright notices.
2092
740
    
2093
0
\ No newline at end of file
741
\ No newline at end of file
2094
1
742
2095
=== removed file 'NOTICE.txt'
2096
--- NOTICE.txt	2011-04-26 08:59:08 +0000
2097
+++ NOTICE.txt	1970-01-01 00:00:00 +0000
2098
@@ -1,145 +0,0 @@
2099
1
Zorba XQuery Processor
2100
2
Copyright 2006-2008 The FLWOR Foundation
2101
3
2102
4
   See LICENSE.txt for license information.
2103
5
2104
6
   This product includes software developed at
2105
7
   The FLWOR Foundation (http://www.flworfound.org/).
2106
8
2107
9
   Portions of this software were developed at the Systems
2108
10
   Group of the ETH Zurich, Switzerland.
2109
11
2110
12
The file src/zorbatypes/m_apm.h and the directory src/zorbatypes/mapm/
2111
13
are copyright 1999-2007 Michael C. Ring. The original distribution
2112
14
contains the following notice:
2113
15
2114
16
   This software is Freeware.                                              
2115
17
                                                                           
2116
18
   Permission to use, copy, and distribute this software and its           
2117
19
   documentation for any purpose with or without fee is hereby granted,    
2118
20
   provided that the above copyright notice appear in all copies and       
2119
21
   that both that copyright notice and this permission notice appear       
2120
22
   in supporting documentation.                                            
2121
23
                                                                           
2122
24
   Permission to modify the software is granted. Permission to distribute  
2123
25
   the modified code is granted. Modifications are to be distributed by    
2124
26
   using the file 'license.txt' as a template to modify the file header.   
2125
27
   'license.txt' is available in the official MAPM distribution.           
2126
28
                                                                           
2127
29
   To distribute modified source code, insert the file 'license.txt'       
2128
30
   at the top of all modified source code files and edit accordingly.      
2129
31
                                                                           
2130
32
   This software is provided "as is" without express or implied warranty.  
2131
33
2132
34
2133
35
The file src/common/config/stdint.h is copyright 2006 Alexander Chemeris and
2134
36
contains the following notice:
2135
37
2136
38
   Redistribution and use in source and binary forms, with or without
2137
39
   modification, are permitted provided that the following conditions are met:
2138
40
   
2139
41
     1. Redistributions of source code must retain the above copyright notice,
2140
42
        this list of conditions and the following disclaimer.
2141
43
   
2142
44
     2. Redistributions in binary form must reproduce the above copyright
2143
45
        notice, this list of conditions and the following disclaimer in the
2144
46
        documentation and/or other materials provided with the distribution.
2145
47
   
2146
48
     3. The name of the author may be used to endorse or promote products
2147
49
        derived from this software without specific prior written permission.
2148
50
   
2149
51
   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
2150
52
   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
2151
53
   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
2152
54
   EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
2153
55
   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
2154
56
   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
2155
57
   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
2156
58
   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
2157
59
   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
2158
60
   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2159
61
2160
62
2161
63
The files in src/runtime/full_text/stemmer is copyright 2001 Dr. Martin Porter
2162
64
and contains the following notice:
2163
65
2164
66
   All the software given out on this Snowball site is covered by the BSD
2165
67
   License (see http://www.opensource.org/licenses/bsd-license.html), with
2166
68
   Copyright (c) 2001, Dr Martin Porter, and (for the Java developments)
2167
69
   Copyright (c) 2002, Richard Boulton.
2168
70
2169
71
   Essentially, all this means is that you can do what you like with the code,
2170
72
   except claim another Copyright for it, or claim that it is issued under a
2171
73
   different license. The software is also issued without warranties, which
2172
74
   means that if anyone suffers through its use, they cannot come back and sue
2173
75
   you. You also have to alert anyone to whom you give the Snowball software to
2174
76
   the fact that it is covered by the BSD license.
2175
77
2176
78
   We have not bothered to insert the licensing arrangement into the text of
2177
79
   the Snowball software.
2178
80
2179
81
2180
82
The file src/util/less.h is copyright 1998 Paul J. Lucas and contains the
2181
83
following notice:
2182
84
2183
85
   Redistribution and use in source and binary forms, with or without
2184
86
   modification, are permitted provided that the following conditions are met:
2185
87
   
2186
88
    o  Redistributions of source code must retain the above copyright notice,
2187
89
       this list of conditions and the following disclaimer.
2188
90
  
2189
91
    o  Redistributions in binary form must reproduce the above copyright
2190
92
       notice, this list of conditions and the following disclaimer in the
2191
93
       documentation and/or other materials provided with the distribution.
2192
94
  
2193
95
    o  The name of the author may not be used to endorse or promote products
2194
96
       derived from this software without specific prior written permission.
2195
97
  
2196
98
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2197
99
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2198
100
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
2199
101
   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
2200
102
   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
2201
103
   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
2202
104
   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
2203
105
   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
2204
106
   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
2205
107
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2206
108
   POSSIBILITY OF SUCH DAMAGE.
2207
109
2208
110
2209
111
The file src/util/auto_vector.h is slightly modified from code
2210
112
originally copyright 2003 Reliable Software which contains the
2211
113
following notice:
2212
114
2213
115
   Any use, commercial or noncommercial of this code
2214
116
   is hereby granted, under the condition
2215
117
   that this copyright notice be not removed.
2216
118
2217
119
2218
120
Furthermore, this software depends / makes use of:
2219
121
2220
122
     * LIBXML2 2.2.16 or higher (http://xmlsoft.org/ ) 
2221
123
2222
124
     * ICU4C 3.6 or higher (http://www.icu-project.org/)
2223
125
2224
126
     * BOOST 1.32 or higher (http://www.boost.org/)
2225
127
       * boost_program_options
2226
128
       * boost_date_time
2227
129
       * boost_filesystem
2228
130
2229
131
     * XERCES 2.7.0 or higher (http://xerces.apache.org/xerces-c/)
2230
132
2231
133
     * ICONV 1.12 (used by LIBXML2; http://www.gnu.org/software/libiconv/)
2232
134
2233
135
     * MAPM 4.9.5 (by Michael C. Ring; http://www.tc.umn.edu/~ringx004/mapm-main.html)
2234
136
2235
137
     * Loki C++ Library (see http://loki-lib.sourceforge.net/index.php?n=Main.HomePage)
2236
138
2237
139
Optional:
2238
140
2239
141
     * FLEX 2.5.33 (http://flex.sourceforge.net/)
2240
142
2241
143
     * BISON 2.4 or higher (http://www.gnu.org/software/bison/)
2242
144
2243
145
     * CURL 7.12 (http://curl.haxx.se/)
2244
146
0
2245
=== added file 'NOTICE.xml'
2246
--- NOTICE.xml	1970-01-01 00:00:00 +0000
2247
+++ NOTICE.xml	2013-01-25 00:15:35 +0000
2248
@@ -0,0 +1,686 @@
2249
1
<?xml version="1.0" encoding="utf-8"?>
2250
2
<notice xmlns="http://www.zorba-xquery.com/notice">
2251
3
  <master-license>
2252
4
    <license>Apache 2</license>
2253
5
    <text>
2254
6
      Copyright 2006-2011 The FLWOR Foundation
2255
7
2256
8
      See LICENSE.txt for license information.
2257
9
2258
10
      ------------------------
2259
11
      This product includes software developed at
2260
12
      The FLWOR Foundation (http://www.flworfound.org/).
2261
13
2262
14
      ------------------------
2263
15
      Portions of this software were developed at the Systems
2264
16
      Group of the ETH Zurich, Switzerland.
2265
17
    </text>
2266
18
  </master-license>
2267
19
  <foreign-files>
2268
20
    <file>src/zorbatypes/m_apm.h</file>
2269
21
    <file>src/zorbatypes/mapm/</file>
2270
22
    <copyright>1999-2007 Michael C. Ring</copyright>
2271
23
    <website>http://www.tc.umn.edu/~ringx004/mapm-main.html</website>
2272
24
    <foreign-notice>
2273
25
      This software is Freeware.
2274
26
2275
27
      Permission to use, copy, and distribute this software and its
2276
28
      documentation for any purpose with or without fee is hereby granted,
2277
29
      provided that the above copyright notice appear in all copies and
2278
30
      that both that copyright notice and this permission notice appear
2279
31
      in supporting documentation.
2280
32
2281
33
      Permission to modify the software is granted. Permission to distribute
2282
34
      the modified code is granted. Modifications are to be distributed by
2283
35
      using the file 'license.txt' as a template to modify the file header.
2284
36
      'license.txt' is available in the official MAPM distribution.
2285
37
2286
38
      To distribute modified source code, insert the file 'license.txt'
2287
39
      at the top of all modified source code files and edit accordingly.
2288
40
2289
41
      This software is provided "as is" without express or implied warranty.
2290
42
    </foreign-notice>
2291
43
  </foreign-files>
2292
44
  <foreign-files>
2293
45
    <file>src/zorbamisc/config/stdint.h</file>
2294
46
    <copyright>2006 Alexander Chemeris</copyright>
2295
47
    <foreign-notice>
2296
48
      Redistribution and use in source and binary forms, with or without
2297
49
      modification, are permitted provided that the following conditions are met:
2298
50
2299
51
      1. Redistributions of source code must retain the above copyright notice,
2300
52
      this list of conditions and the following disclaimer.
2301
53
2302
54
      2. Redistributions in binary form must reproduce the above copyright
2303
55
      notice, this list of conditions and the following disclaimer in the
2304
56
      documentation and/or other materials provided with the distribution.
2305
57
2306
58
      3. The name of the author may be used to endorse or promote products
2307
59
      derived from this software without specific prior written permission.
2308
60
2309
61
      THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
2310
62
      WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
2311
63
      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
2312
64
      EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
2313
65
      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
2314
66
      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
2315
67
      OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
2316
68
      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
2317
69
      OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
2318
70
      ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2319
71
    </foreign-notice>
2320
72
  </foreign-files>
2321
73
  <foreign-files>
2322
74
    <file>src/zorbautils/stemmer/</file>
2323
75
    <copyright>2001 Dr. Martin Porter</copyright>
2324
76
    <foreign-notice>
2325
77
      All the software given out on this Snowball site is covered by the BSD
2326
78
      License (see http://www.opensource.org/licenses/bsd-license.html), with
2327
79
      Copyright (c) 2001, Dr Martin Porter, and (for the Java developments)
2328
80
      Copyright (c) 2002, Richard Boulton.
2329
81
2330
82
      Essentially, all this means is that you can do what you like with the code,
2331
83
      except claim another Copyright for it, or claim that it is issued under a
2332
84
      different license. The software is also issued without warranties, which
2333
85
      means that if anyone suffers through its use, they cannot come back and sue
2334
86
      you. You also have to alert anyone to whom you give the Snowball software to
2335
87
      the fact that it is covered by the BSD license.
2336
88
2337
89
      We have not bothered to insert the licensing arrangement into the text of
2338
90
      the Snowball software.
2339
91
    </foreign-notice>
2340
92
  </foreign-files>
2341
93
  <foreign-files>
2342
94
    <file>src/util/less.h</file>
2343
95
    <copyright>1998 Paul J. Lucas</copyright>
2344
96
    <foreign-notice>
2345
97
      Redistribution and use in source and binary forms, with or without
2346
98
      modification, are permitted provided that the following conditions are met:
2347
99
2348
100
      o  Redistributions of source code must retain the above copyright notice,
2349
101
      this list of conditions and the following disclaimer.
2350
102
2351
103
      o  Redistributions in binary form must reproduce the above copyright
2352
104
      notice, this list of conditions and the following disclaimer in the
2353
105
      documentation and/or other materials provided with the distribution.
2354
106
2355
107
      o  The name of the author may not be used to endorse or promote products
2356
108
      derived from this software without specific prior written permission.
2357
109
2358
110
      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2359
111
      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2360
112
      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
2361
113
      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
2362
114
      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
2363
115
      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
2364
116
      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
2365
117
      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
2366
118
      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
2367
119
      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2368
120
      POSSIBILITY OF SUCH DAMAGE.
2369
121
    </foreign-notice>
2370
122
  </foreign-files>
2371
123
  <foreign-files>
2372
124
    <file is-modified="true">src/util/auto_vector.h</file>
2373
125
    <copyright>2003 Reliable Software</copyright>
2374
126
    <foreign-notice>
2375
127
      Redistribution and use in source and binary forms, with or without
2376
128
      modification, are permitted provided that the following conditions are met:
2377
129
2378
130
      o  Redistributions of source code must retain the above copyright notice,
2379
131
      this list of conditions and the following disclaimer.
2380
132
2381
133
      o  Redistributions in binary form must reproduce the above copyright
2382
134
      notice, this list of conditions and the following disclaimer in the
2383
135
      documentation and/or other materials provided with the distribution.
2384
136
2385
137
      o  The name of the author may not be used to endorse or promote products
2386
138
      derived from this software without specific prior written permission.
2387
139
2388
140
      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2389
141
      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2390
142
      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
2391
143
      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
2392
144
      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
2393
145
      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
2394
146
      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
2395
147
      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
2396
148
      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
2397
149
      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2398
150
      POSSIBILITY OF SUCH DAMAGE.
2399
151
    </foreign-notice>
2400
152
  </foreign-files>
2401
153
  <foreign-files>
2402
154
    <file>cmake_modules/FindBoost.cmake</file>
2403
155
    <copyright>
2404
156
      2006-2008 Andreas Schneider &lt;mail@cynapses.org&gt;
2405
157
      2007      Wengo
2406
158
      2007      Mike Jackson
2407
159
      2008      Andreas Pakulat &lt;apaku@gmx.de&gt;
2408
160
    </copyright>
2409
161
    <foreign-notice>
2410
162
      Redistribution AND use is allowed according to the terms of the New BSD license.
2411
163
      For details see the accompanying COPYING-CMAKE-SCRIPTS file.
2412
164
    </foreign-notice>
2413
165
  </foreign-files>
2414
166
  <foreign-files>
2415
167
    <file>cmake_modules/FindJNI.cmake</file>
2416
168
    <file>cmake_modules/FindPythonLibs.cmake</file>
2417
169
    <file>cmake_modules/FindSWIG.cmake</file>
2418
170
    <copyright>2001-2009 Kitware, Inc.</copyright>
2419
171
    <foreign-notice>
2420
172
      Distributed under the OSI-approved BSD License (the "License");
2421
173
      see accompanying file Copyright.txt for details.
2422
174
2423
175
      This software is distributed WITHOUT ANY WARRANTY; without even the
2424
176
      implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
2425
177
      See the License for more information.
2426
178
2427
179
      CMake - Cross Platform Makefile Generator
2428
180
      Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
2429
181
      All rights reserved.
2430
182
2431
183
      Redistribution and use in source and binary forms, with or without
2432
184
      modification, are permitted provided that the following conditions
2433
185
      are met:
2434
186
2435
187
      * Redistributions of source code must retain the above copyright
2436
188
      notice, this list of conditions and the following disclaimer.
2437
189
2438
190
      * Redistributions in binary form must reproduce the above copyright
2439
191
      notice, this list of conditions and the following disclaimer in the
2440
192
      documentation and/or other materials provided with the distribution.
2441
193
2442
194
      * Neither the names of Kitware, Inc., the Insight Software Consortium,
2443
195
      nor the names of their contributors may be used to endorse or promote
2444
196
      products derived from this software without specific prior written
2445
197
      permission.
2446
198
2447
199
      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
2448
200
      "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
2449
201
      LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
2450
202
      A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
2451
203
      HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
2452
204
      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
2453
205
      LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
2454
206
      DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
2455
207
      THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2456
208
      (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2457
209
      OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2458
210
2459
211
      ------------------------------------------------------------------------------
2460
212
2461
213
      The above copyright and license notice applies to distributions of
2462
214
      CMake in source and binary form.  Some source files contain additional
2463
215
      notices of original copyright by their contributors; see each source
2464
216
      for details.  Third-party software packages supplied with CMake under
2465
217
      compatible licenses provide their own copyright notices documented in
2466
218
      corresponding subdirectories.
2467
219
2468
220
      ------------------------------------------------------------------------------
2469
221
2470
222
      CMake was initially developed by Kitware with the following sponsorship:
2471
223
2472
224
      * National Library of Medicine at the National Institutes of Health
2473
225
      as part of the Insight Segmentation and Registration Toolkit (ITK).
2474
226
2475
227
      * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
2476
228
      Visualization Initiative.
2477
229
2478
230
      * National Alliance for Medical Image Computing (NAMIC) is funded by the
2479
231
      National Institutes of Health through the NIH Roadmap for Medical Research,
2480
232
      Grant U54 EB005149.
2481
233
2482
234
      * Kitware, Inc.
2483
235
    </foreign-notice>
2484
236
  </foreign-files>
2485
237
  <foreign-files>
2486
238
    <file>/xml.xsd</file>
2487
239
    <copyright>2001 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)</copyright>
2488
240
    <foreign-notice>
2489
241
      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
2490
242
2491
243
      W3C Software Notice and License
2492
244
2493
245
      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
2494
246
2495
247
      License
2496
248
2497
249
      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
2498
250
2499
251
      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
2500
252
      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
2501
253
      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
2502
254
      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
2503
255
2504
256
      Disclaimers
2505
257
2506
258
      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
2507
259
2508
260
      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
2509
261
2510
262
      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
2511
263
    </foreign-notice>
2512
264
  </foreign-files>
2513
265
  <foreign-files>
2514
266
    <file>schemas/xslt-xquery-serialization.xsd</file>
2515
267
    <copyright>2010 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)</copyright>
2516
268
    <foreign-notice>
2517
269
      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
2518
270
2519
271
      W3C Software Notice and License
2520
272
2521
273
      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
2522
274
2523
275
      License
2524
276
2525
277
      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
2526
278
2527
279
      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
2528
280
      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
2529
281
      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
2530
282
      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
2531
283
2532
284
      Disclaimers
2533
285
2534
286
      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
2535
287
2536
288
      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
2537
289
2538
290
      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
2539
291
    </foreign-notice>
2540
292
  </foreign-files>
2541
293
  <foreign-files>
2542
294
    <file>modules/w3c/xpath-functions.xsd</file>
2543
295
    <copyright>2005 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)</copyright>
2544
296
    <foreign-notice>
2545
297
      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
2546
298
2547
299
      W3C Software Notice and License
2548
300
2549
301
      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
2550
302
2551
303
      License
2552
304
2553
305
      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
2554
306
2555
307
      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
2556
308
      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
2557
309
      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
2558
310
      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
2559
311
2560
312
      Disclaimers
2561
313
2562
314
      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
2563
315
2564
316
      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
2565
317
2566
318
      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
2567
319
    </foreign-notice>
2568
320
  </foreign-files>
2569
321
  <foreign-files>
2570
322
    <file>include/xqc.h</file>
2571
323
    <copyright>2008, Matthias Brantner, John Snelson</copyright>
2572
324
    <foreign-notice>
2573
325
      * All rights reserved.
2574
326
      *
2575
327
      * Redistribution and use in source and binary forms, with or without
2576
328
      * modification, are permitted provided that the following conditions are met:
2577
329
      *
2578
330
      *     * Redistributions of source code must retain the above copyright notice,
2579
331
      *       this list of conditions and the following disclaimer.
2580
332
      *     * Redistributions in binary form must reproduce the above copyright
2581
333
      *       notice, this list of conditions and the following disclaimer in the
2582
334
      *       documentation and/or other materials provided with the distribution.
2583
335
      *     * Neither the name of the developers nor the names of contributors may be
2584
336
      *       used to endorse or promote products derived from this software without
2585
337
      *       specific prior written permission.
2586
338
      *
2587
339
      * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2588
340
      * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2589
341
      * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
2590
342
      * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
2591
343
      * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
2592
344
      * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
2593
345
      * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
2594
346
      * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
2595
347
      * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
2596
348
      * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2597
349
      * POSSIBILITY OF SUCH DAMAGE.
2598
350
    </foreign-notice>
2599
351
  </foreign-files>
2600
352
  <foreign-files>
2601
353
    <file>modules/functx/functx.xq</file>
2602
354
    <copyright>2007 Datypic</copyright>
2603
355
    <foreign-notice>
2604
356
      : This library is free software; you can redistribute it and/or
2605
357
      : modify it under the terms of the GNU Lesser General Public
2606
358
      : License as published by the Free Software Foundation; either
2607
359
      : version 2.1 of the License.
2608
360
2609
361
      : This library is distributed in the hope that it will be useful,
2610
362
      : but WITHOUT ANY WARRANTY; without even the implied warranty of
2611
363
      : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
2612
364
      : Lesser General Public License for more details.
2613
365
2614
366
      : You should have received a copy of the GNU Lesser General Public
2615
367
      : License along with this library; if not, write to the Free Software
2616
368
      : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
2617
369
    </foreign-notice>
2618
370
  </foreign-files>
2619
371
  <foreign-files>
2620
372
    <file>src/compiler/parser/FlexLexer.h</file>
2621
373
    <copyright>1993 The Regents of the University of California</copyright>
2622
374
    <foreign-notice>
2623
375
      // All rights reserved.
2624
376
      //
2625
377
      // This code is derived from software contributed to Berkeley by
2626
378
      // Kent Williams and Tom Epperly.
2627
379
      //
2628
380
      //  Redistribution and use in source and binary forms, with or without
2629
381
      //  modification, are permitted provided that the following conditions
2630
382
      //  are met:
2631
383
2632
384
      //  1. Redistributions of source code must retain the above copyright
2633
385
      //  notice, this list of conditions and the following disclaimer.
2634
386
      //  2. Redistributions in binary form must reproduce the above copyright
2635
387
      //  notice, this list of conditions and the following disclaimer in the
2636
388
      //  documentation and/or other materials provided with the distribution.
2637
389
2638
390
      //  Neither the name of the University nor the names of its contributors
2639
391
      //  may be used to endorse or promote products derived from this software
2640
392
      //  without specific prior written permission.
2641
393
2642
394
      //  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
2643
395
      //  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
2644
396
      //  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
2645
397
      //  PURPOSE.
2646
398
    </foreign-notice>
2647
399
  </foreign-files>
2648
400
  <foreign-files>
2649
401
    <file>src/diagnostics/StackWalker.cpp</file>
2650
402
    <file>src/diagnostics/StackWalker.h</file>
2651
403
    <copyright>2005 Jochen Kalmbach </copyright>
2652
404
    <license>BSD</license>
2653
405
    <foreign-notice>
2654
406
      Under BSD License: http://www.opensource.org/licenses/bsd-license.php
2655
407
    </foreign-notice>
2656
408
  </foreign-files>
2657
409
  <foreign-files>
2658
410
    <file>src/util/singleton.h</file>
2659
411
    <file>src/util/threads.h</file>
2660
412
    <copyright>2001 Andrei Alexandrescu</copyright>
2661
413
    <foreign-notice>
2662
414
      This code accompanies the book:
2663
415
      Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design
2664
416
          Patterns Applied". Copyright (c) 2001. Addison-Wesley.
2665
417
      Permission to use, copy, modify, distribute and sell this software for any
2666
418
          purpose is hereby granted without fee, provided that the above copyright
2667
419
          notice appear in all copies and that both that copyright notice and this
2668
420
          permission notice appear in supporting documentation.
2669
421
      The author or Addison-Wesley Longman make no representations about the
2670
422
          suitability of this software for any purpose. It is provided "as is"
2671
423
          without express or implied warranty.
2672
424
    </foreign-notice>
2673
425
  </foreign-files>
2674
426
2675
427
  <external-lib mandatory="true">
2676
428
    <name>LIBXML2</name>
2677
429
    <version>2.2.16 or higher</version>
2678
430
    <website>http://xmlsoft.org/</website>
2679
431
    <license>MIT</license>
2680
432
    <copyright>1998-2002 Daniel Veillard.  All Rights Reserved.</copyright>
2681
433
    <foreign-notice>
2682
434
      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
2683
435
2684
436
      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
2685
437
2686
438
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2687
439
2688
440
      Except as contained in this notice, the name of Daniel Veillard shall not
2689
441
      be used in advertising or otherwise to promote the sale, use or other deal-
2690
442
      ings in this Software without prior written authorization from him.
2691
443
    </foreign-notice>
2692
444
  </external-lib>
2693
445
2694
446
  <external-lib mandatory="false">
2695
447
    <name>LIBXSLT</name>
2696
448
    <version>1.1.26</version>
2697
449
    <website>http://xmlsoft.org/XSLT/</website>
2698
450
    <license>MIT</license>
2699
451
    <copyright>2001-2002 Daniel Veillard.  All Rights Reserved.</copyright>
2700
452
    <foreign-notice>
2701
453
      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
2702
454
2703
455
      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
2704
456
2705
457
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2706
458
2707
459
2708
460
      Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from him.
2709
461
2710
462
    </foreign-notice>
2711
463
  </external-lib>
2712
464
2713
465
  <external-lib mandatory="true">
2714
466
    <name>ICU4C</name>
2715
467
    <version>3.6 or higher</version>
2716
468
    <license>ICU License</license>
2717
469
    <website>http://www.icu-project.org/</website>
2718
470
    <copyright>1995-2011 International Business Machines Corporation and others </copyright>
2719
471
    <foreign-notice>
2720
472
      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
2721
473
2722
474
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2723
475
2724
476
      Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
2725
477
    </foreign-notice>
2726
478
  </external-lib>
2727
479
2728
480
  <external-lib mandatory="false">
2729
481
    <name>CURL</name>
2730
482
    <version>above 7.12</version>
2731
483
    <website>http://curl.haxx.se/</website>
2732
484
    <license>MIT/X derivate license</license>
2733
485
    <copyright>1996 - 2011, Daniel Stenberg, &lt;daniel@haxx.se&gt;.</copyright>
2734
486
    <foreign-notice>
2735
487
      All rights reserved.
2736
488
2737
489
      Permission to use, copy, modify, and distribute this software for any purpose
2738
490
      with or without fee is hereby granted, provided that the above copyright
2739
491
      notice and this permission notice appear in all copies.
2740
492
2741
493
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2742
494
      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2743
495
      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
2744
496
      NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
2745
497
      DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
2746
498
      OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
2747
499
      OR OTHER DEALINGS IN THE SOFTWARE.
2748
500
2749
501
      Except as contained in this notice, the name of a copyright holder shall not
2750
502
      be used in advertising or otherwise to promote the sale, use or other dealings
2751
503
      in this Software without prior written authorization of the copyright holder.
2752
504
    </foreign-notice>
2753
505
  </external-lib>
2754
506
2755
507
  <external-lib mandatory="true">
2756
508
    <name>ICONV</name>
2757
509
    <version>above 1.12</version>
2758
510
    <website>http://www.gnu.org/software/libiconv/</website>
2759
511
    <license>LGPL</license>
2760
512
    <copyright>1998, 2010 Free Software Foundation, Inc.</copyright>
2761
513
  </external-lib>
2762
514
2763
515
  <external-lib mandatory="true">
2764
516
    <name>ZLIB</name>
2765
517
    <version>1.2.5</version>
2766
518
    <website>http://www.zlib.net/</website>
2767
519
    <copyright>1995-2004 Jean-loup Gailly and Mark Adler</copyright>
2768
520
    <foreign-notice>
2769
521
      This software is provided 'as-is', without any express or implied
2770
522
      warranty.  In no event will the authors be held liable for any damages
2771
523
      arising from the use of this software.
2772
524
2773
525
      Permission is granted to anyone to use this software for any purpose,
2774
526
      including commercial applications, and to alter it and redistribute it
2775
527
      freely, subject to the following restrictions:
2776
528
2777
529
      1. The origin of this software must not be misrepresented; you must not
2778
530
      claim that you wrote the original software. If you use this software
2779
531
      in a product, an acknowledgment in the product documentation would be
2780
532
      appreciated but is not required.
2781
533
      2. Altered source versions must be plainly marked as such, and must not be
2782
534
      misrepresented as being the original software.
2783
535
      3. This notice may not be removed or altered from any source distribution.
2784
536
2785
537
      Jean-loup Gailly jloup@gzip.org
2786
538
      Mark Adler madler@alumni.caltech.edu
2787
539
    </foreign-notice>
2788
540
  </external-lib>
2789
541
2790
542
  <external-lib mandatory="true">
2791
543
    <name>XERCES</name>
2792
544
    <version>2.8.0 or higher</version>
2793
545
    <website>http://xerces.apache.org/xerces-c/</website>
2794
546
    <license>Apache 2</license>
2795
547
    <copyright>Copyright © 1999-2010 The Apache Software Foundation. All Rights Reserved.</copyright>
2796
548
    <foreign-notice>
2797
549
      http://www.apache.org/licenses/LICENSE-2.0
2798
550
    </foreign-notice>
2799
551
  </external-lib>
2800
552
2801
553
  <external-lib mandatory="false">
2802
554
    <name>BOOST (boost_filesystem)</name>
2803
555
    <version>1.32 or higher</version>
2804
556
    <website>http://www.boost.org/</website>
2805
557
    <license>Boost Software License v1.0</license>
2806
558
    <copyright>
2807
559
      Beman Dawes, David Abrahams, 1998-2005.
2808
560
      Rene Rivera 2004-2007
2809
561
    </copyright>
2810
562
    <foreign-notice>
2811
563
      Permission is hereby granted, free of charge, to any person or organization
2812
564
      obtaining a copy of the software and accompanying documentation covered by
2813
565
      this license (the "Software") to use, reproduce, display, distribute,
2814
566
      execute, and transmit the Software, and to prepare derivative works of the
2815
567
      Software, and to permit third-parties to whom the Software is furnished to
2816
568
      do so, all subject to the following:
2817
569
2818
570
      The copyright notices in the Software and this entire statement, including
2819
571
      the above license grant, this restriction and the following disclaimer,
2820
572
      must be included in all copies of the Software, in whole or in part, and
2821
573
      all derivative works of the Software, unless such copies or derivative
2822
574
      works are solely in the form of machine-executable object code generated by
2823
575
      a source language processor.
2824
576
2825
577
      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2826
578
      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2827
579
      FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
2828
580
      SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
2829
581
      FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
2830
582
      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2831
583
      DEALINGS IN THE SOFTWARE.
2832
584
    </foreign-notice>
2833
585
  </external-lib>
2834
586
2835
587
  <external-app mandatory="false">
2836
588
    <name>FLEX</name>
2837
589
    <version>2.5.33</version>
2838
590
    <website>http://flex.sourceforge.net/</website>
2839
591
    <copyright>
2840
592
      2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The Flex Project.
2841
593
      1990, 1997 The Regents of the University of California. All rights reserved.
2842
594
    </copyright>
2843
595
    <foreign-notice>
2844
596
      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
2845
597
2846
598
      1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2847
599
      2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
2848
600
      
2849
601
      Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
2850
602
2851
603
      THIS SOFTWARE IS PROVIDED “AS IS” AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
2852
604
    </foreign-notice>
2853
605
  </external-app>
2854
606
2855
607
  <external-app mandatory="false">
2856
608
    <name>BISON</name>
2857
609
    <version>2.4 or higher</version>
2858
610
    <website>http://www.gnu.org/software/bison/</website>
2859
611
    <license>GPL</license>
2860
612
    <copyright>1998, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.</copyright>
2861
613
  </external-app>
2862
614
2863
615
  <external-app mandatory="false">
2864
616
    <name>DOXYGEN</name>
2865
617
    <version>v1.7.4 </version>
2866
618
    <website>www.doxygen.org</website>
2867
619
    <license>GPL</license>
2868
620
    <copyright>1997-2011 by Dimitri van Heesch</copyright>
2869
621
    <foreign-notice>
2870
622
      Permission to use, copy, modify, and distribute this software and its documentation under the terms of the GNU General Public License is hereby granted.
2871
623
      No representations are made about the suitability of this software for any purpose. 
2872
624
      It is provided "as is" without express or implied warranty. 
2873
625
      See the GNU General Public License for more details.
2874
626
2875
627
      Documents produced by doxygen are derivative works derived from the input used in their production; they are not affected by this license.
2876
628
    </foreign-notice>
2877
629
  </external-app>
2878
630
2879
631
  <external-app mandatory="true">
2880
632
    <name>CMAKE</name>
2881
633
    <version>2.8.4</version>
2882
634
    <website>http://www.cmake.org/</website>
2883
635
    <license>Creative Commons Attribution-NoDerivs 3.0 Unported License</license>
2884
636
    <copyright>2000-2009 Kitware, Inc., Insight Software Consortium. All rights reserved.</copyright>
2885
637
    <foreign-notice>
2886
638
      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
2887
639
2888
640
      Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2889
641
2890
642
      Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
2891
643
2892
644
      Neither the names of Kitware, Inc., the Insight Software Consortium, nor the names of their contributors may be used to endorse or promote products derived from this software without specific prior written permission.
2893
645
2894
646
      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2895
647
    </foreign-notice>
2896
648
  </external-app>
2897
649
2898
650
  <external-app mandatory="false">
2899
651
    <name>SWIG</name>
2900
652
    <version>2.0.4 or above</version>
2901
653
    <website>http://www.swig.org/</website>
2902
654
    <license>GPL</license>
2903
655
    <copyright>
2904
656
      1995-2011 The SWIG Developers
2905
657
      2005-2006 Arizona Board of Regents (University of Arizona).
2906
658
      1998-2005 University of Chicago.
2907
659
      1995-1998 The University of Utah and the Regents of the University of California
2908
660
    </copyright>
2909
661
    <foreign-notice>
2910
662
      SWIG is free software: you can redistribute it and/or modify it
2911
663
      under the terms of the GNU General Public License as published by
2912
664
      the Free Software Foundation, either version 3 of the License, or
2913
665
      (at your option) any later version. See the LICENSE-GPL file for
2914
666
      the full terms of the GNU General Public license version 3.
2915
667
2916
668
      Portions of SWIG are also licensed under the terms of the licenses
2917
669
      in the file LICENSE-UNIVERSITIES. You must observe the terms of
2918
670
      these licenses, as well as the terms of the GNU General Public License,
2919
671
      when you distribute SWIG.
2920
672
2921
673
      The SWIG library and examples, under the Lib and Examples top level
2922
674
      directories, are distributed under the following terms:
2923
675
2924
676
      You may copy, modify, distribute, and make derivative works based on
2925
677
      this software, in source code or object code form, without
2926
678
      restriction. If you distribute the software to others, you may do
2927
679
      so according to the terms of your choice. This software is offered as
2928
680
      is, without warranty of any kind.
2929
681
2930
682
      See the COPYRIGHT file for a list of contributors to SWIG and their
2931
683
      copyright notices.
2932
684
    </foreign-notice>
2933
685
  </external-app>
2934
686
</notice>
2935
0
687
2936
=== modified file 'README.txt'
2937
--- README.txt	2010-11-24 20:36:42 +0000
2938
+++ README.txt	2013-01-25 00:15:35 +0000
2939
@@ -11,19 +11,19 @@
2940
11
  -------------
11
  -------------
2941
12
12
2942
13
  The documentation is included in the doc directory, as well as 
13
  The documentation is included in the doc directory, as well as 
2944
14
  on the website of the project at http://www.zorba-xquery.com/doc/zorba-latest/zorba/html/.
14
  on the website of the project at http://www.zorba-xquery.org/html/documentation
2945
15
15
2946
16
  Build & Installation
16
  Build & Installation
2947
17
  --------------------
17
  --------------------
2948
18
18
2950
19
  Please see the documentation on the web site or the doc directory
19
  Please see the documentation on the web site or in the doc directory
2951
20
  of the package.
20
  of the package.
2952
21
21
2953
22
  Bugs and errors
22
  Bugs and errors
2954
23
  ---------------
23
  ---------------
2955
24
24
2956
25
  Bug or error reports should be sent to
25
  Bug or error reports should be sent to
2958
26
  https://sourceforge.net/tracker/?group_id=226244&atid=1067586
26
  https://bugs.launchpad.net/zorba.
2959
27
27
2960
28
28
2961
29
  Licensing
29
  Licensing
2962
@@ -42,7 +42,7 @@
2963
42
42
2964
43
  o If you have a concrete bug report for Zorba please go to the
43
  o If you have a concrete bug report for Zorba please go to the
2965
44
  Zorba's Bug Database and submit your report:
44
  Zorba's Bug Database and submit your report:
2967
45
  https://sourceforge.net/tracker/?group_id=226244&atid=1067586
45
  https://bugs.launchpad.net/zorba.
2968
46
46
2969
47
  o If you want to participate in actively developing Zorba or
47
  o If you want to participate in actively developing Zorba or
2971
48
  support Zorba, please write a mail to: zorba@zorba-xquery.org
48
  support Zorba, please write a mail to: zorba-dev@googlegroups.com
2972
49
49
2973
=== modified file 'WIN32.cpack'
2974
--- WIN32.cpack	2011-06-24 17:59:32 +0000
2975
+++ WIN32.cpack	2013-01-25 00:15:35 +0000
2976
@@ -14,5 +14,3 @@
2977
14
#
14
#
2978
15
15
2979
16
INCLUDE(InstallRequiredSystemLibraries)
16
INCLUDE(InstallRequiredSystemLibraries)
2980
17
2981
18
INSTALL(PROGRAMS $ENV{ZORBA_REQUIRED_DLLS} DESTINATION bin)
2982
19
17
2983
=== modified file 'bin/CMakeLists.txt'
2984
--- bin/CMakeLists.txt	2011-07-01 16:07:54 +0000
2985
+++ bin/CMakeLists.txt	2013-01-25 00:15:35 +0000
2986
@@ -15,36 +15,42 @@
2987
15
INCLUDE_DIRECTORIES(AFTER ${CMAKE_SOURCE_DIR}/src/)
15
INCLUDE_DIRECTORIES(AFTER ${CMAKE_SOURCE_DIR}/src/)
2988
16
INCLUDE_DIRECTORIES(AFTER ${CMAKE_CURRENT_SOURCE_DIR})
16
INCLUDE_DIRECTORIES(AFTER ${CMAKE_CURRENT_SOURCE_DIR})
2989
17
17
3004
18
IF(ZORBA_WITH_DEBUGGER_CLIENT)
18
INCLUDE("${CMAKE_SOURCE_DIR}/cmake_modules/ZorbaGenerateExe.cmake")
3005
19
  CONFIGURE_FILE (debug_client/event_handler_init.cpp.in debug_client/event_handler_init.cpp)
19
3006
20
  
20
IF (ZORBA_WITH_DEBUGGER)
3007
21
  SET(DEBUG_CLIENT_SRCS
21
  IF (NOT WIN32)
3008
22
      debug_client/tuple.h
22
    FIND_PACKAGE (Libedit)
3009
23
      debug_client/main.cpp
23
    IF (LIBEDIT_FOUND)
3010
24
      debug_client/debug_command.h
24
      INCLUDE_DIRECTORIES (${LIBEDIT_INCLUDE_DIRS})
3011
25
      debug_client/debug_command.cpp
25
      SET (LIBEDIT_LIBS ${LIBEDIT_LIBRARIES})
3012
26
      debug_client/command_line_handler.h
26
      SET (ZORBA_HAVE_LIBEDIT_H ${LIBEDIT_FOUND})
3013
27
      debug_client/command_line_handler.cpp
27
    ENDIF (LIBEDIT_FOUND)
3014
28
      debug_client/lock_free_queue.h
28
  ENDIF (NOT WIN32)
3015
29
      debug_client/event_handler.h
29
3016
30
      debug_client/event_handler.cpp
30
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/debugger/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/debugger/config.h)
3017
31
      ${CMAKE_CURRENT_BINARY_DIR}/debug_client/event_handler_init.cpp
31
  MESSAGE(STATUS "configured ${CMAKE_CURRENT_SOURCE_DIR}/debugger/config.h.cmake --> ${CMAKE_CURRENT_BINARY_DIR}/debugger/config.h")
3018
32
  INCLUDE_DIRECTORIES (BEFORE ${CMAKE_CURRENT_BINARY_DIR}/debugger)
3019
33
3020
34
  SET (DEBUG_CLIENT_SRCS
3021
35
    debugger/main.cpp
3022
36
    debugger/xqdb_client.cpp
3023
37
    debugger/process_listener.cpp
3024
38
    debugger/command_prompt.cpp
3025
39
    debugger/command_line_handler.cpp
3026
40
    debugger/event_handler.cpp
3027
32
  )
41
  )
3028
33
  
42
  
3033
34
  CONFIGURE_FILE (debug_client/message-handler.xq message-handler.xq)
43
  ZORBA_GENERATE_EXE ("xqdb" "${DEBUG_CLIENT_SRCS}" "${LIBEDIT_LIBS}" "xqdb" "bin")
3034
35
  
44
ENDIF (ZORBA_WITH_DEBUGGER)
3031
36
  ZORBA_GENERATE_EXE("debuggercmd" "${DEBUG_CLIENT_SRCS}" "" "debugger" "bin")
3032
37
ENDIF(ZORBA_WITH_DEBUGGER_CLIENT)
3035
38
45
3036
39
SET(SRCS
46
SET(SRCS
3037
40
  zorbacmd.cpp
47
  zorbacmd.cpp
3038
41
  zorbacmdproperties.cpp
48
  zorbacmdproperties.cpp
3039
42
  error_printer.cpp
49
  error_printer.cpp
3040
43
  util.cpp
50
  util.cpp
3042
44
  module_path.cpp
51
  path_util.cpp
3043
45
)
52
)
3044
46
53
3045
47
INCLUDE("${CMAKE_SOURCE_DIR}/cmake_modules/ZorbaGenerateExe.cmake")
3046
48
ZORBA_GENERATE_EXE("zorbacmd" "${SRCS}" "" "zorba" "bin")
54
ZORBA_GENERATE_EXE("zorbacmd" "${SRCS}" "" "zorba" "bin")
3047
49
55
3048
50
56
3049
@@ -71,16 +77,62 @@
3050
71
77
3051
72
# test the compile-only option of the command line tool which is used for semantic checking in eclipse
78
# test the compile-only option of the command line tool which is used for semantic checking in eclipse
3052
73
ZORBA_ADD_TEST(bin/zorba_compilechk1 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/mymod.xq" -f -l)
79
ZORBA_ADD_TEST(bin/zorba_compilechk1 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/mymod.xq" -f -l)
3054
74
ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk1 PASS_REGULAR_EXPRESSION ".*mymod.xq>:6,8:.*:XPST0008.*")
80
ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk1 PASS_REGULAR_EXPRESSION ".*mymod.xq>:22,8:.*:XPST0008.*")
3055
75
81
3056
76
ZORBA_ADD_TEST(bin/zorba_compilechk2 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/mymod.xq" -f -l -x)
82
ZORBA_ADD_TEST(bin/zorba_compilechk2 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/mymod.xq" -f -l -x)
3058
77
ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk2 PASS_REGULAR_EXPRESSION ".*XPST0008.*mymod.xq' line='6' column='8'.*")
83
ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk2 PASS_REGULAR_EXPRESSION ".*XPST0008.*mymod.xq' lineStart='22' columnStart='8' lineEnd='22' columnEnd='10'.*")
3059
78
84
3060
79
# test compile checking to work with library modules that have an invalid target namespace uri
85
# test compile checking to work with library modules that have an invalid target namespace uri
3061
80
# test for bug #2934414
86
# test for bug #2934414
3062
81
ZORBA_ADD_TEST(bin/zorba_compilechk3 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/mymod2.xq" -f -l -x)
87
ZORBA_ADD_TEST(bin/zorba_compilechk3 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/mymod2.xq" -f -l -x)
3064
82
ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk3 PASS_REGULAR_EXPRESSION ".*XQST0046.*mymod2.xq' line='1' column='1'.*")
88
ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk3 PASS_REGULAR_EXPRESSION ".*XQST0046.*mymod2.xq' lineStart='17' columnStart='1' lineEnd='17' columnEnd='26'.*")
3065
83
89
3066
84
# test the --option option to set an option in the static context
90
# test the --option option to set an option in the static context
3067
85
ZORBA_ADD_TEST(bin/zorba_option zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/option.xq" -f --option "{http://www.zorba-xquery.com}option=value")
91
ZORBA_ADD_TEST(bin/zorba_option zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/option.xq" -f --option "{http://www.zorba-xquery.com}option=value")
3068
86
ZORBA_SET_TEST_PROPERTY(bin/zorba_option PASS_REGULAR_EXPRESSION "value")
92
ZORBA_SET_TEST_PROPERTY(bin/zorba_option PASS_REGULAR_EXPRESSION "value")
3069
93
3070
94
# test the --uri-path, --lib-path, and --module-path args.
3071
95
# Use the versioning tests as they utilize test modules already.
3072
96
SET (_testdir
3073
97
  "${CMAKE_CURRENT_SOURCE_DIR}/../test/rbkt/Queries/zorba")
3074
98
SET (_uridir "${CMAKE_BINARY_DIR}/TEST_URI_PATH")
3075
99
SET (_libdir "${CMAKE_BINARY_DIR}/TEST_LIB_PATH")
3076
100
ZORBA_ADD_TEST(bin/zorba_uri_path_1 zorbacmd
3077
101
  -f -q "${_testdir}/versioning/import1.xq"
3078
102
  --uri-path "${_uridir}")
3079
103
ZORBA_SET_TEST_PROPERTY(bin/zorba_uri_path_1
3080
104
  PASS_REGULAR_EXPRESSION "hello, v2")
3081
105
3082
106
ZORBA_ADD_TEST(bin/zorba_uri_path_2 zorbacmd
3083
107
  -f -q "${_testdir}/versioning/external1.xq"
3084
108
  --uri-path "${_uridir}")
3085
109
ZORBA_SET_TEST_PROPERTY(bin/zorba_uri_path_2
3086
110
  PASS_REGULAR_EXPRESSION "ZXQP0008")
3087
111
3088
112
ZORBA_ADD_TEST(bin/zorba_uri_path_3 zorbacmd
3089
113
  -f -q "${_testdir}/versioning/external1.xq"
3090
114
  --uri-path "${_uridir}" --lib-path "${_libdir}")
3091
115
ZORBA_SET_TEST_PROPERTY(bin/zorba_uri_path_3
3092
116
  PASS_REGULAR_EXPRESSION "hello, v2")
3093
117
3094
118
# test the --disable-http-resolution flag, using the corresponding test query
3095
119
# from rbkt/zorba/uris/disable-http and a timeout.
3096
120
ZORBA_ADD_TEST(bin/zorba_disable_http_download zorbacmd
3097
121
  -f -q "${_testdir}/uris/disable-http.xq" --disable-http-resolution)
3098
122
ZORBA_SET_TEST_PROPERTY(bin/zorba_disable_http_download
3099
123
  PASS_REGULAR_EXPRESSION "XQST0059")
3100
124
ZORBA_SET_TEST_PROPERTY(bin/zorba_disable_http_download TIMEOUT 5)
3101
125
3102
126
IF(WIN32)
3103
127
  SET(PATH_SEP ";")
3104
128
ELSE(WIN32)
3105
129
  SET(PATH_SEP ":")
3106
130
ENDIF(WIN32)
3107
131
ZORBA_ADD_TEST(bin/zorba_module_path_1 zorbacmd
3108
132
  -f -q "${_testdir}/versioning/external1.xq"
3109
133
  --module-path "${_libdir}${PATH_SEP}${_uridir}")
3110
134
ZORBA_SET_TEST_PROPERTY(bin/zorba_module_path_1
3111
135
  PASS_REGULAR_EXPRESSION "hello, v2")
3112
136
3113
137
# test compilation of the perf script
3114
138
ZORBA_ADD_TEST(bin/zorba_compilechk4 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/../test/zperf/src/start.xq" -f --compile-only)
3115
87
139
3116
=== removed file 'bin/debug_client/debug_command.cpp'
3117
--- bin/debug_client/debug_command.cpp	2011-07-01 01:53:24 +0000
3118
+++ bin/debug_client/debug_command.cpp	1970-01-01 00:00:00 +0000
3119
@@ -1,99 +0,0 @@
3120
1
/*
3121
2
 * Copyright 2006-2008 The FLWOR Foundation.
3122
3
 *
3123
4
 * Licensed under the Apache License, Version 2.0 (the "License");
3124
5
 * you may not use this file except in compliance with the License.
3125
6
 * You may obtain a copy of the License at
3126
7
 * 
3127
8
 * http://www.apache.org/licenses/LICENSE-2.0
3128
9
 *
3129
10
 * Unless required by applicable law or agreed to in writing, software
3130
11
 * distributed under the License is distributed on an "AS IS" BASIS,
3131
12
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3132
13
 * See the License for the specific language governing permissions and
3133
14
 * limitations under the License.
3134
15
 */
3135
16
#include <iostream>
3136
17
#include "debug_client/debug_command.h"
3137
18
3138
19
namespace zorba { namespace debugclient {
3139
20
  
3140
21
  
3141
22
  void CommandLine::execute()
3142
23
  {
3143
24
    for (;;) {
3144
25
      std::cout << "zdb>> ";
3145
26
      std::string command;
3146
27
      std::getline(std::cin, command);
3147
28
      std::vector<std::string> args;
3148
29
      args << command;
3149
30
      std::map<std::string, UntypedCommand*>::iterator lIter = theCommands.find(args[0]);
3150
31
      if (lIter == theCommands.end()) {
3151
32
        std::cout << args[0] << ": Command not found" << std::endl;
3152
33
        continue;
3153
34
      }
3154
35
      if (!lIter->second->execute(args))
3155
36
        continue;
3156
37
      return;
3157
38
    }
3158
39
  }
3159
40
  
3160
41
  
3161
42
  CommandLine::~CommandLine()
3162
43
  {
3163
44
    for (std::map<std::string, UntypedCommand*>::iterator i = theCommands.begin();
3164
45
         i != theCommands.end(); ++i)
3165
46
    {
3166
47
      delete i->second;
3167
48
    }
3168
49
  }
3169
50
  
3170
51
  CommandLine& CommandLine::operator<<(UntypedCommand *aCommand)
3171
52
  {
3172
53
    theCommands.insert(std::make_pair(aCommand->get_name(), aCommand));
3173
54
    return *this;
3174
55
  }
3175
56
}}
3176
57
3177
58
namespace std {
3178
59
  vector<string>& operator<< (vector<string>& vec, const string& str)
3179
60
  {
3180
61
    string::size_type before = 0;
3181
62
    string::size_type pos = str.find(" ", 0);
3182
63
    while (pos != str.npos) {
3183
64
      std::string lSub = str.substr(before, pos - before);
3184
65
      if (lSub[0] == '"') {
3185
66
        std::string::size_type lBeforeCopy = before;
3186
67
        do {
3187
68
          lBeforeCopy = str.find("\"", lBeforeCopy + 1);
3188
69
        } while (pos != str.npos && str.size() > pos + 1 && str[pos + 1] == '\\');
3189
70
        pos = lBeforeCopy;
3190
71
        lSub = str.substr(before + 1, pos - before - 1);
3191
72
      }
3192
73
      vec.push_back(lSub);
3193
74
      before = pos + 1;
3194
75
      pos = str.find(" ", before);
3195
76
    }
3196
77
    std::string lSub = str.substr(before);
3197
78
    if (lSub[0] == '"') {
3198
79
      pos = str.find("\"", before + 1);
3199
80
      lSub = str.substr(before + 1, pos - before - 1);
3200
81
    }
3201
82
    vec.push_back(lSub);
3202
83
    return vec;
3203
84
  }
3204
85
  
3205
86
  set<string>& operator<< (set<string>& vec, const string& str)
3206
87
  {
3207
88
    string::size_type before = 0;
3208
89
    string::size_type pos = str.find(" ", 0);
3209
90
    while (pos != str.npos) {
3210
91
      vec.insert(str.substr(before, pos));
3211
92
      before = pos + 1;
3212
93
      pos = str.find(" ", before);
3213
94
    }
3214
95
    vec.insert(str.substr(before));
3215
96
    return vec;
3216
97
  }
3217
98
3218
99
}
3219
100
0
3220
=== removed file 'bin/debug_client/event_handler_init.cpp.in'
3221
--- bin/debug_client/event_handler_init.cpp.in	2011-07-01 01:53:24 +0000
3222
+++ bin/debug_client/event_handler_init.cpp.in	1970-01-01 00:00:00 +0000
3223
@@ -1,41 +0,0 @@
3224
1
/*
3225
2
 * Copyright 2006-2008 The FLWOR Foundation.
3226
3
 * 
3227
4
 * Licensed under the Apache License, Version 2.0 (the "License");
3228
5
 * you may not use this file except in compliance with the License.
3229
6
 * You may obtain a copy of the License at
3230
7
 * 
3231
8
 * http://www.apache.org/licenses/LICENSE-2.0
3232
9
 * 
3233
10
 * Unless required by applicable law or agreed to in writing, software
3234
11
 * distributed under the License is distributed on an "AS IS" BASIS,
3235
12
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3236
13
 * See the License for the specific language governing permissions and
3237
14
 * limitations under the License.
3238
15
 */
3239
16
#include <fstream>
3240
17
#include "debug_client/event_handler.h"
3241
18
3242
19
namespace zorba { namespace debugclient {
3243
20
3244
21
  std::istream* EventHandler::getCurrentDirectory() {
3245
22
    const char* build_dir = "@CMAKE_BINARY_DIR@/bin/message-handler.xq";
3246
23
    const char* install_dir = 
3247
24
#ifndef WIN32
3248
25
    "@CMAKE_INSTALL_PREFIX@/bin/";
3249
26
#else
3250
27
    "C:/Program Files/Zorba XQuery Processor @ZORBA_MAJOR_NUMBER@.@ZORBA_MINOR_NUMBER@.@ZORBA_PATCH_NUMBER@/bin/";
3251
28
#endif
3252
29
    std::auto_ptr<std::ifstream> stream(new std::ifstream(build_dir));
3253
30
    if (stream->good()) {
3254
31
      return stream.release();
3255
32
    }
3256
33
    stream.reset(new std::ifstream(install_dir));
3257
34
    if (stream->good()) {
3258
35
      return stream.release();
3259
36
    }
3260
37
    return 0;
3261
38
  }
3262
39
3263
40
}} // end of namespace zorba::debugclient
3264
41
3265
42
0
3266
=== removed file 'bin/debug_client/lock_free_queue.cpp'
3267
--- bin/debug_client/lock_free_queue.cpp	2011-07-01 01:53:24 +0000
3268
+++ bin/debug_client/lock_free_queue.cpp	1970-01-01 00:00:00 +0000
3269
@@ -1,16 +0,0 @@
3270
1
/*
3271
2
 * Copyright 2006-2008 The FLWOR Foundation.
3272
3
 *
3273
4
 * Licensed under the Apache License, Version 2.0 (the "License");
3274
5
 * you may not use this file except in compliance with the License.
3275
6
 * You may obtain a copy of the License at
3276
7
 * 
3277
8
 * http://www.apache.org/licenses/LICENSE-2.0
3278
9
 *
3279
10
 * Unless required by applicable law or agreed to in writing, software
3280
11
 * distributed under the License is distributed on an "AS IS" BASIS,
3281
12
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3282
13
 * See the License for the specific language governing permissions and
3283
14
 * limitations under the License.
3284
15
 */
3285
16
#include "lock_free_queue.h"
3286
17
0
3287
=== removed file 'bin/debug_client/message-handler.xq'
3288
--- bin/debug_client/message-handler.xq	2011-07-01 01:53:24 +0000
3289
+++ bin/debug_client/message-handler.xq	1970-01-01 00:00:00 +0000
3290
@@ -1,149 +0,0 @@
3291
1
import module namespace refl = 'http://www.zorba-xquery.com/modules/reflection';
3292
2
import module namespace sctx = "http://www.zorba-xquery.com/modules/introspection/sctx";
3293
3
import module namespace base64 = "http://www.zorba-xquery.com/modules/converters/base64";
3294
4
3295
5
3296
6
declare variable $local:localns as xs:string := 'http://www.w3.org/2005/xquery-local-functions';
3297
7
3298
8
3299
9
declare variable $local:endl as xs:string := '
3300
10
';
3301
11
3302
12
declare function local:has-to-stop($resp as element())
3303
13
{
3304
14
  fn:not(($resp/@command/data(.) eq "stop" and $resp/@reason/data(.) eq "ok")
3305
15
    or ($resp/@status/data(.) eq "stopped")
3306
16
    or ($resp/@status/data(.) eq "stopping"))
3307
17
};
3308
18
3309
19
declare function local:status($resp as element())
3310
20
{
3311
21
  fn:concat(
3312
22
    "Status: ", $resp/@status/data(.), $local:endl,
3313
23
    "Reason: ", $resp/@reason/data(.), $local:endl,
3314
24
    let $msg := $resp/text()
3315
25
    return
3316
26
      if (fn:empty($msg) or $msg eq "") then
3317
27
        ""
3318
28
      else
3319
29
        fn:concat($msg, $local:endl)
3320
30
  )
3321
31
};
3322
32
3323
33
3324
34
declare function local:run($resp as element()) {
3325
35
  if ($resp/@status/data(.) eq "starting") then
3326
36
    "Starting query"
3327
37
  else
3328
38
    local:status($resp)
3329
39
};
3330
40
3331
41
declare function local:stop($resp as element())
3332
42
{
3333
43
  local:status($resp)
3334
44
};
3335
45
3336
46
declare function local:breakpoint_set($resp as element())
3337
47
{
3338
48
  if ($resp/error) then
3339
49
    fn:concat("Error when setting a breakpoint: ", if ($resp/error/message) then $resp/error/message/text() else concat(" errcode: ", data($resp/error/@code)))
3340
50
  else
3341
51
    fn:concat("set breakpoint with id ", data($resp/@id), " and state ", data($resp/@state))
3342
52
};
3343
53
3344
54
declare function local:breakpoint_list($resp as element())
3345
55
{
3346
56
  string-join(
3347
57
    for $b in $resp/breakpoint
3348
58
    return concat("Breakpoint ", data($b/@id), " at ", data($b/@filename), ":", data($b/@lineno), " ", data($b/@state)),
3349
59
    $local:endl
3350
60
  )
3351
61
};
3352
62
3353
63
declare function local:breakpoint_remove($resp as element())
3354
64
{
3355
65
  "Breakpoint removed"
3356
66
};
3357
67
3358
68
declare function local:stack_depth($resp as element())
3359
69
{
3360
70
  concat("Depth: ", data($resp/@depth))
3361
71
};
3362
72
3363
73
declare function local:stack_get($resp as element())
3364
74
{
3365
75
  string-join(
3366
76
    for $s in $resp/stack
3367
77
    return concat("Level ", data($s/@level), " at ", data($s/@filename), ":", data($s/@lineno)),
3368
78
    $local:endl
3369
79
  )
3370
80
};
3371
81
3372
82
3373
83
declare function local:context_names($resp as element())
3374
84
{
3375
85
  string-join(
3376
86
    for $c in $resp/context
3377
87
    return concat("Context: ", data($c/@name), " id: ", data($c/@id)),
3378
88
    $local:endl
3379
89
  )
3380
90
};
3381
91
3382
92
declare function local:context_get($resp as element())
3383
93
{
3384
94
  string-join(
3385
95
    for $p in $resp/property
3386
96
    return concat(data($p/@fullname), ": [", data($p/@type), "]",
3387
97
                  if ($p/text() ne "") then concat(": ", base64:decode($p/text())) else ""),
3388
98
    $local:endl
3389
99
  )
3390
100
};
3391
101
3392
102
declare function local:eval($resp as element())
3393
103
{
3394
104
  if (data($resp/@success) eq "1") then
3395
105
    local:context_get($resp)
3396
106
  else
3397
107
    concat("Eval failed", ":", $resp/error/message/text())
3398
108
};
3399
109
3400
110
declare function local:process-response($resp as element())
3401
111
{
3402
112
  if (data($resp/@command) eq "") then
3403
113
    (fn:true(), $resp/@transaction_id/data(.), local:status($resp))
3404
114
  else
3405
115
    let $fun-cont-name := fn:QName($local:localns, concat("local:", $resp/@command/data(.), "-cont"))
3406
116
    let $fun-msg-name := fn:QName($local:localns, concat("local:", $resp/@command/data(.)))
3407
117
    return (
3408
118
      if (sctx:function-arguments-count($fun-cont-name) = 1) then
3409
119
        refl:invoke-simple($fun-cont-name, $resp)
3410
120
      else
3411
121
        local:has-to-stop($resp),
3412
122
      $resp/@transaction_id/data(.),
3413
123
      if (sctx:function-arguments-count($fun-msg-name) = 1) then
3414
124
        refl:invoke-simple($fun-msg-name, $resp)
3415
125
      else
3416
126
        "Recieved a message - command not implemented"
3417
127
    )
3418
128
};
3419
129
3420
130
declare function local:process-init($init as element())
3421
131
{
3422
132
  fn:true(),
3423
133
  0,
3424
134
  fn:concat(fn:string-join(
3425
135
  ('Established connection with', $init/@language/data(.), 'client', $init/@appid/data(.)), ' '), '
3426
136
')
3427
137
};
3428
138
3429
139
declare function local:main($response as element()) {
3430
140
  let $process-fun as xs:QName := fn:QName($local:localns, concat("local:process-", node-name($response)))
3431
141
  return
3432
142
    if (sctx:function-arguments-count($process-fun) = 1) then
3433
143
      refl:invoke-simple($process-fun, $response)
3434
144
    else (
3435
145
          true(),
3436
146
          ($response/@transaction_id, 0)[1]/data(.),
3437
147
          "ERROR: Recieved unknown node from client"
3438
148
         )
3439
149
};
3440
150
0
3441
=== renamed directory 'bin/debug_client' => 'bin/debugger'
3442
=== renamed file 'bin/debug_client/debug_command.h' => 'bin/debugger/command.h'
3443
--- bin/debug_client/debug_command.h	2011-07-04 08:05:46 +0000
3444
+++ bin/debugger/command.h	2013-01-25 00:15:35 +0000
3445
@@ -14,7 +14,9 @@
3446
14
 * limitations under the License.
14
 * limitations under the License.
3447
15
 */
15
 */
3448
16
#pragma once
16
#pragma once
3450
17
#include <zorba/config.h>
17
#ifndef ZORBA_DEBUGGER_COMMAND_H
3451
18
#define ZORBA_DEBUGGER_COMMAND_H
3452
19
3453
18
#include <string>
20
#include <string>
3454
19
#include <vector>
21
#include <vector>
3455
20
#include <iostream>
22
#include <iostream>
3456
@@ -23,151 +25,18 @@
3457
23
#include <sstream>
25
#include <sstream>
3458
24
#include <memory>
26
#include <memory>
3459
25
#include <typeinfo>
27
#include <typeinfo>
3463
26
#include "debug_client/tuple.h"
28
3464
27
29
#include <zorba/config.h>
3465
28
namespace zorba { namespace debugclient {
30
3466
31
#include "command_arg.h"
3467
32
#include "tuple.h"
3468
33
3469
34
3470
35
namespace zorba { namespace debugger {
3471
29
  
36
  
3472
30
  class DebugClientParseException : public std::exception {
37
  class DebugClientParseException : public std::exception {
3473
31
  };
38
  };
3474
32
  
39
  
3475
33
  template<typename Tuple>
3476
34
  class CommandArg;
3477
35
  
3478
36
  template<typename Tuple>
3479
37
  class CommandArgInstance {
3480
38
  public:
3481
39
    virtual int get_index() const = 0;
3482
40
    virtual const CommandArg<Tuple>* get_arg() const = 0;
3483
41
    virtual void insertValue(Tuple& t) = 0;
3484
42
    virtual bool isSet(Tuple& t) const = 0;
3485
43
  };
3486
44
  
3487
45
  template<typename T, int Idx, typename Tuple>
3488
46
  class TypedCommandArgInstance : public CommandArgInstance<Tuple>
3489
47
  {
3490
48
  public:
3491
49
    TypedCommandArgInstance(T aValue, const CommandArg<Tuple>* aArg)
3492
50
    : theValue(aValue), theArg(aArg) {}
3493
51
    virtual int get_index() const { return Idx; }
3494
52
    virtual const CommandArg<Tuple>* get_arg() const { return theArg; }
3495
53
    virtual void insertValue(Tuple& t)
3496
54
    {
3497
55
      ZORBA_TR1_NS::get<Idx>(t).first = true;
3498
56
      ZORBA_TR1_NS::get<Idx>(t).second = theValue;
3499
57
    }
3500
58
    virtual bool isSet(Tuple& t) const
3501
59
    {
3502
60
      return ZORBA_TR1_NS::get<Idx>(t).first;
3503
61
    }
3504
62
  private:
3505
63
    T theValue;
3506
64
    const CommandArg<Tuple>* theArg;
3507
65
  };
3508
66
  
3509
67
  template<typename Tuple>
3510
68
  class CommandArgType {
3511
69
  public:
3512
70
    virtual CommandArgInstance<Tuple>* parse(const std::string& str,
3513
71
                                             const CommandArg<Tuple>* arg) = 0;
3514
72
    virtual bool isVoid() const = 0;
3515
73
    virtual bool isSet(Tuple& t) const = 0;
3516
74
    virtual ~CommandArgType() {}
3517
75
  };
3518
76
  
3519
77
  template<typename T, int Idx, typename Tuple>
3520
78
  class TypedCommandArgType : public CommandArgType<Tuple> {
3521
79
  public:
3522
80
    typedef T Type;
3523
81
  public: // implementation
3524
82
    TypedCommandArgType(bool aIsVoid) : theIsVoid(aIsVoid) {}
3525
83
    TypedCommandArgType(const T& aValue,
3526
84
                        bool aIsVoid)
3527
85
    : theDefault(aValue), theIsVoid(aIsVoid) {}
3528
86
    virtual CommandArgInstance<Tuple>* parse(const std::string& str,
3529
87
                                             const CommandArg<Tuple>* arg)
3530
88
    {
3531
89
      T aValue;
3532
90
      std::stringstream stream(str);
3533
91
      stream >> aValue;
3534
92
      if (stream.fail()) {
3535
93
        std::cerr << "Could not parse argument of type "
3536
94
          << typeid(T).name()
3537
95
          << std::endl;
3538
96
        return 0;
3539
97
      }
3540
98
      return new TypedCommandArgInstance<T, Idx, Tuple>(aValue, arg);
3541
99
    }
3542
100
    virtual bool isVoid() const { return theIsVoid; }
3543
101
    virtual bool isSet(Tuple& t) const
3544
102
    {
3545
103
      return ZORBA_TR1_NS::get<Idx>(t).first;
3546
104
    }
3547
105
  private:
3548
106
    TypedCommandArgType<T, Idx, Tuple>() {}
3549
107
    T theDefault;
3550
108
    bool theIsVoid;
3551
109
  };
3552
110
3553
111
  template<typename Tuple>
3554
112
  class CommandArg {
3555
113
  public:
3556
114
    CommandArg(unsigned aId,
3557
115
               CommandArgType<Tuple>* aType,
3558
116
               const std::set<std::string>& aFlags,
3559
117
               const std::string& aDescription,
3560
118
               bool aIsRequired)
3561
119
    : theId(aId),
3562
120
    theType(aType),
3563
121
    theFlags(aFlags),
3564
122
    theDescription(aDescription),
3565
123
    theIsRequired(aIsRequired)
3566
124
    {
3567
125
    }
3568
126
    ~CommandArg() { delete theType; }
3569
127
    unsigned get_id() const { return theId; }
3570
128
    bool canHandle(const std::string& arg) const
3571
129
    {
3572
130
      if (theFlags.find(arg) != theFlags.end()) {
3573
131
        return true;
3574
132
      }
3575
133
      return false;
3576
134
    }
3577
135
    CommandArgInstance<Tuple>* parse(const std::string& str) const
3578
136
    {
3579
137
      return theType->parse(str, this);
3580
138
    }
3581
139
    bool isVoid() const {
3582
140
      return theType->isVoid();
3583
141
    }
3584
142
    bool isRequired() const { return theIsRequired; }
3585
143
    std::string get_name() const {
3586
144
      return *(theFlags.begin());
3587
145
    }
3588
146
    bool isSet(Tuple& t) const
3589
147
    {
3590
148
      return theType->isSet(t);
3591
149
    }
3592
150
  private:
3593
151
    unsigned theId;
3594
152
    CommandArgType<Tuple>* theType;
3595
153
    std::set<std::string> theFlags;
3596
154
    std::string theDescription;
3597
155
    bool theIsRequired;
3598
156
  };
3599
157
}} // end namespace zorba
3600
158
3601
159
namespace std {
3602
160
  
3603
161
  /**
3604
162
   * This is a helper split function
3605
163
   */
3606
164
  vector<string>& operator<< (vector<string>& vec, const string& str);
3607
165
  
3608
166
  set<string>& operator<< (set<string>& vec, const string& str);
3609
167
} //end namespace std
3610
168
3611
169
namespace zorba { namespace debugclient {
3612
170
3613
171
  template<typename Func, typename Tuple, int CommandIdx>
40
  template<typename Func, typename Tuple, int CommandIdx>
3614
172
  class CommandInstance
41
  class CommandInstance
3615
173
  {
42
  {
3616
@@ -188,8 +57,11 @@
3617
188
  
57
  
3618
189
  class UntypedCommand {
58
  class UntypedCommand {
3619
190
  public:
59
  public:
3622
191
    virtual std::string get_name() const = 0;
60
    virtual ~UntypedCommand() {}
3623
192
    virtual std::string get_description() const = 0;
61
    virtual std::string getName() const = 0;
3624
62
    virtual std::set<std::string> getAliases() const = 0;
3625
63
    virtual std::string getDescription() const = 0;
3626
64
    virtual void printHelp() const = 0;
3627
193
    virtual bool execute(const std::vector<std::string>& args) = 0;
65
    virtual bool execute(const std::vector<std::string>& args) = 0;
3628
194
  };
66
  };
3629
195
  
67
  
3630
@@ -197,77 +69,141 @@
3631
197
  class Command : public UntypedCommand {
69
  class Command : public UntypedCommand {
3632
198
  public:
70
  public:
3633
199
    Command(const std::string& aName, Func& aFunction, const std::string& aDescription)
71
    Command(const std::string& aName, Func& aFunction, const std::string& aDescription)
3635
200
      : theName(aName), theFunction(aFunction), theDescription(aDescription) {}
72
      : theName(aName), theFunction(aFunction), theDescription(aDescription)
3636
73
    {}
3637
74
3638
75
    Command(const std::string& aName, const std::set<std::string> aAliases, Func& aFunction, const std::string& aDescription)
3639
76
      : theName(aName), theAliases(aAliases), theFunction(aFunction), theDescription(aDescription)
3640
77
    {}
3641
78
3642
201
    ~Command();
79
    ~Command();
3643
80
3644
202
  public:
81
  public:
3652
203
    Command& operator() (unsigned aId,
82
3653
204
                         const std::string& aFlags,
83
    void
3654
205
                         CommandArgType<Tuple>* aType,
84
    addArgument(
3655
206
                         const std::string& aDescription = "",
85
      unsigned aId,
3656
207
                         bool isRequired = false);
86
      const std::string& aFlags,
3657
208
    virtual std::string get_name() const { return theName; }
87
      CommandArgType<Tuple>* aType,
3658
209
    virtual std::string get_description() const { return theDescription; }
88
      const std::string& aDescription = "",
3659
89
      bool isRequired = false);
3660
90
3661
91
    static void
3662
92
    splitNames(
3663
93
      const std::string& names,
3664
94
      std::set<std::string>& set);
3665
95
3666
96
    virtual std::string
3667
97
    getName() const
3668
98
    {
3669
99
      return theName;
3670
100
    }
3671
101
3672
102
    virtual std::set<std::string> getAliases() const
3673
103
    {
3674
104
      return theAliases;
3675
105
    }
3676
106
3677
107
    virtual std::string
3678
108
    getDescription() const
3679
109
    {
3680
110
      return theDescription;
3681
111
    }
3682
112
3683
113
    virtual void
3684
114
    printHelp() const;
3685
115
3686
210
    virtual bool execute(const std::vector<std::string>& args)
116
    virtual bool execute(const std::vector<std::string>& args)
3687
211
    {
117
    {
3688
212
      CommandInstance<Func, Tuple, CommandIdx> instance(theFunction, theTuple);
118
      CommandInstance<Func, Tuple, CommandIdx> instance(theFunction, theTuple);
3690
213
      if (instance.parseArguments(args, theArgs))
119
      if (instance.parseArguments(args, theArgs)) {
3691
214
        instance.execute();
120
        instance.execute();
3695
215
      else
121
        return true;
3696
216
        return false;
122
      }
3697
217
      return true;
123
      return false;
3698
218
    }
124
    }
3699
219
  private:
125
  private:
3700
220
    std::string theName;
126
    std::string theName;
3701
127
    std::set<std::string> theAliases;
3702
221
    Func& theFunction;
128
    Func& theFunction;
3703
222
    Tuple theTuple;
129
    Tuple theTuple;
3704
223
    std::string theDescription;
130
    std::string theDescription;
3752
224
    std::map<std::string, CommandArg<Tuple>* > theArgs;
131
    std::map<std::string, CommandArg<Tuple>*> theArgs;
3753
225
  };
132
  };
3754
226
  
133
3755
227
  class CommandLine {
134
/*****************************************************************************/
3756
228
  public:
135
/*****************************************************************************/
3757
229
    ~CommandLine();
136
3758
230
  public:
137
template<typename Func, typename Tuple, int CommandIdx>
3759
231
    void execute();
138
Command<Func, Tuple, CommandIdx>::~Command()
3760
232
    CommandLine& operator<< (UntypedCommand* aCommand);
139
{
3761
233
  private:
140
  typedef std::map<std::string, CommandArg<Tuple>*> ArgType;
3762
234
    std::map<std::string, UntypedCommand*> theCommands;
141
  for (typename ArgType::iterator i = theArgs.begin(); i != theArgs.end(); ++i) {
3763
235
  };
142
    delete i->second;
3764
236
  
143
  }
3765
237
  template<typename Func, typename Tuple, int CommandIdx>
144
}
3766
238
  Command<Func, Tuple, CommandIdx>::~Command()
145
3767
239
  {
146
template<typename Func, typename Tuple, int CommandIdx>
3768
240
    typedef std::map<std::string, CommandArg<Tuple>* > ArgType;
147
void
3769
241
    for (typename ArgType::iterator i = theArgs.begin(); i != theArgs.end(); ++i) {
148
Command<Func, Tuple, CommandIdx>::printHelp() const
3770
242
      delete i->second;
149
{
3771
243
    }
150
  std::cout << "Purpose: " << getDescription() << std::endl;
3772
244
  }
151
3773
245
    
152
  typename std::map<std::string, CommandArg<Tuple>*>::const_iterator lIter = theArgs.begin();
3774
246
 
153
  if (lIter == theArgs.end()) {
3775
247
  template<typename Func, typename Tuple, int CommandIdx>
154
    std::cout << "This command has no arguments." << std::endl;
3776
248
  Command<Func, Tuple, CommandIdx>& 
155
    std::cout << std::endl;
3777
249
  Command<Func, Tuple, CommandIdx>::operator() (unsigned aId,
156
    return;
3778
250
                                    const std::string& aFlags,
157
  }
3779
251
                                    CommandArgType<Tuple>* aType,
158
  
3780
252
                                    const std::string& aDescription,
159
  std::cout << "Arguments:" << std::endl << std::endl;
3781
253
                                    bool isRequired)
160
  for (; lIter != theArgs.end(); ++lIter) {
3782
254
  {
161
    std::cout << "  " << lIter->first << "\t" << lIter->second->getDescription() << std::endl;
3783
255
    std::set<std::string> args;
162
  }
3784
256
    args << aFlags;
163
  std::cout << std::endl;
3785
257
    for (std::set<std::string>::iterator i = args.begin(); i != args.end(); ++i) {
164
}
3786
258
      std::string toAdd = (i->size() == 1) ? "-" + *i : "--" + *i;
165
3787
259
      theArgs.insert(std::make_pair(toAdd,
166
template<typename Func, typename Tuple, int CommandIdx>
3788
260
                                    new CommandArg<Tuple>(aId,
167
void
3789
261
                                                          aType,
168
Command<Func, Tuple, CommandIdx>::splitNames(const std::string& aNames, std::set<std::string>& aSet)
3790
262
                                                          args,
169
{
3791
263
                                                          aDescription,
170
  std::string::size_type before = 0;
3792
264
                                                          isRequired)
171
  std::string::size_type pos = aNames.find(" ", 0);
3793
265
                                    )
172
  while (pos != aNames.npos) {
3794
266
                     );
173
    std::string lName = aNames.substr(before, pos);
3795
267
    }
174
    if (lName != "") {
3796
268
    return *this;
175
      aSet.insert(lName);
3797
269
  }
176
    }
3798
270
  
177
    before = pos + 1;
3799
178
    pos = aNames.find(" ", before);
3800
179
  }
3801
180
  std::string lName = aNames.substr(before);
3802
181
  if (lName != "") {
3803
182
    aSet.insert(lName);
3804
183
  }
3805
184
}
3806
185
3807
186
template<typename Func, typename Tuple, int CommandIdx>
3808
187
void
3809
188
Command<Func, Tuple, CommandIdx>::addArgument(
3810
189
  unsigned aId,
3811
190
  const std::string& aFlags,
3812
191
  CommandArgType<Tuple>* aType,
3813
192
  const std::string& aDescription,
3814
193
  bool isRequired)
3815
194
{
3816
195
  std::set<std::string> lNames;
3817
196
  splitNames(aFlags, lNames);
3818
197
3819
198
  for (std::set<std::string>::iterator i = lNames.begin(); i != lNames.end(); ++i) {
3820
199
    std::string toAdd = (i->size() == 1) ? "-" + *i : "--" + *i;
3821
200
    CommandArg<Tuple>* lArg = new CommandArg<Tuple>(aId, aType, lNames, aDescription, isRequired);
3822
201
    theArgs.insert(std::make_pair(toAdd, lArg));
3823
202
  }
3824
203
}
3825
204
3826
205
/*****************************************************************************/
3827
206
3828
271
  template<typename Tuple, typename T, int Idx>
207
  template<typename Tuple, typename T, int Idx>
3829
272
  CommandArgType<Tuple>* createArgType(Tuple t)
208
  CommandArgType<Tuple>* createArgType(Tuple t)
3830
273
  {
209
  {
3831
@@ -290,6 +226,16 @@
3832
290
    return new Command<Func, Tuple, CommandIdx>(aName, aFunction, aDescription);
226
    return new Command<Func, Tuple, CommandIdx>(aName, aFunction, aDescription);
3833
291
  }
227
  }
3834
292
  
228
  
3835
229
  template<int CommandIdx, typename Tuple, typename Func>
3836
230
  Command<Func, Tuple, CommandIdx>* createCommand(Tuple t,
3837
231
                                                  const std::string& aName,
3838
232
                                                  const std::set<std::string>& aAliases,
3839
233
                                                  Func& aFunction,
3840
234
                                                  const std::string& aDescription)
3841
235
  {
3842
236
    return new Command<Func, Tuple, CommandIdx>(aName, aAliases, aFunction, aDescription);
3843
237
  }
3844
238
  
3845
293
  template<typename Func, typename Tuple, int CommandIdx>
239
  template<typename Func, typename Tuple, int CommandIdx>
3846
294
  bool CommandInstance<Func, Tuple, CommandIdx>::
240
  bool CommandInstance<Func, Tuple, CommandIdx>::
3847
295
  parseArguments(const std::vector<std::string>& args,
241
  parseArguments(const std::vector<std::string>& args,
3848
@@ -301,29 +247,34 @@
3849
301
    for (ArgType::size_type i = 1; i < size; ++i) {
247
    for (ArgType::size_type i = 1; i < size; ++i) {
3850
302
      typename CArgType::const_iterator pos = aCommandArgs.find(args[i]);
248
      typename CArgType::const_iterator pos = aCommandArgs.find(args[i]);
3851
303
      if (pos == aCommandArgs.end()) {
249
      if (pos == aCommandArgs.end()) {
3853
304
        std::cerr << "Error: Unknown Argument " << args[i] << std::endl;
250
        std::cerr << "Error: Unknown option " << args[i] << std::endl;
3854
305
        parseError = true;
251
        parseError = true;
3855
306
        return false;
252
        return false;
3856
307
      }
253
      }
3857
308
      const CommandArg<Tuple>& arg = *(pos->second);
254
      const CommandArg<Tuple>& arg = *(pos->second);
3858
309
      if (!arg.isVoid() && args[++i][0] == '-') {
3859
310
        std::cerr << "Did not expect parameter for option " << args[i] << std::endl;
3860
311
        return false;
3861
312
      }
3862
313
      std::auto_ptr<CommandArgInstance<Tuple> > instance;
255
      std::auto_ptr<CommandArgInstance<Tuple> > instance;
3863
314
      if (arg.isVoid()) {
256
      if (arg.isVoid()) {
3864
315
        instance.reset(arg.parse("1"));
257
        instance.reset(arg.parse("1"));
3865
316
      } else {
258
      } else {
3866
259
        ++i;
3867
260
        if (i >= size) {
3868
261
          std::cerr << "Error: Missing value for argument " << args[i - 1] << std::endl;
3869
262
          parseError = true;
3870
263
          allSet = false;
3871
264
          return false;
3872
265
        }
3873
317
        instance.reset(arg.parse(args[i]));
266
        instance.reset(arg.parse(args[i]));
3874
318
      }
267
      }
3876
319
      instance->insertValue(theTuple);
268
      if (instance.get()) {
3877
269
        instance->insertValue(theTuple);
3878
270
      }
3879
320
    }
271
    }
3880
321
    bool allSet = true;
272
    bool allSet = true;
3881
322
    for (typename CArgType::const_iterator i = aCommandArgs.begin();
273
    for (typename CArgType::const_iterator i = aCommandArgs.begin();
3882
323
         i != aCommandArgs.end(); ++i)
274
         i != aCommandArgs.end(); ++i)
3883
324
    {
275
    {
3884
325
      if (i->second->isRequired() && !i->second->isSet(theTuple)) {
276
      if (i->second->isRequired() && !i->second->isSet(theTuple)) {
3886
326
        std::cerr << "Error: Argument " << i->second->get_name() << " not set" << std::endl;
277
        std::cerr << "Error: Argument -" << i->second->getName() << " not set" << std::endl;
3887
327
        allSet = false;
278
        allSet = false;
3888
328
      }
279
      }
3889
329
    }
280
    }
3890
@@ -336,4 +287,7 @@
3891
336
    theFunction.template handle<CommandIdx>(this->theTuple);
287
    theFunction.template handle<CommandIdx>(this->theTuple);
3892
337
  }
288
  }
3893
338
289
3895
339
}} // end of namespace zorba::debugclient
290
} // namespace zorba
3896
291
} // namespace debugger
3897
292
3898
293
#endif // ZORBA_DEBUGGER_COMMAND_H
3899
340
294
3900
=== added file 'bin/debugger/command_arg.h'
3901
--- bin/debugger/command_arg.h	1970-01-01 00:00:00 +0000
3902
+++ bin/debugger/command_arg.h	2013-01-25 00:15:35 +0000
3903
@@ -0,0 +1,237 @@
3904
1
/*
3905
2
 * Copyright 2006-2008 The FLWOR Foundation.
3906
3
 *
3907
4
 * Licensed under the Apache License, Version 2.0 (the "License");
3908
5
 * you may not use this file except in compliance with the License.
3909
6
 * You may obtain a copy of the License at
3910
7
 * 
3911
8
 * http://www.apache.org/licenses/LICENSE-2.0
3912
9
 *
3913
10
 * Unless required by applicable law or agreed to in writing, software
3914
11
 * distributed under the License is distributed on an "AS IS" BASIS,
3915
12
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3916
13
 * See the License for the specific language governing permissions and
3917
14
 * limitations under the License.
3918
15
 */
3919
16
#pragma once
3920
17
#ifndef ZORBA_DEBUGGER_COMMAND_ARG_H
3921
18
#define ZORBA_DEBUGGER_COMMAND_ARG_H
3922
19
3923
20
#include <string>
3924
21
#include <iostream>
3925
22
#include <set>
3926
23
#include <sstream>
3927
24
3928
25
#include "tuple.h"
3929
26
3930
27
3931
28
namespace zorba { namespace debugger {
3932
29
3933
30
template<typename Tuple>
3934
31
class CommandArg;
3935
32
3936
33
template<typename Tuple>
3937
34
class CommandArgInstance {
3938
35
  public:
3939
36
    virtual int get_index() const = 0;
3940
37
    virtual const CommandArg<Tuple>* get_arg() const = 0;
3941
38
    virtual void insertValue(Tuple& t) = 0;
3942
39
    virtual bool isSet(Tuple& t) const = 0;
3943
40
};
3944
41
3945
42
template<typename T, int Idx, typename Tuple>
3946
43
class TypedCommandArgInstance : public CommandArgInstance<Tuple>
3947
44
{
3948
45
  public:
3949
46
    TypedCommandArgInstance(T aValue, const CommandArg<Tuple>* aArg)
3950
47
      : theValue(aValue), theArg(aArg)
3951
48
    {
3952
49
    }
3953
50
3954
51
    virtual int
3955
52
    get_index() const
3956
53
    {
3957
54
      return Idx;
3958
55
    }
3959
56
3960
57
    virtual const CommandArg<Tuple>*
3961
58
    get_arg() const
3962
59
    {
3963
60
      return theArg;
3964
61
    }
3965
62
3966
63
    virtual void
3967
64
    insertValue(Tuple& t)
3968
65
    {
3969
66
      ZORBA_TR1_NS::get<Idx>(t).first = true;
3970
67
      ZORBA_TR1_NS::get<Idx>(t).second = theValue;
3971
68
    }
3972
69
3973
70
    virtual bool isSet(Tuple& t) const
3974
71
    {
3975
72
      return ZORBA_TR1_NS::get<Idx>(t).first;
3976
73
    }
3977
74
3978
75
  private:
3979
76
3980
77
    T theValue;
3981
78
    const CommandArg<Tuple>* theArg;
3982
79
};
3983
80
  
3984
81
template<typename Tuple>
3985
82
class CommandArgType
3986
83
{
3987
84
  public:
3988
85
    virtual CommandArgInstance<Tuple>*
3989
86
    parse(
3990
87
      const std::string& str,
3991
88
      const CommandArg<Tuple>* arg) = 0;
3992
89
3993
90
    virtual bool
3994
91
    isVoid() const = 0;
3995
92
  
3996
93
    virtual bool
3997
94
    isSet(Tuple& t) const = 0;
3998
95
3999
96
    virtual ~CommandArgType() {}
4000
97
};
4001
98
  
4002
99
  template<typename T, int Idx, typename Tuple>
4003
100
  class TypedCommandArgType : public CommandArgType<Tuple> {
4004
101
  public:
4005
102
    typedef T Type;
4006
103
  public: // implementation
4007
104
    TypedCommandArgType(bool aIsVoid) : theIsVoid(aIsVoid) {}
4008
105
    TypedCommandArgType(const T& aValue,
4009
106
                        bool aIsVoid)
4010
107
    : theDefault(aValue), theIsVoid(aIsVoid) {}
4011
108
    virtual CommandArgInstance<Tuple>* parse(const std::string& str,
4012
109
                                             const CommandArg<Tuple>* arg)
4013
110
    {
4014
111
      T aValue;
4015
112
4016
113
      // special treatment for strings
4017
114
      // this is a double hack:
4018
115
      // - we check the type name if this starts with: class std::basic_string
4019
116
      // - we use void* in readEntireString to workaround the template type T
4020
117
      //   which would otherwise complain during compilation if types and
4021
118
      //   operators do not match
4022
119
      // TOSO: probably someone can find a more elegant solution
4023
120
      std::string lTypeName(typeid(T).name());
4024
121
      if (lTypeName.find("class std::basic_string") == 0) {
4025
122
        readEntireString(str, &aValue);
4026
123
      } else {
4027
124
        std::stringstream stream(str);
4028
125
        std::stringstream out;
4029
126
        stream >> aValue;
4030
127
        if (stream.fail()) {
4031
128
          std::cerr << "Error: Could not parse value \"" << str << "\" as type "
4032
129
            << typeid(T).name()
4033
130
            << std::endl;
4034
131
          return 0;
4035
132
        }
4036
133
      }
4037
134
4038
135
      return new TypedCommandArgInstance<T, Idx, Tuple>(aValue, arg);
4039
136
    }
4040
137
    virtual bool isVoid() const { return theIsVoid; }
4041
138
    virtual bool isSet(Tuple& t) const
4042
139
    {
4043
140
      return ZORBA_TR1_NS::get<Idx>(t).first;
4044
141
    }
4045
142
  private:
4046
143
    void readEntireString(std::string aIn, void* aValue)
4047
144
    {
4048
145
      *((std::string*)aValue) = aIn;
4049
146
    }
4050
147
4051
148
    TypedCommandArgType<T, Idx, Tuple>() {}
4052
149
    T theDefault;
4053
150
    bool theIsVoid;
4054
151
  };
4055
152
4056
153
  template<typename Tuple>
4057
154
  class CommandArg {
4058
155
  public:
4059
156
    CommandArg(unsigned aId,
4060
157
               CommandArgType<Tuple>* aType,
4061
158
               const std::set<std::string>& aNames,
4062
159
               const std::string& aDescription,
4063
160
               bool aIsRequired)
4064
161
    : theId(aId),
4065
162
    theType(aType),
4066
163
    theNames(aNames),
4067
164
    theDescription(aDescription),
4068
165
    theIsRequired(aIsRequired)
4069
166
    {
4070
167
    }
4071
168
4072
169
    ~CommandArg()
4073
170
    { 
4074
171
      delete theType;
4075
172
    }
4076
173
4077
174
    unsigned
4078
175
    get_id() const
4079
176
    {
4080
177
      return theId;
4081
178
    }
4082
179
4083
180
    bool
4084
181
    canHandle(const std::string& arg) const
4085
182
    {
4086
183
      if (theNames.find(arg) != theNames.end()) {
4087
184
        return true;
4088
185
      }
4089
186
      return false;
4090
187
    }
4091
188
4092
189
    CommandArgInstance<Tuple>*
4093
190
    parse(const std::string& str) const
4094
191
    {
4095
192
      return theType->parse(str, this);
4096
193
    }
4097
194
4098
195
    bool
4099
196
    isVoid() const
4100
197
    {
4101
198
      return theType->isVoid();
4102
199
    }
4103
200
    
4104
201
    bool
4105
202
    isRequired() const
4106
203
    {
4107
204
      return theIsRequired;
4108
205
    }
4109
206
4110
207
    std::string
4111
208
    getName() const
4112
209
    {
4113
210
      return *(theNames.begin());
4114
211
    }
4115
212
4116
213
    std::string
4117
214
    getDescription() const
4118
215
    {
4119
216
      return theDescription;
4120
217
    }
4121
218
4122
219
    bool
4123
220
    isSet(Tuple& t) const
4124
221
    {
4125
222
      return theType->isSet(t);
4126
223
    }
4127
224
4128
225
  private:
4129
226
4130
227
    unsigned theId;
4131
228
    CommandArgType<Tuple>* theType;
4132
229
    std::set<std::string> theNames;
4133
230
    std::string theDescription;
4134
231
    bool theIsRequired;
4135
232
  };
4136
233
4137
234
} // namespace zorba
4138
235
} // namespace debugger
4139
236
4140
237
#endif // ZORBA_DEBUGGER_COMMAND_ARG_H
4141
0
238
4142
=== modified file 'bin/debugger/command_line_handler.cpp'
4143
--- bin/debug_client/command_line_handler.cpp	2011-07-01 01:53:24 +0000
4144
+++ bin/debugger/command_line_handler.cpp	2013-01-25 00:15:35 +0000
4145
@@ -1,4 +1,4 @@
4147
1
/*
1
  /*
4148
2
 * Copyright 2006-2008 The FLWOR Foundation.
2
 * Copyright 2006-2008 The FLWOR Foundation.
4149
3
 *
3
 *
4150
4
 * Licensed under the Apache License, Version 2.0 (the "License");
4
 * Licensed under the Apache License, Version 2.0 (the "License");
4151
@@ -23,225 +23,385 @@
4152
23
# define msleep Sleep
23
# define msleep Sleep
4153
24
#endif
24
#endif
4154
25
25
4156
26
namespace zorba { namespace debugclient {
26
#include "command_prompt.h"
4157
27
4158
28
4159
29
namespace zorba { namespace debugger {
4160
27
  
30
  
4161
28
  using namespace ::std;
4162
29
  using namespace ::ZORBA_TR1_NS;
31
  using namespace ::ZORBA_TR1_NS;
4163
30
  
32
  
4169
31
  CommandLineHandler::CommandLineHandler(unsigned short port,
33
CommandLineHandler::CommandLineHandler(
4170
32
                                         LockFreeConsumer<std::size_t>& aConsumer,
34
  unsigned short port,
4171
33
                                         LockFreeConsumer<bool>& aContinueQueue,
35
  LockFreeConsumer<std::size_t>& aConsumer,
4172
34
                                         EventHandler& aHandler,
36
  LockFreeConsumer<bool>& aContinueQueue,
4173
35
                                         CommandLine& aCommandLine)
37
  EventHandler* aHandler,
4174
38
  CommandPrompt* aCommandPrompt)
4175
36
  : theConsumer(aConsumer),
39
  : theConsumer(aConsumer),
4176
37
    theContinueQueue(aContinueQueue),
40
    theContinueQueue(aContinueQueue),
4180
38
    theClient(DebuggerClient::createDebuggerClient(&aHandler, port, "localhost")),
41
    theClient(DebuggerClient::createDebuggerClient(aHandler, port, "localhost")),
4181
39
    theCommandLine(aCommandLine),
42
    theCommandLine(aCommandPrompt),
4182
40
    theQuit(false), theContinue(false), theWaitFor(0)
43
    theQuit(false), theTerminated(true), theContinue(false), theWaitFor(0)
4183
41
  {
44
  {
4184
42
    addCommands();
45
    addCommands();
4185
43
  }
46
  }
4186
44
  
47
  
4190
45
  CommandLineHandler::~CommandLineHandler()
48
CommandLineHandler::~CommandLineHandler()
4191
46
  {
49
{
4192
47
  }
50
}
4193
48
  
51
  
4199
49
  void CommandLineHandler::execute()
52
void
4200
50
  {
53
CommandLineHandler::execute()
4201
51
    theClient->accept();
54
{
4202
52
    std::set<std::size_t> lIdList;
55
  theClient->accept();
4203
53
    do {
56
  std::set<std::size_t> lIdList;
4204
57
  do {
4205
58
    getNextId(lIdList);
4206
59
    while (lIdList.find(theWaitFor) == lIdList.end()) {
4207
54
      getNextId(lIdList);
60
      getNextId(lIdList);
4243
55
      while (!theQuit && lIdList.find(theWaitFor) == lIdList.end()) {
61
      msleep(20);
4244
56
        getNextId(lIdList);
62
    }
4245
57
        msleep(20);
63
    bool lCanQuit;
4246
58
      }
64
    while (!theContinueQueue.consume(lCanQuit)) {
4247
59
      while (!theContinueQueue.consume(theQuit)) {
65
      msleep(20);
4248
60
        msleep(20);
66
    }
4249
61
      }
67
    if (lCanQuit) {
4250
62
      theQuit = !theQuit;
68
      theTerminated = true;
4251
63
      if (!theQuit) {
69
    }
4252
64
        theCommandLine.execute();
70
    theCommandLine->execute();
4253
65
        while (theContinue) {
71
    while (theContinue) {
4254
66
          theContinue = false;
72
      theContinue = false;
4255
67
          theCommandLine.execute();
73
      theCommandLine->execute();
4256
68
        }
74
    }
4257
69
      }
75
  } while (!theQuit);
4258
70
    } while (!theQuit);
76
}
4259
71
  }
77
  
4260
72
  
78
void
4261
73
  void CommandLineHandler::getNextId(std::set<std::size_t>& aIdList)
79
CommandLineHandler::getNextId(std::set<std::size_t>& aIdList)
4262
74
  {
80
{
4263
75
    std::size_t result;
81
  std::size_t result;
4264
76
    if (theConsumer.consume(result)) {
82
  if (theConsumer.consume(result)) {
4265
77
      aIdList.insert(result);
83
    aIdList.insert(result);
4266
78
    }
84
  }
4267
79
  }
85
}
4268
80
  
86
4269
81
  template<>
87
template<>
4270
82
  void CommandLineHandler::handle<Status>(ZORBA_TR1_NS::tuple<> &t)
88
void
4271
83
  {
89
CommandLineHandler::handle<Status>(ZORBA_TR1_NS::tuple<> &t)
4272
84
    theWaitFor = theClient->status();
90
{
4273
85
  }
91
  theWaitFor = theClient->status();
4274
86
  
92
}
4275
87
  template<>
93
4276
88
  void CommandLineHandler::handle<Quit>(ZORBA_TR1_NS::tuple<> &t)
94
template<>
4277
89
  {
95
void
4278
96
CommandLineHandler::handle<Variables>(ZORBA_TR1_NS::tuple<> &t)
4279
97
{
4280
98
  theWaitFor = theClient->variables();
4281
99
}
4282
100
4283
101
template<>
4284
102
void
4285
103
CommandLineHandler::handle<Quit>(ZORBA_TR1_NS::tuple<> &t)
4286
104
{
4287
105
  if (!theTerminated) {
4288
90
    bool answered = false;
106
    bool answered = false;
4289
91
    while (!answered) {
107
    while (!answered) {
4290
92
      std::cout << "Do you really want to stop debugging and exit? (y/n) ";
108
      std::cout << "Do you really want to stop debugging and exit? (y/n) ";
4295
93
      char answer;
109
      std::string lAnswer;
4296
94
      std::cin >> answer;
110
      std::getline(std::cin, lAnswer);
4297
95
      std::cout << std::endl;
111
      if (lAnswer == "y" || lAnswer == "yes") {
4294
96
      if (answer == 'y') {
4298
97
        answered = true;
112
        answered = true;
4300
98
      } else if (answered == 'n') {
113
      } else if (lAnswer == "n" || lAnswer == "no") {
4301
99
        theContinue = true;
114
        theContinue = true;
4302
100
        return;
115
        return;
4303
101
      }
116
      }
4304
102
    }
117
    }
4450
103
    theWaitFor = theClient->stop();
118
  }
4451
104
    theClient->quit();
119
  theWaitFor = theClient->stop(true);
4452
105
  }
120
  theClient->quit();
4453
106
  
121
  theQuit = true;
4454
107
  template<>
122
}
4455
108
  void CommandLineHandler::handle<Run>(ZORBA_TR1_NS::tuple<> &t)
123
4456
109
  {
124
template<>
4457
110
    theWaitFor = theClient->run();
125
void
4458
111
  }
126
CommandLineHandler::handle<Run>(ZORBA_TR1_NS::tuple<> &t)
4459
112
  
127
{
4460
113
  template<>
128
  theTerminated = false;
4461
114
  void CommandLineHandler::handle<BreakpointSet>(std::tr1::tuple<bstring, bstring, bint> &t)
129
  theWaitFor = theClient->run();
4462
115
  {
130
}
4463
116
    DebuggerClient::BreakpointType lType = DebuggerClient::Line;
131
4464
117
    bool lEnabled = true;
132
template<>
4465
118
    if (get<0>(t).first) {
133
void
4466
119
      if (get<0>(t).second == "disabled") {
134
CommandLineHandler::handle<Stop>(ZORBA_TR1_NS::tuple<> &t)
4467
120
        lEnabled = false;
135
{
4468
121
      }
136
  theWaitFor = theClient->stop(false);
4469
122
    }
137
}
4470
123
    theWaitFor = theClient->breakpoint_set(lType,
138
4471
124
                                           lEnabled,
139
template<>
4472
125
                                           get<1>(t).second,
140
void
4473
126
                                           get<2>(t).second);
141
CommandLineHandler::handle<BreakpointSet>(std::tr1::tuple<bstring, bstring, bint> &aTuple)
4474
127
  }
142
{
4475
128
  
143
  DebuggerClient::BreakpointType lType = DebuggerClient::Line;
4476
129
  template<>
144
  bool lEnabled = true;
4477
130
  void CommandLineHandler::handle<BreakpointGet>(tuple<bint> &aTuple)
145
  if (get<0>(aTuple).first) {
4478
131
  {
146
    if (get<0>(aTuple).second == "disabled") {
4479
132
    theWaitFor = theClient->breakpoint_get(get<0>(aTuple).second);
147
      lEnabled = false;
4480
133
  }
148
    }
4481
134
  
149
  }
4482
135
  template<>
150
  theWaitFor = theClient->breakpoint_set(lType,
4483
136
  void CommandLineHandler::handle<BreakpointDel>(tuple<bint> &aTuple)
151
                                          lEnabled,
4484
137
  {
152
                                          get<1>(aTuple).second,
4485
138
    theWaitFor = theClient->breakpoint_remove(get<0>(aTuple).second);
153
                                          get<2>(aTuple).second);
4486
139
  }
154
}
4487
140
  
155
  
4488
141
  template<>
156
template<>
4489
142
  void CommandLineHandler::handle<BreakpointList>(tuple<> &t)
157
void
4490
143
  {
158
CommandLineHandler::handle<BreakpointGet>(tuple<bint> &aTuple)
4491
144
    theWaitFor = theClient->breakpoint_list();
159
{
4492
145
  }
160
  theWaitFor = theClient->breakpoint_get(get<0>(aTuple).second);
4493
146
  
161
}
4494
147
  template<>
162
  
4495
148
  void CommandLineHandler::handle<StackDepth>(tuple<> &t)
163
template<>
4496
149
  {
164
void
4497
150
    theWaitFor = theClient->stack_depth();
165
CommandLineHandler::handle<BreakpointRemove>(tuple<bint> &aTuple)
4498
151
  }
166
{
4499
152
  
167
  theWaitFor = theClient->breakpoint_remove(get<0>(aTuple).second);
4500
153
  template<>
168
}
4501
154
  void CommandLineHandler::handle<StackGet>(tuple<bint> &aTuple)
169
  
4502
155
  {
170
template<>
4503
156
    if (get<0>(aTuple).first) {
171
void
4504
157
      theWaitFor = theClient->stack_get(get<0>(aTuple).second);
172
CommandLineHandler::handle<BreakpointList>(tuple<> &aTuple)
4505
158
    } else {
173
{
4506
159
      theWaitFor = theClient->stack_get();
174
  theWaitFor = theClient->breakpoint_list();
4507
160
    }
175
}
4508
161
  }
176
  
4509
162
  
177
template<>
4510
163
  template<>
178
void
4511
164
  void CommandLineHandler::handle<ContextNames>(tuple<>& aTuple)
179
CommandLineHandler::handle<StackDepth>(tuple<> &aTuple)
4512
165
  {
180
{
4513
166
    theWaitFor = theClient->context_names();
181
  theWaitFor = theClient->stack_depth();
4514
167
  }
182
}
4515
168
  
183
  
4516
169
  template<>
184
template<>
4517
170
  void CommandLineHandler::handle<ContextGet>(tuple<bint> &aTuple)
185
void
4518
171
  {
186
CommandLineHandler::handle<StackGet>(tuple<bint> &aTuple)
4519
172
    if (get<0>(aTuple).first)
187
{
4520
173
      theWaitFor = theClient->context_get(get<0>(aTuple).second);
188
  if (get<0>(aTuple).first) {
4521
174
    else
189
    theWaitFor = theClient->stack_get(get<0>(aTuple).second);
4522
175
      theWaitFor = theClient->context_get();
190
  } else {
4523
176
  }
191
    theWaitFor = theClient->stack_get();
4524
177
  
192
  }
4525
178
  template<>
193
}
4526
179
  void CommandLineHandler::handle<Eval>(tuple<bstring>& aTuple)
194
  
4527
180
  {
195
template<>
4528
181
    theWaitFor = theClient->eval(get<0>(aTuple).second);
196
void
4529
182
  }
197
CommandLineHandler::handle<ContextNames>(tuple<>& aTuple)
4530
183
  
198
{
4531
184
  void CommandLineHandler::addCommands()
199
  theWaitFor = theClient->context_names();
4532
185
  {
200
}
4533
186
    theCommandLine << createCommand<Status>(tuple<>(), "status", *this,
201
  
4534
187
                                            "Gets the status of the server");
202
template<>
4535
188
    theCommandLine << createCommand<Quit>(tuple<>(), "quit", *this,
203
void CommandLineHandler::handle<ContextGet>(tuple<bint, bint> &aTuple)
4536
189
                                          "Stops debugging and quits the client");
204
{
4537
190
    theCommandLine << createCommand<Run>(tuple<>(), "run", *this, "Run the Query");
205
  int lDepth = -1;
4538
191
    {
206
  int lContext = -1;
4539
192
      Command<CommandLineHandler, tuple<bstring, bstring, bint>, BreakpointSet>* lCommand =
207
4540
193
      createCommand<BreakpointSet>(tuple<bstring, bstring, bint>(), "break", *this, "Set a breakpoint");
208
  if (get<0>(aTuple).first) {
4541
194
      (*lCommand)(0, "s", createArgType<tuple<bstring, bstring, bint>, std::string, 0>(tuple<bstring, bstring, bint>()),
209
    lDepth = get<0>(aTuple).second;
4542
195
                  "breakpoint state (enabled or disabled - default: enabled)", false);
210
  }
4543
196
      (*lCommand)(1, "f", createArgType<tuple<bstring, bstring, bint>, std::string, 1>(tuple<bstring, bstring, bint>()),
211
  if (get<1>(aTuple).first) {
4544
197
                  "The name of the file where to stop", true);
212
    lContext  = get<1>(aTuple).second;
4545
198
      (*lCommand)(2, "l", createArgType<tuple<bstring, bstring, bint>, int, 2>(tuple<bstring, bstring, bint>()),
213
  }
4546
199
                  "The line number", true);
214
  theWaitFor = theClient->context_get(lDepth, lContext);
4547
200
      
215
}
4548
201
      theCommandLine << lCommand;
216
4549
202
    }
217
template<>
4550
203
    {
218
void CommandLineHandler::handle<Source>(tuple<bint, bint, bstring> &aTuple)
4551
204
      Command<CommandLineHandler, tuple<bint>, BreakpointGet>* lCommand
219
{
4552
205
      = createCommand<BreakpointGet>(tuple<bint>(), "binfo", *this, 
220
  theWaitFor = theClient->source(
4553
206
                                   "Get information about a given breakpoint");
221
    get<2>(aTuple).second,
4554
207
      (*lCommand)(0, "i", createArgType<tuple<bint>, int, 0>(tuple<bint>()),
222
    get<0>(aTuple).second,
4555
208
                  "The id of the breakpoint", true);
223
    get<1>(aTuple).second);
4556
209
      
224
}
4557
210
      theCommandLine << lCommand;
225
  
4558
211
    }
226
template<>
4559
212
    {
227
void CommandLineHandler::handle<Eval>(tuple<bstring>& aTuple)
4560
213
      Command<CommandLineHandler, tuple<bint>, BreakpointDel>* lCommand
228
{
4561
214
      = createCommand<BreakpointDel>(tuple<bint>(), "bdel", *this, "Delete a breakpoint with a given id");
229
  theWaitFor = theClient->eval(get<0>(aTuple).second);
4562
215
      (*lCommand)(0, "i", createArgType<tuple<bint>, int, 0>(tuple<bint>()), "The id of the breakpoint", true);
230
}
4563
216
      
231
4564
217
      theCommandLine << lCommand;
232
template<>
4565
218
    }
233
void
4566
219
    theCommandLine << createCommand<BreakpointList>(tuple<>(), "blist", *this, "List all set breakpoints");
234
CommandLineHandler::handle<StepIn>(ZORBA_TR1_NS::tuple<> &t)
4567
220
    theCommandLine << createCommand<StackDepth>(tuple<>(), "sdepth", *this, "Get the depth of the stack");
235
{
4568
221
    {
236
  theTerminated = false;
4569
222
      Command<CommandLineHandler, tuple<bint>, StackGet>* lCommand
237
  theWaitFor = theClient->step_into();
4570
223
      = createCommand<StackGet>(tuple<bint>(), "sget", *this, "Get information about one or all stack frames");
238
}
4571
224
      (*lCommand)(0, "d", createArgType<tuple<bint>, int, 0>(tuple<bint>()), "The stack entry two show (show all if not provided)", false);
239
4572
225
      theCommandLine << lCommand;
240
template<>
4573
226
    }
241
void
4574
227
    theCommandLine << createCommand<ContextNames>(tuple<>(), "cnames", *this, "Get the names of the avilable contexts");
242
CommandLineHandler::handle<StepOut>(ZORBA_TR1_NS::tuple<> &t)
4575
228
    {
243
{
4576
229
      Command<CommandLineHandler, tuple<bint>, ContextGet>* lCommand
244
  theWaitFor = theClient->step_out();
4577
230
      = createCommand<ContextGet>(tuple<bint>(), "cget", *this, "Get a context");
245
}
4578
231
      
246
4579
232
      (*lCommand)(0, "c", createArgType<tuple<bint>, int, 0>(tuple<bint>()), "The id of the context", false);
247
template<>
4580
233
      
248
void
4581
234
      theCommandLine << lCommand;
249
CommandLineHandler::handle<StepOver>(ZORBA_TR1_NS::tuple<> &t)
4582
235
    }
250
{
4583
236
    {
251
  theTerminated = false;
4584
237
      Command<CommandLineHandler, tuple<bstring>, Eval>* lCommand
252
  theWaitFor = theClient->step_over();
4585
238
      = createCommand<Eval>(tuple<bstring>(), "eval", *this, "Evaluate a function");
253
}
4586
239
      
254
4587
240
      (*lCommand)(0, "c", createArgType<tuple<bstring>, std::string, 0>(tuple<bstring>()), "The command to evaluate", true);
255
void
4588
241
      
256
CommandLineHandler::addCommands()
4589
242
      theCommandLine << lCommand;
257
{
4590
243
    }
258
  typedef tuple<> TUPLE;
4591
244
  }
259
  typedef tuple<bint> TUPLE_INT;
4592
245
  
260
  typedef tuple<bstring> TUPLE_STR;
4593
246
}} // namespace zorba::debugclient
261
  typedef tuple<bint, bint> TUPLE_INT_INT;
4594
247
262
  typedef tuple<bstring, bstring, bint> TUPLE_STR_STR_INT;
4595
263
  typedef tuple<bint, bint, bstring> TUPLE_INT_INT_STR;
4596
264
4597
265
  // DBGP: status
4598
266
  *theCommandLine << createCommand<Status>(TUPLE(), "status", *this, "Gets the status of the server");
4599
267
4600
268
  // ALIAS: variables (context_get -c -1)
4601
269
  {
4602
270
    std::set<std::string> lAliases;
4603
271
    lAliases.insert("vars");
4604
272
    *theCommandLine << createCommand<Variables>(TUPLE(), "variables", lAliases, *this, "Gets the variables visible in the current scope");
4605
273
  }
4606
274
4607
275
  // META: quit
4608
276
  *theCommandLine << createCommand<Quit>(TUPLE(), "quit", *this, "Stops debugging and quits the client");
4609
277
4610
278
  // DBGP: run
4611
279
  *theCommandLine << createCommand<Run>(TUPLE(), "run", *this, "Run the query");
4612
280
4613
281
  // DBGP: stop
4614
282
  *theCommandLine << createCommand<Stop>(TUPLE(), "stop", *this, "Stop the query");
4615
283
4616
284
  // DBGP: breakpoint_set
4617
285
  {
4618
286
    std::set<std::string> lAliases;
4619
287
    lAliases.insert("break");
4620
288
    Command<CommandLineHandler, TUPLE_STR_STR_INT, BreakpointSet>* lCommand =
4621
289
      createCommand<BreakpointSet>(TUPLE_STR_STR_INT(), "bset", lAliases, *this, "Set a breakpoint");
4622
290
4623
291
    lCommand->addArgument(0, "s", createArgType<TUPLE_STR_STR_INT, std::string, 0>(TUPLE_STR_STR_INT()), "breakpoint state (optional, 'enabled' or 'disabled', default: enabled)", false);
4624
292
    lCommand->addArgument(1, "f", createArgType<TUPLE_STR_STR_INT, std::string, 1>(TUPLE_STR_STR_INT()), "name of the file where to stop", true);
4625
293
    lCommand->addArgument(2, "l", createArgType<TUPLE_STR_STR_INT, int, 2>(TUPLE_STR_STR_INT()), "line number", true);
4626
294
      
4627
295
    *theCommandLine << lCommand;
4628
296
  }
4629
297
4630
298
  // DBGP: breakpoint_get
4631
299
  {
4632
300
    Command<CommandLineHandler, TUPLE_INT, BreakpointGet>* lCommand =
4633
301
      createCommand<BreakpointGet>(TUPLE_INT(), "bget", *this, "Get information about a given breakpoint");
4634
302
4635
303
    lCommand->addArgument(0, "d", createArgType<TUPLE_INT, int, 0>(TUPLE_INT()), "breakpoint ID", true);
4636
304
      
4637
305
    *theCommandLine << lCommand;
4638
306
  }
4639
307
4640
308
  // DBGP: breakpoint_remove
4641
309
  {
4642
310
    std::set<std::string> lAliases;
4643
311
    lAliases.insert("clear");
4644
312
    lAliases.insert("delete");
4645
313
    Command<CommandLineHandler, TUPLE_INT, BreakpointRemove>* lCommand = 
4646
314
      createCommand<BreakpointRemove>(TUPLE_INT(), "bremove", lAliases, *this, "Delete a breakpoint");
4647
315
4648
316
    lCommand->addArgument(0, "d", createArgType<TUPLE_INT, int, 0>(TUPLE_INT()), "breakpoint ID", true);
4649
317
      
4650
318
    *theCommandLine << lCommand;
4651
319
  }
4652
320
4653
321
  // DBGP: breakpoint_list
4654
322
  *theCommandLine << createCommand<BreakpointList>(TUPLE(), "blist", *this, "List all set breakpoints");
4655
323
4656
324
  // DBGP: stack_depth
4657
325
  *theCommandLine << createCommand<StackDepth>(TUPLE(), "sdepth", *this, "Get the depth of the stack");
4658
326
4659
327
  // DBGP: stack_get
4660
328
  {
4661
329
    Command<CommandLineHandler, TUPLE_INT, StackGet>* lCommand =
4662
330
      createCommand<StackGet>(TUPLE_INT(), "sget", *this, "Get information about one or all stack frames");
4663
331
4664
332
    lCommand->addArgument(0, "d", createArgType<TUPLE_INT, int, 0>(TUPLE_INT()), "stack frame to show: 0 for current stack frame, N for the main module (optional, all frames are shown if not provided)", false);
4665
333
4666
334
    *theCommandLine << lCommand;
4667
335
  }
4668
336
4669
337
  // DBGP: context_names
4670
338
  *theCommandLine << createCommand<ContextNames>(tuple<>(), "cnames", *this, "Get the names of the avilable contexts");
4671
339
  // the DBGP -d arguments for this command is omitted since we always have/return: 0 - Local, 1 - Global
4672
340
4673
341
  // DBGP: context_get
4674
342
  {
4675
343
    Command<CommandLineHandler, TUPLE_INT_INT, ContextGet>* lCommand =
4676
344
      createCommand<ContextGet>(TUPLE_INT_INT(), "cget", *this, "Get a context (list variables in this context)");
4677
345
4678
346
    lCommand->addArgument(0, "d", createArgType<TUPLE_INT_INT, int, 0>(TUPLE_INT_INT()), "stack depth (optional, default: 0)", false);
4679
347
    lCommand->addArgument(0, "c", createArgType<TUPLE_INT_INT, int, 1>(TUPLE_INT_INT()), "context ID: 0 for Local, 1 for Global (optional, default: 0)", false);
4680
348
4681
349
    *theCommandLine << lCommand;
4682
350
  }
4683
351
4684
352
  // DBGP: source
4685
353
  {
4686
354
    std::set<std::string> lAliases;
4687
355
    lAliases.insert("list");
4688
356
    Command<CommandLineHandler, TUPLE_INT_INT_STR, Source>* lCommand =
4689
357
      createCommand<Source>(TUPLE_INT_INT_STR(), "source", lAliases, *this, "List source code");
4690
358
4691
359
    lCommand->addArgument(0, "b", createArgType<TUPLE_INT_INT_STR, int, 0>(TUPLE_INT_INT_STR()), "begin line (optional, default: first line)", false);
4692
360
    lCommand->addArgument(1, "e", createArgType<TUPLE_INT_INT_STR, int, 1>(TUPLE_INT_INT_STR()), "end line (optional, default: last line)", false);
4693
361
    lCommand->addArgument(2, "f", createArgType<TUPLE_INT_INT_STR, std::string, 2>(TUPLE_INT_INT_STR()), "file URI (optional, default: the file in the top-most stack frame during execution, main module otherwise)", false);
4694
362
4695
363
    *theCommandLine << lCommand;
4696
364
  }
4697
365
4698
366
  // DBGP: eval
4699
367
  {
4700
368
    std::set<std::string> lAliases;
4701
369
    lAliases.insert("print");
4702
370
    Command<CommandLineHandler, TUPLE_STR, Eval>* lCommand =
4703
371
      createCommand<Eval>(TUPLE_STR(), "eval", lAliases, *this, "Evaluate an expression");
4704
372
4705
373
    // TODO: this argument should not be here at all. Eval has the form: eval -i transaction_id -- {DATA}
4706
374
    // Eval should be called with a command like: eval 1 + 3
4707
375
    // - no need for an argument name
4708
376
    // - everything following the fist contiguous set of whitespaces are sent as string
4709
377
    lCommand->addArgument(0, "c", createArgType<TUPLE_STR, std::string, 0>(TUPLE_STR()), "expression to evaluate", true);
4710
378
      
4711
379
    *theCommandLine << lCommand;
4712
380
  }
4713
381
4714
382
  // DBGP: step_in
4715
383
  {
4716
384
    std::set<std::string> lAliases;
4717
385
    lAliases.insert("step");
4718
386
    lAliases.insert("s");
4719
387
    *theCommandLine << createCommand<StepIn>(TUPLE(), "in", lAliases, *this, "Step in");
4720
388
  }
4721
389
4722
390
  // DBGP: step_out
4723
391
  {
4724
392
    std::set<std::string> lAliases;
4725
393
    lAliases.insert("finish");
4726
394
    *theCommandLine << createCommand<StepOut>(TUPLE(), "out", lAliases, *this, "Step out");
4727
395
  }
4728
396
4729
397
  // DBGP: step_over
4730
398
  {
4731
399
    std::set<std::string> lAliases;
4732
400
    lAliases.insert("next");
4733
401
    lAliases.insert("n");
4734
402
    *theCommandLine << createCommand<StepOver>(TUPLE(), "over", lAliases, *this, "Step over");
4735
403
  }
4736
404
}
4737
405
  
4738
406
} // namespace zorba
4739
407
} // namespace debugger
4740
248
408
4741
=== modified file 'bin/debugger/command_line_handler.h'
4742
--- bin/debug_client/command_line_handler.h	2011-07-01 01:53:24 +0000
4743
+++ bin/debugger/command_line_handler.h	2013-01-25 00:15:35 +0000
4744
@@ -14,46 +14,71 @@
4745
14
 * limitations under the License.
14
 * limitations under the License.
4746
15
 */
15
 */
4747
16
#pragma once
16
#pragma once
4748
17
#ifndef ZORBA_DEBUGGER_COMMAND_LINE_HANDLER_H
4749
18
#define ZORBA_DEBUGGER_COMMAND_LINE_HANDLER_H
4750
17
19
4751
18
#include <set>
20
#include <set>
4752
19
#include <cassert>
21
#include <cassert>
4753
22
4754
20
#include <zorba/debugger_client.h>
23
#include <zorba/debugger_client.h>
4756
21
#include "debug_command.h"
24
4757
25
#include "command.h"
4758
22
#include "event_handler.h"
26
#include "event_handler.h"
4759
23
27
4762
24
namespace zorba { namespace debugclient {
28
4763
25
  
29
namespace zorba { namespace debugger {
4764
30
4765
31
  class CommandPrompt;
4766
32
4767
26
  enum Commands {
33
  enum Commands {
4768
27
    Status,
34
    Status,
4769
35
    Variables,
4770
36
    Quit,
4771
28
    Run,
37
    Run,
4772
38
    Stop,
4773
29
    BreakpointSet,
39
    BreakpointSet,
4774
30
    BreakpointGet,
40
    BreakpointGet,
4776
31
    BreakpointDel,
41
    BreakpointRemove,
4777
32
    BreakpointList,
42
    BreakpointList,
4778
33
    StackDepth,
43
    StackDepth,
4779
34
    StackGet,
44
    StackGet,
4780
35
    ContextNames,
45
    ContextNames,
4781
36
    ContextGet,
46
    ContextGet,
4782
47
    Source,
4783
37
    Eval,
48
    Eval,
4785
38
    Quit
49
    StepIn,
4786
50
    StepOut,
4787
51
    StepOver
4788
39
  };
52
  };
4789
40
  
53
  
4791
41
  class CommandLineHandler {
54
class CommandLineHandler
4792
55
{
4793
42
  private:
56
  private:
4794
57
4795
43
    typedef std::pair<bool, std::string> bstring;
58
    typedef std::pair<bool, std::string> bstring;
4796
44
    typedef std::pair<bool, int> bint;
59
    typedef std::pair<bool, int> bint;
4797
60
4798
45
  public:
61
  public:
4804
46
    CommandLineHandler(unsigned short port,
62
4805
47
                       LockFreeConsumer<std::size_t>& aConsumer,
63
    CommandLineHandler(
4806
48
                       LockFreeConsumer<bool>& aContinueQueue,
64
      unsigned short port,
4807
49
                       EventHandler& aHandler,
65
      LockFreeConsumer<std::size_t>& aConsumer,
4808
50
                       CommandLine& aCommandLine);
66
      LockFreeConsumer<bool>& aContinueQueue,
4809
67
      EventHandler* aHandler,
4810
68
      CommandPrompt* aCommandPrompt);
4811
69
4812
51
    ~CommandLineHandler();
70
    ~CommandLineHandler();
4813
71
4814
52
  public:
72
  public:
4815
53
    void execute();
73
    void execute();
4816
74
  
4817
54
  public: // Handlers
75
  public: // Handlers
4818
76
4819
55
    template<int>
77
    template<int>
4821
56
    void handle(ZORBA_TR1_NS::tuple<>& aTuple) { assert(false); }
78
    void handle(ZORBA_TR1_NS::tuple<>& aTuple)
4822
79
    {
4823
80
      assert(false);
4824
81
    }
4825
57
    
82
    
4826
58
    template<int>
83
    template<int>
4827
59
    void handle(ZORBA_TR1_NS::tuple<bstring, bstring, bint>& t)
84
    void handle(ZORBA_TR1_NS::tuple<bstring, bstring, bint>& t)
4828
@@ -62,63 +87,96 @@
4829
62
    }
87
    }
4830
63
    
88
    
4831
64
    template<int>
89
    template<int>
4832
90
    void handle(ZORBA_TR1_NS::tuple<bint, bint, bstring>& t)
4833
91
    {
4834
92
      assert(false);
4835
93
    }
4836
94
    
4837
95
    template<int>
4838
65
    void handle(ZORBA_TR1_NS::tuple<bint>& aTuple)
96
    void handle(ZORBA_TR1_NS::tuple<bint>& aTuple)
4839
66
    {
97
    {
4840
67
      assert(false);
98
      assert(false);
4841
68
    }
99
    }
4842
69
    
100
    
4843
70
    template<int>
101
    template<int>
4844
102
    void handle(ZORBA_TR1_NS::tuple<bint, bint>& aTuple)
4845
103
    {
4846
104
      assert(false);
4847
105
    }
4848
106
    
4849
107
    template<int>
4850
71
    void handle(ZORBA_TR1_NS::tuple<bstring>& aTuple)
108
    void handle(ZORBA_TR1_NS::tuple<bstring>& aTuple)
4851
72
    {
109
    {
4852
73
      assert(false);
110
      assert(false);
4853
74
    }
111
    }
4854
112
4855
75
  private:
113
  private:
4863
76
    LockFreeConsumer<std::size_t>& theConsumer;
114
    LockFreeConsumer<std::size_t>&  theConsumer;
4864
77
    LockFreeConsumer<bool>& theContinueQueue;
115
    LockFreeConsumer<bool>&         theContinueQueue;
4865
78
    DebuggerClient* theClient;
116
    DebuggerClient*                 theClient;
4866
79
    CommandLine& theCommandLine;
117
    CommandPrompt*                  theCommandLine;
4867
80
    bool theQuit;
118
    bool                            theQuit;
4868
81
    bool theContinue;
119
    bool                            theTerminated;
4869
82
    std::size_t theWaitFor;
120
    bool                            theContinue;
4870
121
    std::size_t                     theWaitFor;
4871
122
4872
83
  private:
123
  private:
4873
84
    void getNextId(std::set<std::size_t>& aIdList);
124
    void getNextId(std::set<std::size_t>& aIdList);
4874
85
    void addCommands();
125
    void addCommands();
4914
86
  };
126
};
4915
87
  
127
4916
88
  template<>
128
template<>
4917
89
  void CommandLineHandler::handle<Status> (ZORBA_TR1_NS::tuple<>& t);
129
void CommandLineHandler::handle<Status> (ZORBA_TR1_NS::tuple<>& t);
4918
90
  
130
4919
91
  template<>
131
template<>
4920
92
  void CommandLineHandler::handle<Quit> (ZORBA_TR1_NS::tuple<>& t);
132
void CommandLineHandler::handle<Quit> (ZORBA_TR1_NS::tuple<>& t);
4921
93
  
133
4922
94
  template<>
134
template<>
4923
95
  void CommandLineHandler::handle<Run> (ZORBA_TR1_NS::tuple<> &t);
135
void CommandLineHandler::handle<Run> (ZORBA_TR1_NS::tuple<> &t);
4924
96
  
136
4925
97
  template<>
137
template<>
4926
98
  void CommandLineHandler::handle<StackDepth> (ZORBA_TR1_NS::tuple<>& t);
138
void CommandLineHandler::handle<Stop> (ZORBA_TR1_NS::tuple<> &t);
4927
99
  
139
4928
100
  template<>
140
template<>
4929
101
  void CommandLineHandler::handle<BreakpointList> (ZORBA_TR1_NS::tuple<>& aTuple);
141
void CommandLineHandler::handle<StackDepth> (ZORBA_TR1_NS::tuple<>& t);
4930
102
  
142
4931
103
  template<>
143
template<>
4932
104
  void CommandLineHandler::handle<BreakpointSet> (ZORBA_TR1_NS::tuple<bstring, bstring, bint> &t);
144
void CommandLineHandler::handle<BreakpointList> (ZORBA_TR1_NS::tuple<>& aTuple);
4933
105
  
145
  
4934
106
  template<>
146
template<>
4935
107
  void CommandLineHandler::handle<BreakpointGet> (ZORBA_TR1_NS::tuple<bint>& aTuple);
147
void CommandLineHandler::handle<BreakpointSet> (ZORBA_TR1_NS::tuple<bstring, bstring, bint> &t);
4936
108
  
148
  
4937
109
  template<>
149
template<>
4938
110
  void CommandLineHandler::handle<BreakpointDel>(ZORBA_TR1_NS::tuple<bint> &aTuple);
150
void CommandLineHandler::handle<BreakpointGet> (ZORBA_TR1_NS::tuple<bint>& aTuple);
4939
111
  
151
  
4940
112
  template<>
152
template<>
4941
113
  void CommandLineHandler::handle<StackGet> (ZORBA_TR1_NS::tuple<bint>& aTuple);
153
void CommandLineHandler::handle<BreakpointRemove>(ZORBA_TR1_NS::tuple<bint> &aTuple);
4942
114
  
154
  
4943
115
  template<>
155
template<>
4944
116
  void CommandLineHandler::handle<ContextNames>(ZORBA_TR1_NS::tuple<> &aTuple);
156
void CommandLineHandler::handle<StackGet> (ZORBA_TR1_NS::tuple<bint>& aTuple);
4945
117
  
157
  
4946
118
  template<>
158
template<>
4947
119
  void CommandLineHandler::handle<ContextGet>(ZORBA_TR1_NS::tuple<bint> &aTuple);
159
void CommandLineHandler::handle<ContextNames>(ZORBA_TR1_NS::tuple<> &aTuple);
4948
120
  
160
  
4949
121
  template<>
161
template<>
4950
122
  void CommandLineHandler::handle<Eval>(ZORBA_TR1_NS::tuple<bstring>& aTuple);
162
void CommandLineHandler::handle<ContextGet>(ZORBA_TR1_NS::tuple<bint, bint> &aTuple);
4951
123
  
163
  
4952
124
}} // close namespaces zorba::debugclient
164
template<>
4953
165
void CommandLineHandler::handle<Source>(ZORBA_TR1_NS::tuple<bint, bint, bstring> &aTuple);
4954
166
  
4955
167
template<>
4956
168
void CommandLineHandler::handle<Eval>(ZORBA_TR1_NS::tuple<bstring>& aTuple);
4957
169
4958
170
template<>
4959
171
void CommandLineHandler::handle<StepIn> (ZORBA_TR1_NS::tuple<> &t);
4960
172
4961
173
template<>
4962
174
void CommandLineHandler::handle<StepOut> (ZORBA_TR1_NS::tuple<> &t);
4963
175
4964
176
template<>
4965
177
void CommandLineHandler::handle<StepOver> (ZORBA_TR1_NS::tuple<> &t);
4966
178
4967
179
} // namespace zorba
4968
180
} // namespace debugger
4969
181
4970
182
#endif // ZORBA_DEBUGGER_COMMAND_LINE_HANDLER_H
4971
125
183
4972
=== added file 'bin/debugger/command_prompt.cpp'
4973
--- bin/debugger/command_prompt.cpp	1970-01-01 00:00:00 +0000
4974
+++ bin/debugger/command_prompt.cpp	2013-01-25 00:15:35 +0000
4975
@@ -0,0 +1,286 @@
4976
1
/*
4977
2
 * Copyright 2006-2008 The FLWOR Foundation.
4978
3
 *
4979
4
 * Licensed under the Apache License, Version 2.0 (the "License");
4980
5
 * you may not use this file except in compliance with the License.
4981
6
 * You may obtain a copy of the License at
4982
7
 * 
4983
8
 * http://www.apache.org/licenses/LICENSE-2.0
4984
9
 *
4985
10
 * Unless required by applicable law or agreed to in writing, software
4986
11
 * distributed under the License is distributed on an "AS IS" BASIS,
4987
12
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
4988
13
 * See the License for the specific language governing permissions and
4989
14
 * limitations under the License.
4990
15
 */
4991
16
#include "command_prompt.h"
4992
17
4993
18
#include <string>
4994
19
#include <vector>
4995
20
#include <map>
4996
21
#include <iostream>
4997
22
4998
23
#include "command.h"
4999
24
5000
25
Reviewer	Review Type	Date Requested	Status
Zorba Coders		2013-01-23	Pending
Review via email: mp+144528@code.launchpad.net