From 4b79e398beb48eaa5c96b914b84e9fe77dea9da4 Mon Sep 17 00:00:00 2001 From: Eduardo Ramos Testillano Date: Tue, 6 Jun 2017 18:40:57 +0200 Subject: [PATCH] First cmake commit. Still coexisting with scons. --- CMakeLists.txt | 226 ++++++++++++++++++ README.md | 2 +- example/comm/blocker/libraries.txt | 10 + example/comm/brkClient/libraries.txt | 10 + example/comm/client/libraries.txt | 10 + example/comm/codec/libraries.txt | 10 + example/comm/datagramKClient/libraries.txt | 10 + example/comm/datagramRServer/libraries.txt | 10 + example/comm/irkClient/libraries.txt | 10 + example/comm/kClient/libraries.txt | 10 + example/comm/kxClient/libraries.txt | 10 + example/comm/largeBinaryCodec/libraries.txt | 10 + example/comm/rServer/libraries.txt | 10 + example/comm/rrClient/libraries.txt | 10 + example/comm/rrkClient/libraries.txt | 10 + example/comm/server/libraries.txt | 10 + example/core/genLogon/libraries.txt | 8 + example/core/ipManaging/libraries.txt | 10 + example/core/recycler/libraries.txt | 10 + example/core/regularExpression/libraries.txt | 10 + example/core/selectiveTracing/libraries.txt | 10 + example/core/showLogon/libraries.txt | 11 + example/core/sort/libraries.txt | 10 + example/core/sortName/libraries.txt | 10 + example/core/thread/libraries.txt | 5 + example/core/threadManager/libraries.txt | 4 + example/core/trace/libraries.txt | 10 + example/core/zBlock/libraries.txt | 6 + example/dbms.mysql/insert/libraries.txt | 1 + .../dbms.mysql/insert/{main.c => main.cpp} | 2 +- example/dbms.mysql/select/libraries.txt | 1 + .../dbms.mysql/select/{main.c => main.cpp} | 2 +- example/dbms.mysql/xInsert/libraries.txt | 10 + example/dbms.mysql/xSelect/libraries.txt | 10 + example/dbos/workdir/libraries.txt | 9 + example/diameter/batchConverter/libraries.txt | 7 + example/diameter/launcher/includes.txt | 1 + example/diameter/launcher/libraries.txt | 17 ++ example/diameter/launcher/main.cpp | 2 - example/diameter/pcapDecoder/libraries.txt | 3 + .../diameter/stackManagement/libraries.txt | 7 + example/diameter/tme/libraries.txt | 7 + example/http/buffer/libraries.txt | 8 + example/http/client/libraries.txt | 10 + example/http/echo/libraries.txt | 8 + example/http/kClient/libraries.txt | 9 + example/http/rServer/libraries.txt | 9 + example/http/server/libraries.txt | 9 + example/http/wims20Client/libraries.txt | 8 + example/http/wims20RServer/libraries.txt | 8 + example/http/wims20XClient/libraries.txt | 10 + example/http/wims20XRServer/libraries.txt | 9 + example/http/xmlClient/libraries.txt | 10 + example/http/xmlRServer/libraries.txt | 9 + example/http/xmlSender/libraries.txt | 8 + example/io/reader/libraries.txt | 6 + example/ldap/tSearch/libraries.txt | 12 + example/time/conversor/libraries.txt | 3 + .../timex/ArithmeticHTTPServer/libraries.txt | 10 + example/xml/xmlBasic/libraries.txt | 6 + example/xml/xmlBinary/libraries.txt | 7 + example/xml/xpath/libraries.txt | 6 + scr/git/use_pre-commit.sh | 3 - {scr => scripts}/git/pre-commit.sh | 0 {scr => scripts}/git/use_post-update.sh | 0 scripts/git/use_pre-commit.sh | 3 + 66 files changed, 714 insertions(+), 8 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 example/comm/blocker/libraries.txt create mode 100644 example/comm/brkClient/libraries.txt create mode 100644 example/comm/client/libraries.txt create mode 100644 example/comm/codec/libraries.txt create mode 100644 example/comm/datagramKClient/libraries.txt create mode 100644 example/comm/datagramRServer/libraries.txt create mode 100644 example/comm/irkClient/libraries.txt create mode 100644 example/comm/kClient/libraries.txt create mode 100644 example/comm/kxClient/libraries.txt create mode 100644 example/comm/largeBinaryCodec/libraries.txt create mode 100644 example/comm/rServer/libraries.txt create mode 100644 example/comm/rrClient/libraries.txt create mode 100644 example/comm/rrkClient/libraries.txt create mode 100644 example/comm/server/libraries.txt create mode 100644 example/core/genLogon/libraries.txt create mode 100644 example/core/ipManaging/libraries.txt create mode 100644 example/core/recycler/libraries.txt create mode 100644 example/core/regularExpression/libraries.txt create mode 100644 example/core/selectiveTracing/libraries.txt create mode 100644 example/core/showLogon/libraries.txt create mode 100644 example/core/sort/libraries.txt create mode 100644 example/core/sortName/libraries.txt create mode 100644 example/core/thread/libraries.txt create mode 100644 example/core/threadManager/libraries.txt create mode 100644 example/core/trace/libraries.txt create mode 100644 example/core/zBlock/libraries.txt create mode 100644 example/dbms.mysql/insert/libraries.txt rename example/dbms.mysql/insert/{main.c => main.cpp} (98%) create mode 100644 example/dbms.mysql/select/libraries.txt rename example/dbms.mysql/select/{main.c => main.cpp} (99%) create mode 100644 example/dbms.mysql/xInsert/libraries.txt create mode 100644 example/dbms.mysql/xSelect/libraries.txt create mode 100644 example/dbos/workdir/libraries.txt create mode 100644 example/diameter/batchConverter/libraries.txt create mode 100644 example/diameter/launcher/includes.txt create mode 100644 example/diameter/launcher/libraries.txt create mode 100644 example/diameter/pcapDecoder/libraries.txt create mode 100644 example/diameter/stackManagement/libraries.txt create mode 100644 example/diameter/tme/libraries.txt create mode 100644 example/http/buffer/libraries.txt create mode 100644 example/http/client/libraries.txt create mode 100644 example/http/echo/libraries.txt create mode 100644 example/http/kClient/libraries.txt create mode 100644 example/http/rServer/libraries.txt create mode 100644 example/http/server/libraries.txt create mode 100644 example/http/wims20Client/libraries.txt create mode 100644 example/http/wims20RServer/libraries.txt create mode 100644 example/http/wims20XClient/libraries.txt create mode 100644 example/http/wims20XRServer/libraries.txt create mode 100644 example/http/xmlClient/libraries.txt create mode 100644 example/http/xmlRServer/libraries.txt create mode 100644 example/http/xmlSender/libraries.txt create mode 100644 example/io/reader/libraries.txt create mode 100644 example/ldap/tSearch/libraries.txt create mode 100644 example/time/conversor/libraries.txt create mode 100644 example/timex/ArithmeticHTTPServer/libraries.txt create mode 100644 example/xml/xmlBasic/libraries.txt create mode 100644 example/xml/xmlBinary/libraries.txt create mode 100644 example/xml/xpath/libraries.txt delete mode 100755 scr/git/use_pre-commit.sh rename {scr => scripts}/git/pre-commit.sh (100%) rename {scr => scripts}/git/use_post-update.sh (100%) create mode 100755 scripts/git/use_pre-commit.sh diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..7acd9b1 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,226 @@ +# See more at: https://cmake.org/Wiki/CMake_Useful_Variables + +# Stop if cmake version below 2.8 +cmake_minimum_required(VERSION 2.8 FATAL_ERROR) + +# Project name +project(anna) + +# Enable c++ language +enable_language(C CXX) + +# Project version +set(VERSION_MAJOR 1) +set(VERSION_MINOR 0) +set(VERSION_PATCH 0) + +# Build type: +if(NOT CMAKE_BUILD_TYPE) + message(WARNING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel.") + set(CMAKE_BUILD_TYPE "Release" CACHE STRING + "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) +endif(NOT CMAKE_BUILD_TYPE) + +# Build output directory: +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY build/${CMAKE_BUILD_TYPE}/bin) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY build/${CMAKE_BUILD_TYPE}/lib) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY build/${CMAKE_BUILD_TYPE}/lib) +message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY is ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") +message(STATUS "CMAKE_LIBRARY_OUTPUT_DIRECTORY is ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") +message(STATUS "CMAKE_ARCHIVE_OUTPUT_DIRECTORY is ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}") + +# http://stackoverflow.com/questions/6594796/how-do-i-make-cmake-output-into-a-bin-dir +#set_target_properties( targets... +# PROPERTIES +# ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +# LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +# RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" +#) + +# Location of additional cmake modules +set(CMAKE_MODULE_PATH + ${CMAKE_MODULE_PATH} + ${CMAKE_CURRENT_SOURCE_DIR}/cmake + ) + +# Detect operating system +message(STATUS "This is a ${CMAKE_SYSTEM_NAME} system") +if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + add_definitions(-DSYSTEM_LINUX) +endif() +if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + add_definitions(-DSYSTEM_DARWIN) +endif() +if(${CMAKE_SYSTEM_NAME} STREQUAL "AIX") + add_definitions(-DSYSTEM_AIX) +endif() + +# Detect host processor +message(STATUS "The host processor is ${CMAKE_HOST_SYSTEM_PROCESSOR}") +message(STATUS "The c compiler is ${CMAKE_C_COMPILER}") +message(STATUS "The c++ compiler is ${CMAKE_CXX_COMPILER}") +message(STATUS "The build type is ${CMAKE_BUILD_TYPE}") + +# Example how to set c++ compiler flags for GNU +if(CMAKE_CXX_COMPILER_ID MATCHES GNU) + #execute_process(COMMAND g++ --version >/dev/null 2>/dev/null) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-unknown-pragmas -Wno-sign-compare -Woverloaded-virtual -Wwrite-strings -Wno-unused") + set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3") + set(CMAKE_CXX_FLAGS_RELEASE "-O3") + +elseif(CMAKE_CXX_COMPILER_ID MATCHES Clang) + #execute_process(COMMAND clang++ --version >/dev/null 2>/dev/null) + add_definitions(-DIS_CLANG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-unknown-pragmas -Wno-sign-compare -Woverloaded-virtual -Wwrite-strings -Wno-unused -Wno-parentheses-equality") + set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3") + set(CMAKE_CXX_FLAGS_RELEASE "-O3") +endif() + + +if (CMAKE_BUILD_TYPE STREQUAL Debug) + set(BUILD_POSTFIX "_d") +else(CMAKE_BUILD_TYPE STREQUAL Debug) + set(BUILD_POSTFIX "") +endif(CMAKE_BUILD_TYPE STREQUAL Debug) + + +# Macro to get children directories: +MACRO(SUBDIRLIST result curdir) + FILE(GLOB children RELATIVE ${curdir} ${curdir}/*) + SET(dirlist "") + FOREACH(child ${children}) + IF(IS_DIRECTORY ${curdir}/${child}) + LIST(APPEND dirlist ${child}) + ENDIF() + ENDFOREACH() + SET(${result} ${dirlist}) +ENDMACRO() + +# Definitions (any way to apply only at ldap context ?): +add_definitions(-DLDAP_DEPRECATED) + +# General includes: +include_directories(include/anna) +include_directories(/usr/include/libxml2) +include_directories(/usr/lib/oracle/12.1/client64/include) + +# +SUBDIRLIST(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR}/source) +FOREACH(subdir ${SUBDIRS}) + message(STATUS "Processing library at: source/${subdir}") + file(GLOB_RECURSE SRCS source/${subdir}/*.cpp) + add_library(${subdir}_static STATIC ${SRCS}) + add_library(${subdir}_shared SHARED ${SRCS}) +ENDFOREACH() + +# +file(GLOB_RECURSE DYNAMIC_PROCEDURES ${CMAKE_CURRENT_SOURCE_DIR}/dynamic/launcher/*.cpp) +FOREACH(procedure ${DYNAMIC_PROCEDURES}) + get_filename_component(dirname ${procedure} DIRECTORY) + file(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR}/dynamic/launcher ${dirname}) + # convert "/" to "_" + string(REGEX REPLACE "/" "_" libpath ${rel}) + + message(STATUS "Processing dynamic library at: dynamic/launcher/${rel}") + file(GLOB_RECURSE SRCS dynamic/launcher/${rel}/*.cpp) + add_library(launcher_procedure_${libpath}_shared SHARED ${SRCS}) + set(target_dirname build/${CMAKE_BUILD_TYPE}/lib/dynamic_launcher/${libpath}) + set(target_basename launcher_procedure_${libpath}_shared) + set_target_properties(${target_basename} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${target_dirname}) + #file(RENAME ${target_dirname}/lib${target_basename}.so ${target_dirname}/libprocedure.so) +ENDFOREACH() + +# Linking example: +#file(GLOB_RECURSE SRCS ${CMAKE_CURRENT_SOURCE_DIR}/example/core/genLogon/*.cpp) +#add_executable(genLogon ${SRCS}) +#target_link_libraries(genLogon core_static app_static core_static test_static xml_static io_static crypto xml2 rt) + +# Generalization: +# +SUBDIRLIST(MODULES ${CMAKE_CURRENT_SOURCE_DIR}/example) +FOREACH(module ${MODULES}) + SUBDIRLIST(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR}/example/${module}) + FOREACH(subdir ${SUBDIRS}) + message(STATUS "Processing executable at: example/${module}/${subdir}") + + # Sources + file(GLOB_RECURSE SRCS ${CMAKE_CURRENT_SOURCE_DIR}/example/${module}/${subdir}/*.cpp) + + # Executable + set(target "${module}_${subdir}") + add_executable(${target} "${SRCS}") + set_target_properties(${target} PROPERTIES LINKER_LANGUAGE CXX) + set(libraries_file "${CMAKE_CURRENT_SOURCE_DIR}/example/${module}/${subdir}/libraries.txt") + set(includes_file "${CMAKE_CURRENT_SOURCE_DIR}/example/${module}/${subdir}/includes.txt") + + if(EXISTS "${includes_file}") + file (STRINGS "${includes_file}" HDRS) + # Include own example directory: + target_include_directories(${target} PUBLIC + $ + ) + FOREACH(HDR ${HDRS}) + #message(STATUS "Header directory: ${HDR}") + target_include_directories(${target} PUBLIC + $ + ) + ENDFOREACH() + endif() + + if(EXISTS "${libraries_file}") + file (STRINGS "${libraries_file}" LIBS) + #message(STATUS "Libraries: ${LIBS}") + target_link_libraries(${target} ${LIBS}) + endif() + + ENDFOREACH() +ENDFOREACH() + + +# +find_package(Boost COMPONENTS system filesystem REQUIRED) +SUBDIRLIST(MODULES ${CMAKE_CURRENT_SOURCE_DIR}/test) +FOREACH(module ${MODULES}) + + message(STATUS "Processing basic test at: test/${module}") + + # Sources + file(GLOB_RECURSE SRCS ${CMAKE_CURRENT_SOURCE_DIR}/test/${module}/*.cpp) + + # Executable + set(target "${module}") + find_package(Boost COMPONENTS system filesystem unit_test_framework REQUIRED) + add_executable(${target} "${SRCS}") + set_target_properties(${target} PROPERTIES LINKER_LANGUAGE CXX) + + + set(libraries_file "${CMAKE_CURRENT_SOURCE_DIR}/example/${module}/${subdir}/libraries.txt") + + if(EXISTS "${libraries_file}") + file (STRINGS "${libraries_file}" LIBS) + #message(STATUS "Libraries: ${LIBS}") + target_link_libraries(${target} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${LIBS}) + endif() + + add_test(tester tester) + +ENDFOREACH() + + +# Install +# see http://stackoverflow.com/questions/14084759/keep-a-single-files-permissions-when-using-install-in-cmake +####set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/deploy") +####install(FILES build/lib/libtools_static.a DESTINATION lib) +####install(PROGRAMS build/lib/libtools_shared.so DESTINATION lib) +####install(PROGRAMS build/bin/hello DESTINATION bin) + +# Add target for API documentation with Doxygen +find_package(Doxygen) +if(DOXYGEN_FOUND) +add_custom_target(doc + ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/docs/doxygen/Doxyfile + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs/doxygen + COMMENT "Generating API documentation with Doxygen" VERBATIM +) +endif(DOXYGEN_FOUND) + diff --git a/README.md b/README.md index 29e3fef..26e44f1 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ANNA is a complete suite of tools and resources to build proffesional applicatio Based on GIT, hosted on http://redmine.teslayout.com You could use my pre-commit specific template if you want to do some basic checkings (i.e. - astyle code processing): Execute './scr/git/use-pre-commit.sh' + astyle code processing): Execute './scripts/git/use-pre-commit.sh' ## Documentation diff --git a/example/comm/blocker/libraries.txt b/example/comm/blocker/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/blocker/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/brkClient/libraries.txt b/example/comm/brkClient/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/brkClient/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/client/libraries.txt b/example/comm/client/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/client/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/codec/libraries.txt b/example/comm/codec/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/codec/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/datagramKClient/libraries.txt b/example/comm/datagramKClient/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/datagramKClient/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/datagramRServer/libraries.txt b/example/comm/datagramRServer/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/datagramRServer/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/irkClient/libraries.txt b/example/comm/irkClient/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/irkClient/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/kClient/libraries.txt b/example/comm/kClient/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/kClient/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/kxClient/libraries.txt b/example/comm/kxClient/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/kxClient/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/largeBinaryCodec/libraries.txt b/example/comm/largeBinaryCodec/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/largeBinaryCodec/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/rServer/libraries.txt b/example/comm/rServer/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/rServer/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/rrClient/libraries.txt b/example/comm/rrClient/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/rrClient/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/rrkClient/libraries.txt b/example/comm/rrkClient/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/rrkClient/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/comm/server/libraries.txt b/example/comm/server/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/comm/server/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/core/genLogon/libraries.txt b/example/core/genLogon/libraries.txt new file mode 100644 index 0000000..6f0d1f3 --- /dev/null +++ b/example/core/genLogon/libraries.txt @@ -0,0 +1,8 @@ +app_static +test_static +xml_static +io_static +core_static +rt +xml2 +crypto diff --git a/example/core/ipManaging/libraries.txt b/example/core/ipManaging/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/core/ipManaging/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/core/recycler/libraries.txt b/example/core/recycler/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/core/recycler/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/core/regularExpression/libraries.txt b/example/core/regularExpression/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/core/regularExpression/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/core/selectiveTracing/libraries.txt b/example/core/selectiveTracing/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/core/selectiveTracing/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/core/showLogon/libraries.txt b/example/core/showLogon/libraries.txt new file mode 100644 index 0000000..f167a29 --- /dev/null +++ b/example/core/showLogon/libraries.txt @@ -0,0 +1,11 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 +crypto diff --git a/example/core/sort/libraries.txt b/example/core/sort/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/core/sort/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/core/sortName/libraries.txt b/example/core/sortName/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/core/sortName/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/core/thread/libraries.txt b/example/core/thread/libraries.txt new file mode 100644 index 0000000..afef9e3 --- /dev/null +++ b/example/core/thread/libraries.txt @@ -0,0 +1,5 @@ +io_static +core_static +xml_static +rt +xml2 diff --git a/example/core/threadManager/libraries.txt b/example/core/threadManager/libraries.txt new file mode 100644 index 0000000..22da4df --- /dev/null +++ b/example/core/threadManager/libraries.txt @@ -0,0 +1,4 @@ +core_static +xml_static +rt +xml2 diff --git a/example/core/trace/libraries.txt b/example/core/trace/libraries.txt new file mode 100644 index 0000000..0fee661 --- /dev/null +++ b/example/core/trace/libraries.txt @@ -0,0 +1,10 @@ +comm_static +timex_static +app_static +test_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/core/zBlock/libraries.txt b/example/core/zBlock/libraries.txt new file mode 100644 index 0000000..feb5872 --- /dev/null +++ b/example/core/zBlock/libraries.txt @@ -0,0 +1,6 @@ +io_static +core_static +xml_static +z +rt +xml2 diff --git a/example/dbms.mysql/insert/libraries.txt b/example/dbms.mysql/insert/libraries.txt new file mode 100644 index 0000000..18c098a --- /dev/null +++ b/example/dbms.mysql/insert/libraries.txt @@ -0,0 +1 @@ +mysqlclient diff --git a/example/dbms.mysql/insert/main.c b/example/dbms.mysql/insert/main.cpp similarity index 98% rename from example/dbms.mysql/insert/main.c rename to example/dbms.mysql/insert/main.cpp index f3ffd16..7ed298e 100644 --- a/example/dbms.mysql/insert/main.c +++ b/example/dbms.mysql/insert/main.cpp @@ -25,7 +25,7 @@ my_bool is_null[MAXCOLUMN]; /* * From http://dev.mysql.com/doc/refman/4.1/en/mysql-stmt-fetch.html */ -int main () +int main (int argc, const char** argv) { if ((mysql = mysql_init (NULL)) == NULL) exit(-12); diff --git a/example/dbms.mysql/select/libraries.txt b/example/dbms.mysql/select/libraries.txt new file mode 100644 index 0000000..18c098a --- /dev/null +++ b/example/dbms.mysql/select/libraries.txt @@ -0,0 +1 @@ +mysqlclient diff --git a/example/dbms.mysql/select/main.c b/example/dbms.mysql/select/main.cpp similarity index 99% rename from example/dbms.mysql/select/main.c rename to example/dbms.mysql/select/main.cpp index 3851eff..3a13785 100644 --- a/example/dbms.mysql/select/main.c +++ b/example/dbms.mysql/select/main.cpp @@ -24,7 +24,7 @@ my_bool is_null[MAXCOLUMN]; /* * From http://dev.mysql.com/doc/refman/4.1/en/mysql-stmt-fetch.html */ -int main () +int main (int argc, const char** argv) { if ((mysql = mysql_init (NULL)) == NULL) exit (-12); diff --git a/example/dbms.mysql/xInsert/libraries.txt b/example/dbms.mysql/xInsert/libraries.txt new file mode 100644 index 0000000..e856851 --- /dev/null +++ b/example/dbms.mysql/xInsert/libraries.txt @@ -0,0 +1,10 @@ +dbms.mysql_static +dbms_static +comm_static +app_static +xml_static +io_static +core_static +mysqlclient +rt +xml2 diff --git a/example/dbms.mysql/xSelect/libraries.txt b/example/dbms.mysql/xSelect/libraries.txt new file mode 100644 index 0000000..e856851 --- /dev/null +++ b/example/dbms.mysql/xSelect/libraries.txt @@ -0,0 +1,10 @@ +dbms.mysql_static +dbms_static +comm_static +app_static +xml_static +io_static +core_static +mysqlclient +rt +xml2 diff --git a/example/dbos/workdir/libraries.txt b/example/dbos/workdir/libraries.txt new file mode 100644 index 0000000..bb96015 --- /dev/null +++ b/example/dbos/workdir/libraries.txt @@ -0,0 +1,9 @@ +dbos_static +dbms_static +comm_static +app_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/diameter/batchConverter/libraries.txt b/example/diameter/batchConverter/libraries.txt new file mode 100644 index 0000000..39a2ba5 --- /dev/null +++ b/example/diameter/batchConverter/libraries.txt @@ -0,0 +1,7 @@ +diameter_static +time_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/diameter/launcher/includes.txt b/example/diameter/launcher/includes.txt new file mode 100644 index 0000000..9730e33 --- /dev/null +++ b/example/diameter/launcher/includes.txt @@ -0,0 +1 @@ +dynamic/launcher/default diff --git a/example/diameter/launcher/libraries.txt b/example/diameter/launcher/libraries.txt new file mode 100644 index 0000000..43bb577 --- /dev/null +++ b/example/diameter/launcher/libraries.txt @@ -0,0 +1,17 @@ +diameter.comm_static +diameter_static +time_static +statistics_static +http_static +timex_static +comm_static +http_static +app_static +xml_static +launcher_procedure_default_shared +testing_shared +io_static +core_static +pthread +rt +xml2 diff --git a/example/diameter/launcher/main.cpp b/example/diameter/launcher/main.cpp index 7b13e12..6f2a653 100644 --- a/example/diameter/launcher/main.cpp +++ b/example/diameter/launcher/main.cpp @@ -26,8 +26,6 @@ int main(int argc, const char** argv) { Launcher app; anna::http::functions::initialize(); - std::cout << "XXXXXXXXXXXXXXXXXXXXXXX " << anna::functions::hash("hola que tal") << std::endl; - try { anna::CommandLine& commandLine(anna::CommandLine::instantiate()); // General diff --git a/example/diameter/pcapDecoder/libraries.txt b/example/diameter/pcapDecoder/libraries.txt new file mode 100644 index 0000000..4a4dc51 --- /dev/null +++ b/example/diameter/pcapDecoder/libraries.txt @@ -0,0 +1,3 @@ +core_static +pcap +rt diff --git a/example/diameter/stackManagement/libraries.txt b/example/diameter/stackManagement/libraries.txt new file mode 100644 index 0000000..39a2ba5 --- /dev/null +++ b/example/diameter/stackManagement/libraries.txt @@ -0,0 +1,7 @@ +diameter_static +time_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/diameter/tme/libraries.txt b/example/diameter/tme/libraries.txt new file mode 100644 index 0000000..39a2ba5 --- /dev/null +++ b/example/diameter/tme/libraries.txt @@ -0,0 +1,7 @@ +diameter_static +time_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/http/buffer/libraries.txt b/example/http/buffer/libraries.txt new file mode 100644 index 0000000..0cab6e6 --- /dev/null +++ b/example/http/buffer/libraries.txt @@ -0,0 +1,8 @@ +http_static +comm_static +app_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/http/client/libraries.txt b/example/http/client/libraries.txt new file mode 100644 index 0000000..3d89363 --- /dev/null +++ b/example/http/client/libraries.txt @@ -0,0 +1,10 @@ +http_static +comm_static +timex_static +app_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/http/echo/libraries.txt b/example/http/echo/libraries.txt new file mode 100644 index 0000000..0cab6e6 --- /dev/null +++ b/example/http/echo/libraries.txt @@ -0,0 +1,8 @@ +http_static +comm_static +app_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/http/kClient/libraries.txt b/example/http/kClient/libraries.txt new file mode 100644 index 0000000..7e25240 --- /dev/null +++ b/example/http/kClient/libraries.txt @@ -0,0 +1,9 @@ +http_static +comm_static +app_static +test_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/http/rServer/libraries.txt b/example/http/rServer/libraries.txt new file mode 100644 index 0000000..7e25240 --- /dev/null +++ b/example/http/rServer/libraries.txt @@ -0,0 +1,9 @@ +http_static +comm_static +app_static +test_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/http/server/libraries.txt b/example/http/server/libraries.txt new file mode 100644 index 0000000..7e25240 --- /dev/null +++ b/example/http/server/libraries.txt @@ -0,0 +1,9 @@ +http_static +comm_static +app_static +test_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/http/wims20Client/libraries.txt b/example/http/wims20Client/libraries.txt new file mode 100644 index 0000000..0cab6e6 --- /dev/null +++ b/example/http/wims20Client/libraries.txt @@ -0,0 +1,8 @@ +http_static +comm_static +app_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/http/wims20RServer/libraries.txt b/example/http/wims20RServer/libraries.txt new file mode 100644 index 0000000..0cab6e6 --- /dev/null +++ b/example/http/wims20RServer/libraries.txt @@ -0,0 +1,8 @@ +http_static +comm_static +app_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/http/wims20XClient/libraries.txt b/example/http/wims20XClient/libraries.txt new file mode 100644 index 0000000..3d89363 --- /dev/null +++ b/example/http/wims20XClient/libraries.txt @@ -0,0 +1,10 @@ +http_static +comm_static +timex_static +app_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/http/wims20XRServer/libraries.txt b/example/http/wims20XRServer/libraries.txt new file mode 100644 index 0000000..7e25240 --- /dev/null +++ b/example/http/wims20XRServer/libraries.txt @@ -0,0 +1,9 @@ +http_static +comm_static +app_static +test_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/http/xmlClient/libraries.txt b/example/http/xmlClient/libraries.txt new file mode 100644 index 0000000..3d89363 --- /dev/null +++ b/example/http/xmlClient/libraries.txt @@ -0,0 +1,10 @@ +http_static +comm_static +timex_static +app_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/http/xmlRServer/libraries.txt b/example/http/xmlRServer/libraries.txt new file mode 100644 index 0000000..7e25240 --- /dev/null +++ b/example/http/xmlRServer/libraries.txt @@ -0,0 +1,9 @@ +http_static +comm_static +app_static +test_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/http/xmlSender/libraries.txt b/example/http/xmlSender/libraries.txt new file mode 100644 index 0000000..0cab6e6 --- /dev/null +++ b/example/http/xmlSender/libraries.txt @@ -0,0 +1,8 @@ +http_static +comm_static +app_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/io/reader/libraries.txt b/example/io/reader/libraries.txt new file mode 100644 index 0000000..75ef593 --- /dev/null +++ b/example/io/reader/libraries.txt @@ -0,0 +1,6 @@ +app_static +io_static +xml_static +core_static +rt +xml2 diff --git a/example/ldap/tSearch/libraries.txt b/example/ldap/tSearch/libraries.txt new file mode 100644 index 0000000..bcec79b --- /dev/null +++ b/example/ldap/tSearch/libraries.txt @@ -0,0 +1,12 @@ +ldap_static +timex_static +comm_static +app_static +xml_static +io_static +core_static +pthread +rt +xml2 +ldap +lber diff --git a/example/time/conversor/libraries.txt b/example/time/conversor/libraries.txt new file mode 100644 index 0000000..33cfe20 --- /dev/null +++ b/example/time/conversor/libraries.txt @@ -0,0 +1,3 @@ +time_static +xml_static +core_static diff --git a/example/timex/ArithmeticHTTPServer/libraries.txt b/example/timex/ArithmeticHTTPServer/libraries.txt new file mode 100644 index 0000000..bc25732 --- /dev/null +++ b/example/timex/ArithmeticHTTPServer/libraries.txt @@ -0,0 +1,10 @@ +http_static +timex_static +comm_static +app_static +xml_static +io_static +core_static +pthread +rt +xml2 diff --git a/example/xml/xmlBasic/libraries.txt b/example/xml/xmlBasic/libraries.txt new file mode 100644 index 0000000..6cde9d4 --- /dev/null +++ b/example/xml/xmlBasic/libraries.txt @@ -0,0 +1,6 @@ +app_static +xml_static +io_static +core_static +rt +xml2 diff --git a/example/xml/xmlBinary/libraries.txt b/example/xml/xmlBinary/libraries.txt new file mode 100644 index 0000000..407ec3c --- /dev/null +++ b/example/xml/xmlBinary/libraries.txt @@ -0,0 +1,7 @@ +app_static +xml_static +io_static +core_static +z +rt +xml2 diff --git a/example/xml/xpath/libraries.txt b/example/xml/xpath/libraries.txt new file mode 100644 index 0000000..6cde9d4 --- /dev/null +++ b/example/xml/xpath/libraries.txt @@ -0,0 +1,6 @@ +app_static +xml_static +io_static +core_static +rt +xml2 diff --git a/scr/git/use_pre-commit.sh b/scr/git/use_pre-commit.sh deleted file mode 100755 index 04fcb26..0000000 --- a/scr/git/use_pre-commit.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd `dirname $0` -ln -sf ../../scr/git/pre-commit.sh ../../.git/hooks/pre-commit diff --git a/scr/git/pre-commit.sh b/scripts/git/pre-commit.sh similarity index 100% rename from scr/git/pre-commit.sh rename to scripts/git/pre-commit.sh diff --git a/scr/git/use_post-update.sh b/scripts/git/use_post-update.sh similarity index 100% rename from scr/git/use_post-update.sh rename to scripts/git/use_post-update.sh diff --git a/scripts/git/use_pre-commit.sh b/scripts/git/use_pre-commit.sh new file mode 100755 index 0000000..44d44cc --- /dev/null +++ b/scripts/git/use_pre-commit.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd `dirname $0` +ln -sf ../../scripts/git/pre-commit.sh ../../.git/hooks/pre-commit -- 2.20.1