Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/3111_encryption_transform_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidnich
davidnich committed Nov 16, 2018
2 parents b549621 + 5f0f533 commit e104600
Show file tree
Hide file tree
Showing 838 changed files with 103,328 additions and 73,806 deletions.
9 changes: 8 additions & 1 deletion .gitignore
View file
Expand Up @@ -60,6 +60,7 @@ lib/qpp
lib/qpp.exe
lib/qpp_native
lib/*.dox.h
lib/*.qtest
lib/Pseudo_QC_*.cpp
lib/QC_*.cpp
lib/qc_errno.cpp
Expand Down Expand Up @@ -96,11 +97,17 @@ modules/astparser/src/ast_parser.cpp
modules/astparser/src/ast_scanner.cpp
modules/astparser/src/QC_*.cpp
modules/astparser/src/ql_ast.cpp
modules/astparser/src/*.qtest

# module-reflection
modules/reflection/src/QC_*.cpp
modules/reflection/src/QC_*.qtest

# Doxygen generated files
docs
*.dox.*
*.dox.h
doxygen/lang/*.dox
doxygen/qlib/*.qm
Doxyfile
Doxyfile.???*
*.tag
Expand Down
3 changes: 2 additions & 1 deletion .jenkins.prop
View file
@@ -1,2 +1,3 @@
QORE_BRANCH_NAME=0.8.13
QORE_BRANCH_NAME=develop


80 changes: 47 additions & 33 deletions CMakeLists.txt
View file
Expand Up @@ -11,9 +11,15 @@ option(QORE_RUNTIME_THREAD_STACK_TRACE
ON)

set(VERSION_MAJOR 0)
set(VERSION_MINOR 8)
set(VERSION_SUB 13)
set(VERSION_PATCH 9)
set(VERSION_MINOR 9)
set(VERSION_SUB 0)

STRING(LENGTH ${VERSION_SUB} SUB_LEN)
if (${SUB_LEN} EQUAL 1)
set(VERSION_FORMATTED_SUB 0${VERSION_SUB})
else()
set(VERSION_FORMATTED_SUB ${VERSION_SUB})
endif()

if(DEFINED VERSION_PATCH)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUB}.${VERSION_PATCH})
Expand Down Expand Up @@ -53,6 +59,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/include/qore )
include(CheckIncludeFiles)
include(GNUInstallDirs)

# issue #2994: ensure that the arch-specific libdir is used on Debian/Ubuntu
check_libdir_arch()

set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix ${CMAKE_INSTALL_PREFIX})
set(myprefix ${CMAKE_INSTALL_PREFIX})
Expand Down Expand Up @@ -103,6 +112,7 @@ set(LIBQORE_QPP_SRC
lib/QC_InputStreamLineIterator.qpp
lib/QC_SingleValueIterator.qpp
lib/QC_AbstractDatasource.qpp
lib/QC_AbstractSQLStatement.qpp
lib/QC_RangeIterator.qpp
lib/QC_Datasource.qpp
lib/QC_DatasourcePool.qpp
Expand All @@ -129,6 +139,7 @@ set(LIBQORE_QPP_SRC
lib/QC_SSLCertificate.qpp
lib/QC_SSLPrivateKey.qpp
lib/QC_ThreadPool.qpp
lib/QC_StreamBase.qpp
lib/QC_InputStream.qpp
lib/QC_BinaryInputStream.qpp
lib/QC_StringInputStream.qpp
Expand All @@ -150,6 +161,7 @@ set(LIBQORE_QPP_SRC
lib/QC_TransformOutputStream.qpp
lib/QC_StdoutOutputStream.qpp
lib/QC_StderrOutputStream.qpp
lib/QC_Serializable.qpp
lib/ql_misc.qpp
lib/ql_compression.qpp
lib/ql_thread.qpp
Expand Down Expand Up @@ -301,9 +313,11 @@ qore_search_libs(LIBQORE_LIBS gethostbyname nsl)
qore_search_libs(LIBQORE_LIBS clock_gettime rt)

set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${LIBQORE_LIBS})
qore_check_funcs(access alarm atoll bzero chown clock_gettime doprnt exp2 floor fork fsync getaddrinfo getegid geteuid getgid getgrgid_r getgrnam_r getgroups gethostbyaddr gethostbyname gethostname getnameinfo getppid getpwnam_r getpwuid_r getsockopt gettimeofday getuid glob gmtime_r inet_ntop inet_pton isblank kill lchown localtime_r lstat memmem memmove memset mkfifo mkfifo nanosleep poll pthread_attr_getstacksize putenv random readlink realloc realpath regcomp round select setegid setegid setenv seteuid seteuid setgid setgroups setsid setsockopt setuid setuid sleep socket strcasecmp strcasestr strchr strdup strerror strncasecmp strspn strstr strtoll strtol symlink system tbbmalloc timegm unsetenv usleep vfork vprintf)
qore_check_funcs(access alarm atoll bzero chown clock_gettime doprnt exp2 floor fork fsync getaddrinfo getegid geteuid getgid getgrgid_r getgrnam_r getgroups gethostbyaddr gethostbyname gethostname getifaddrs getnameinfo getppid getpwnam_r getpwuid_r getsockopt gettimeofday getuid glob gmtime_r inet_ntop inet_pton isblank kill lchown localtime_r lstat memmem memmove memset mkfifo mkfifo nanosleep poll pthread_attr_getstacksize putenv random readlink realloc realpath regcomp round select setegid setegid setenv seteuid seteuid setgid setgroups setsid setsockopt setuid setuid sleep socket strcasecmp strcasestr strchr strdup strerror strncasecmp strspn strstr strtoll strtol symlink system tbbmalloc timegm unsetenv usleep vfork vprintf)
qore_func_strerror_r()
qore_gethost_checks()
qore_find_pthread_setname_np()
qore_find_pthread_getattr_np()
unset(CMAKE_REQUIRED_LIBRARIES)

qore_other_checks()
Expand Down Expand Up @@ -383,9 +397,6 @@ set(LIBQORE_CPP_SRC
lib/qore_date_private.cpp
lib/QoreHashNode.cpp
lib/BinaryNode.cpp
lib/QoreBigIntNode.cpp
lib/QoreBoolNode.cpp
lib/QoreFloatNode.cpp
lib/QoreNumberNode.cpp
lib/QoreNullNode.cpp
lib/QoreNothingNode.cpp
Expand All @@ -398,7 +409,6 @@ set(LIBQORE_CPP_SRC
lib/QoreImplicitArgumentNode.cpp
lib/QoreImplicitElementNode.cpp
lib/Function.cpp
lib/BuiltinFunctionList.cpp
lib/GlobalVariableList.cpp
lib/FunctionList.cpp
lib/AbstractStatement.cpp
Expand All @@ -425,6 +435,7 @@ set(LIBQORE_CPP_SRC
lib/QoreStandardException.cpp
lib/QoreClass.cpp
lib/TypedHashDecl.cpp
lib/QoreReflection.cpp
lib/Context.cpp
lib/FindNode.cpp
lib/charset.cpp
Expand Down Expand Up @@ -586,6 +597,7 @@ set(LIBQORE_CPP_SRC
lib/QoreSelectOperatorNode.cpp
lib/QoreRangeOperatorNode.cpp
lib/QoreSquareBracketsRangeOperatorNode.cpp
lib/QoreSerializable.cpp
)

if (HAVE_SIGNAL_HANDLING)
Expand Down Expand Up @@ -632,12 +644,12 @@ endif (WIN32 AND MINGW AND MSYS)

set_target_properties(libqore PROPERTIES OUTPUT_NAME qore)
if (APPLE)
set_target_properties(libqore PROPERTIES VERSION 5)
set_target_properties(libqore PROPERTIES SOVERSION 5)
set_target_properties(libqore PROPERTIES VERSION 6)
set_target_properties(libqore PROPERTIES SOVERSION 6)
set_target_properties(libqore PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
else (APPLE)
set_target_properties(libqore PROPERTIES VERSION 5.14.2)
set_target_properties(libqore PROPERTIES SOVERSION 5)
set_target_properties(libqore PROPERTIES VERSION 6.0.0)
set_target_properties(libqore PROPERTIES SOVERSION 6)
endif (APPLE)

# prepare qore target
Expand All @@ -647,7 +659,7 @@ target_link_libraries(qore libqore)
#target_link_libraries(qr libqore)

#set_target_properties(qore qr PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
set_target_properties(qore PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
set_target_properties(qore PROPERTIES INSTALL_RPATH_USE_LINK_PATH ${CMAKE_INSTALL_FULL_LIBDIR})

# configuration files
message(STATUS "Generating unix-config.h")
Expand Down Expand Up @@ -754,6 +766,8 @@ add_dependencies(install-docs docs)

# astparser module
add_subdirectory(modules/astparser)
# reflection module
add_subdirectory(modules/reflection)

# HACK: we need to simulate QORE_USER_MODULES_DIR as the versioned one
# for qore core qlib modules.
Expand All @@ -769,6 +783,7 @@ set(QORE_USER_MODULES_DIR ${USER_MODULE_VER_DIR})
# base modules
qore_user_module("qlib/DatasourceProvider.qm" "")
qore_user_module("qlib/DebugUtil.qm" "")
qore_user_module("qlib/FsUtil.qm" "")
qore_user_module("qlib/Mapper.qm" "")
qore_user_module("qlib/Qdx.qm" "")
qore_user_module("qlib/Qorize.qm" "")
Expand All @@ -781,50 +796,49 @@ qore_user_module("qlib/CsvUtil.qm" "Util")
qore_user_module("qlib/Diff.qm" "Util")
qore_user_module("qlib/FilePoller.qm" "Util")
qore_user_module("qlib/FixedLengthUtil.qm" "Util")
qore_user_module("qlib/Logger.qm" "Util")
qore_user_module("qlib/Mime.qm" "Util")
qore_user_module("qlib/QUnit.qm" "Util")
qore_user_module("qlib/SqlUtil.qm" "Util")
qore_user_module("qlib/TextWrap.qm" "Util")

# base 3 modules
qore_user_module("qlib/DebugCmdLine.qm" "ConnectionProvider;DebugUtil")
qore_user_module("qlib/BulkSqlUtil.qm" "SqlUtil")
qore_user_module("qlib/DebugProgramControl.qm" "DebugUtil")
qore_user_module("qlib/FreetdsSqlUtil.qm" "SqlUtil")
qore_user_module("qlib/HttpServerUtil.qm" "Mime;Util")
qore_user_module("qlib/MailMessage.qm" "Mime")
qore_user_module("qlib/MysqlSqlUtil.qm" "SqlUtil")
qore_user_module("qlib/OracleSqlUtil.qm" "SqlUtil;Util")
qore_user_module("qlib/PgsqlSqlUtil.qm" "SqlUtil")
qore_user_module("qlib/Schema.qm" "SqlUtil;Util")
qore_user_module("qlib/TableMapper.qm" "Mapper;SqlUtil")
qore_user_module("qlib/TelnetClient.qm" "ConnectionProvider")
qore_user_module("qlib/WebSocketClient.qm" "ConnectionProvider;Util;WebSocketUtil")

# base 4 modules
qore_user_module("qlib/DebugCmdLine.qm" "ConnectionProvider;DebugUtil;DebugProgramControl")
qore_user_module("qlib/HttpServer.qm" "HttpServerUtil;Mime;Util")
qore_user_module("qlib/Pop3Client.qm" "ConnectionProvider;MailMessage;Mime")
qore_user_module("qlib/RestSchemaValidator.qm" "HttpServerUtil")
qore_user_module("qlib/DebugLinenoiseCmdLine.qm" "DebugUtil;DebugCmdLine")
qore_user_module("qlib/SchemaReverse.qm" "Qorize;Schema;SqlUtil;Util")
qore_user_module("qlib/SewioWebSocketClient.qm" "ConnectionProvider;Util;WebSocketUtil;WebSocketClient")
qore_user_module("qlib/SmtpClient.qm" "ConnectionProvider;MailMessage;Mime")
qore_user_module("qlib/WebSocketHandler.qm" "HttpServerUtil;WebSocketUtil")
qore_user_module("qlib/WebUtil.qm" "HttpServerUtil;Mime;Util")

# base 5 modules
qore_user_module("qlib/DebugHandler.qm" "DebugProgramControl;DebugUtil;HttpServer;HttpServerUtil;WebSocketHandler;WebSocketUtil")
qore_user_module("qlib/DebugLinenoiseCmdLine.qm" "DebugUtil;DebugCmdLine")
qore_user_module("qlib/RestHandler.qm" "HttpServerUtil;HttpServer;Mime;Util;RestSchemaValidator")
qore_user_module("qlib/Swagger.qm" "Mime;Util;HttpServerUtil;RestSchemaValidator")

# base 6 modules
qore_user_module("qlib/RestClient.qm" "ConnectionProvider;Mime;RestSchemaValidator;Swagger")

# base 7 modules
qore_user_module("qlib/BulkSqlUtil.qm" "SqlUtil")
qore_user_module("qlib/FreetdsSqlUtil.qm" "SqlUtil")
qore_user_module("qlib/HttpServer.qm" "HttpServerUtil;Mime;Util")
qore_user_module("qlib/MysqlSqlUtil.qm" "SqlUtil")
qore_user_module("qlib/OracleSqlUtil.qm" "SqlUtil;Util")
qore_user_module("qlib/PgsqlSqlUtil.qm" "SqlUtil")
qore_user_module("qlib/Pop3Client.qm" "ConnectionProvider;MailMessage;Mime")
qore_user_module("qlib/RestHandler.qm" "HttpServerUtil;Mime;Util;RestSchemaValidator")
qore_user_module("qlib/SalesforceRestClient.qm" "ConnectionProvider;Mime;RestClient")
qore_user_module("qlib/SewioRestClient.qm" "ConnectionProvider;Mime;RestClient")
qore_user_module("qlib/SewioWebSocketClient.qm" "ConnectionProvider;Util;WebSocketUtil;WebSocketClient")
qore_user_module("qlib/SchemaReverse.qm" "Qorize;Schema;SqlUtil;Util")
qore_user_module("qlib/SmtpClient.qm" "ConnectionProvider;MailMessage;Mime")
qore_user_module("qlib/TableMapper.qm" "Mapper;SqlUtil")
qore_user_module("qlib/TelnetClient.qm" "ConnectionProvider")
qore_user_module("qlib/WebSocketHandler.qm" "HttpServerUtil;WebSocketUtil")
qore_user_module("qlib/WebUtil.qm" "HttpServerUtil;Mime;Util")

# base 7 modules
qore_user_module("qlib/DebugHandler.qm" "DebugProgramControl;DebugUtil;HttpServerUtil;WebSocketHandler;WebSocketUtil")

# print info
message(STATUS "")
Expand Down

0 comments on commit e104600

Please sign in to comment.