Commit e890e4f9 by Amir Aharon

fixingf make package and removing temp files

parent 9fd2e4df
...@@ -3,17 +3,17 @@ project(Microservice) ...@@ -3,17 +3,17 @@ project(Microservice)
# version stuff # version stuff
set (Microservice_VERSION_MAJOR 1) set (Microservice_VERSION_MAJOR 1)
set (Microservice_VERSION_MINOR 5) set (Microservice_VERSION_MINOR 5)
set (Microservice_VERSION_PATCH 0) set (Microservice_VERSION_PATCH 1)
set(Microservice_VERSION_STRING ${Microservice_VERSION_MAJOR}.${Microservice_VERSION_MINOR}.${Microservice_VERSION_PATCH}) set(Microservice_VERSION_STRING ${Microservice_VERSION_MAJOR}.${Microservice_VERSION_MINOR}.${Microservice_VERSION_PATCH})
# type build flags # type build flags
#set(CMAKE_BUILD_TYPE Release) #set(CMAKE_BUILD_TYPE Release)
set(CMAKE_BINARY_DIR build) set(BUILD_DIR build)
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_BUILD_TYPE Debug)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -m64 -g") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -m64 -g")
set(CMAKE_CXX_FLAGS_DEBUG "-O0") set(CMAKE_CXX_FLAGS_DEBUG "-O0")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BUILD_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BUILD_DIR}/bin)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# linked libs and their locations # linked libs and their locations
...@@ -161,7 +161,7 @@ set(CPACK_PACKAGE_DEFAULT_LOCATION "./dist") ...@@ -161,7 +161,7 @@ set(CPACK_PACKAGE_DEFAULT_LOCATION "./dist")
include(CPack) include(CPack)
#add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) #add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
# RUN make package # RUN make package
# gradle uploadArchives -Pcversion=[version] -Ppublish_file=[the gz file] #gradle uploadArchives -Pcversion=[version] -Ppublish_file=[the gz file]
# install lib files # install lib files
# #
install(TARGETS Microservice DESTINATION lib) install(TARGETS Microservice DESTINATION lib)
......
## C++ Microservice Framework ## C++ Microservice Framework
* to create microservice docker run script/build_microservice_docker.sh [version]
## VERSIONS: ## VERSIONS:
# 1.5.1
- Fully functioning evpp rest client , async only
# 1.5.0 # 1.5.0
- add new rest server Evpp - add new rest server Evpp
- add new Evpp http client, currently NOT TO BE USED! - add new Evpp http client, currently NOT TO BE USED!
......
- memory leak on performance testing of SendZmqRestRequests - memory leak on performance testing of SendZmqRestRequests
- upon receiving the response , forward it to a new task to be carried by another thread - upon receiving the response , forward it to a new task to be carried by another thread
- catch http exception when callback url is down - catch http exception when callback url is down
- add Qihoo360/evpp as the http client with async, maybe also as server + add Qihoo360/evpp as the http client with async, maybe also as server
\ No newline at end of file \ No newline at end of file
...@@ -7,6 +7,12 @@ if [ -z "$1" ] ...@@ -7,6 +7,12 @@ if [ -z "$1" ]
exit exit
fi fi
echo "cleaning old stuff.."
rm CPack*
rm -rf cmake-build-debug _CPack_Packages CMakeFiles
rm CMakeCache.txt
rm cmake_install.cmake
echo "building the base image..." echo "building the base image..."
docker build -f Dockerfile.develop -t municipalitybank.com:5050/ipgallery.common.cpp/microservice/develop . docker build -f Dockerfile.develop -t municipalitybank.com:5050/ipgallery.common.cpp/microservice/develop .
echo "run build env" echo "run build env"
...@@ -22,7 +28,7 @@ echo "build" ...@@ -22,7 +28,7 @@ echo "build"
# set to exit on fail # set to exit on fail
set -e set -e
docker exec -it devenv make docker exec -it devenv make
echo "packaging..." echo "packaging... version: " $1
# make package # make package
docker exec -it devenv make package docker exec -it devenv make package
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment