delete makefile, update Cmake (#8)

* delete makefile, update Cmake

CMakeLists.txt

@@ -1,7 +1,15 @@
 CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
 PROJECT(dtc)
-
+option(CMAKE_TEST_OPTION "option for test_demo" OFF)
 ADD_SUBDIRECTORY(./src)
 
+if(CMAKE_TEST_OPTION)
+ADD_SUBDIRECTORY(./test)
+SET(CMAKE_TEST_OPTION OFF CACHE BOOL INTERNAL FORCE)
+ENDIF(CMAKE_TEST_OPTION)
+
 #if you want to uninstall libraries, you should enter "build" folder, and use this command
-# cat install_manifest.txt | sudo xargs rm
+# cat install_manifest.txt | sudo xargs rm
+
+#if you want to build the test_demo,you should use this command
+#cmake -DCMAKE_TEST_OPTION=ON ..

src/Make.conf

@@ -1,73 +0,0 @@
-#for memchecker only, developer-only
-ifeq ($(LIB_PATH),)
-LIB_PATH = ..
-endif
-ifeq ($(MEMCHECK),1)
-CFLAGS += -DMEMCHECK=1
-endif
-
-#for gprof only
-ifeq ($(GPROF),1)
-CFLAGS += -pg
-LDFLAGS += -pg
-endif
-
-# slk10 don't accept: -fvisibility=hidden
-CFLAGS += -g -fno-strict-aliasing -fpermissive 
-
-GCCVER := $(shell $(CC) -dumpversion | awk -F. '{ print $$1"."$$2}')
-PLATFORM := $(shell $(CC) -dumpmachine)
-
-ifeq ($(findstring x86_64,$(PLATFORM)),)
-CFLAGS += -march=pentiumpro
-endif
-LD := $(CXX)
-
-PROTOBUFDIR := $(LIB_PATH)/libs/protobuf
-PROTOBUFINC := -I$(PROTOBUFDIR)/include/
-JSONCPPINC  := -I$(LIB_PATH)/libs/jsoncpp/include/
-
-
-# mysql-helper
-ifeq ($(findstring x86_64, $(PLATFORM)),)
-    MYSQLDIR := $(LIB_PATH)/libs/mysql32
-    PROTOBUFLIB := $(PROTOBUFDIR)/lib/libprotobuf32.a
-    JSON_LIB := $(LIB_PATH)/libs/jsoncpp/lib32/libjsoncpp.a
-	CURL_LIB := $(LIB_PATH)/libs/curl/lib/libcurl32.a -lrt
-	CURLINC     := -I$(LIB_PATH)/libs/curl/include32/
-	ZINC        := -I$(LIB_PATH)/libs/zlib/include32/
-	Z_LIB 	 := $(LIB_PATH)/libs/zlib/lib/libz32.a 
-	DTC_API_LIB = ../libs/dtc_api/lib32/libdtc-gcc-4.4-r66b566b.so
-	CA_API_LIB = $(LIB_PATH)/configcenter/ca_api/libapp-client.a
-else
-    MYSQLDIR := $(LIB_PATH)/libs/mysql64
-    PROTOBUFLIB := $(PROTOBUFDIR)/lib/libprotobuf64.a
-    JSON_LIB := $(LIB_PATH)/libs/jsoncpp/lib64/libjsoncpp.a
-	CURL_LIB := $(LIB_PATH)/libs/curl/lib/libcurl64.a -lrt 
-	CURLINC  := -I$(LIB_PATH)/libs/curl/include64/
-	ZINC     := -I$(LIB_PATH)/libs/zlib/include64/
-	Z_LIB 	 := $(LIB_PATH)/libs/zlib/lib/libz64.a 
-	DTC_API_LIB = ../libs/dtc_api/lib64/libdtc-gcc-4.4-r66b566b.so
-	CA_API_LIB = $(LIB_PATH)/configcenter/ca_api/libapp-client.a
-endif
-
-#
-MYSQLLIB := $(MYSQLDIR)/lib/mysql/libmysqlclient.a $(Z_LIB) -lpthread -lm
-MYSQLINC := -I$(MYSQLDIR)/include/mysql/
-
-YAML_CPP_LIB := $(LIB_PATH)/libs/yaml-cpp/libs/libyaml-cpp.a
-YAML_CPP_INC := -I$(LIB_PATH)/libs/yaml-cpp/include/
-
-LOG4CPLUS_LIB := $(LIB_PATH)/libs/log4cplus/libs/liblog4cplus.a
-LOG4CPLUS_INC := -I$(LIB_PATH)/libs/log4cplus/include/
-#tdb-helper
-#ifeq ($(findstring x86_64,$(PLATFORM)),)
-#ifeq ($(TDB),)
-#TDB := $(CURDIR)/../plugin/tdb
-#endif
-#endif
-
-#custom-helper
-CUSTOMHLP=1
-
-all::

src/Make.rules

@@ -1,391 +0,0 @@
-.DEFAULT_GOAL := all
-.PHONY: all clean install count FORCE
-
-export MAKEFLAGS
-MAKEFLAGS += --no-print-directory
-
-ifneq (,$(DIRNAME))
-target_external :=
-endif
-
-I=$(if $(filter install,$(MAKECMDGOALS)),1,0)
-ifeq (,$(MAKEFILE_LIST))
-MAKEFILE_LIST := Makefile
-endif
-
-_INDEX := 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
-EXTDIRS := $(foreach p,$(target_external),$(if $(wildcard $p),,$(dir $p)))
-EXTIDXS := $(addprefix make_extdir_,$(wordlist 1,$(words $(EXTDIRS)),$(_INDEX)))
-all:: $(addprefix make_all_,$(SUBDIRS)) $(EXTIDXS) $(target) $(target_only);
-install:: $(addprefix make_all_,$(SUBDIRS)) $(EXTIDXS) $(target) $(target_only);
-ifeq ($I,1)
-all:: $(addprefix install_,$(target_install));
-install:: $(addprefix install_,$(target_install));
-endif
-FORCE:;
-clean:: $(addprefix make_clean_,$(SUBDIRS));
-
-#override CFLAGS += -Wall  -D_GNU_SOURCE -D_REENTRANT -g  -O2
-override CFLAGS += -Wall -D_GNU_SOURCE -D_REENTRANT -g
-
-ifeq ($(DEBUG), )
-override CFLAGS += -O2
-endif
-
-ECHO = /bin/echo
-
-ifneq (0,$C)
-RED = \\e[1m\\e[31m
-DARKRED = \\e[31m
-GREEN = \\e[1m\\e[32m
-DARKGREEN = \\e[32m
-BLUE = \\e[1m\\e[34m
-DARKBLUE = \\e[34m
-YELLOW = \\e[1m\\e[33m
-DARKYELLOW = \\e[33m
-MAGENTA = \\e[1m\\e[35m
-DARKMAGENTA = \\e[35m
-CYAN = \\e[1m\\e[36m
-DARKCYAN = \\e[36m
-RESET = \\e[m
-
-color:
-	@$(ECHO) -e $(RED)RED$(RESET)
-	@$(ECHO) -e $(GREEN)GREEN$(RESET)
-	@$(ECHO) -e $(BLUE)BLUE$(RESET)
-	@$(ECHO) -e $(YELLOW)YELLOW$(RESET)
-	@$(ECHO) -e $(MAGENTA)MAGENTA$(RESET)
-	@$(ECHO) -e $(CYAN)CYAN $(RESET)
-	@$(ECHO) -e $(DARKRED)DARKRED$(RESET)
-	@$(ECHO) -e $(DARKGREEN)DARKGREEN$(RESET)
-	@$(ECHO) -e $(DARKBLUE)DARKBLUE$(RESET)
-	@$(ECHO) -e $(DARKYELLOW)DARKYELLOW$(RESET)
-	@$(ECHO) -e $(DARKMAGENTA)DARKMAGENTA$(RESET)
-	@$(ECHO) -e $(DARKCYAN)DARKCYAN $(RESET)
-endif
-
-export P
-
-PSX = $(if $(findstring -j,-$(MAKEFLAGS)),$(GREEN)$(EPREFIX) )
-
-ifneq (,$(findstring clean,$(MAKECMDGOALS)))
-override P := 0
-EXTIDXS :=
-endif
-
-ifeq (0,$P)
-_TOTAL :=
-_TOTAL2 :=
-override TOTAL :=
-else
-_TOTAL := $(foreach p,$(basename $(filter-out %.so,$(target))),$($p_objs))
-_TOTAL2 := $(foreach p,$(basename $(filter %.so,$(target))),$($p_objs:.o=.pic.o))
-_TOTAL2 := $(words $(sort $(target) $(_TOTAL) $(_TOTAL2)))
-_TOTAL := $(SUBDIRS)
-endif
-
-$(foreach p,$(_TOTAL),$(eval $(shell $(MAKE) -s -C $p count DIRNAME=$p P=$P)))
-$(foreach p,$(EXTIDXS),$(eval $(shell $(MAKE) -s -C $(word $(subst make_extdir_,,$p),$(EXTDIRS)) count DIRNAME=$p P=$P)))
-_TOTAL += $(EXTIDXS)
-_TOTAL := $(if $(_TOTAL),$(words $(_TOTAL))*2 $(patsubst %,+$$(TOTAL_%),$(sort $(_TOTAL))))
-$(if $(_TOTAL),$(eval _TOTAL2:=$$(shell $(ECHO) $$$$(($(_TOTAL2)+$(_TOTAL))))))
-$(if $(TOTAL),,$(eval TOTAL:=$(_TOTAL2)))
-
-ifeq (0,$(TOTAL))
-TOTAL :=
-endif
-
-ifeq (,$(TOTAL))
-override PCT :=
-override PCT0 :=
-override PCT1 :=
-override inc :=
-else
-ifneq (,$(findstring -j,-$(MAKEFLAGS)))
-override PCT :=
-override PCT0 :=
-override PCT1 :=
-override inc :=
-else
-ifeq ($(START),)
-STEP := 0 00
-else
-STEP := $(START) $(shell B=$$(($(START)*100/$(TOTAL))); [ $$B -le 9 ] && B=0$$B; $(ECHO) $$B)
-endif
-START = $(firstword $(STEP))
-PCT0 = $(if $(findstring -j,-$(MAKEFLAGS)),,"     ")
-ifeq (2,$P)
-PCT1 = $(if $(findstring -j,-$(MAKEFLAGS)),,[$(TOTAL)/$(TOTAL)])
-PCT = $(if $(findstring -j,-$(MAKEFLAGS)),,[$(firstword $(STEP))/$(TOTAL)])
-else
-PCT1 = $(if $(findstring -j,-$(MAKEFLAGS)),,[100])
-PCT = $(if $(findstring -j,-$(MAKEFLAGS)),,[$(word 2,$(STEP))%])
-endif
-define inc
-$(if $(findstring -j,-$(MAKEFLAGS)),,STEP := $(shell A=$$(($(firstword $(STEP))+$(if $1,$1,1))); B=$$(($$A*995/$(TOTAL)/10)); [ $$B -le 9 ] && B=0$$B; $(ECHO) $$A $$B))
-endef
-ifeq (0,$P)
-inc := 0 00
-endif
-endif
-endif
-
-ifeq (default,$(origin LD))
-LD := $(CC)
-endif
-$(eval LD := $(CXX) -Wl,--as-needed)
-$(eval MMD = -MMD -MF .dep.$$@)
-
-define CC
-@$(ECHO) -e $(PCT) $(eval $(inc)) "  CC         "$(PSX)$(CYAN)$(patsubst tmp.%,%,$<) $(RESET)
-@gcc
-endef
-
-define CCSO
-@$(ECHO) -e $(PCT) $(eval $(inc)) "  CC  [PIC]  "$(PSX)$(CYAN)$(patsubst tmp.%,%,$<) $(RESET)
-@gcc -fPIC
-endef
-
-define CXX
-@$(ECHO) -e $(PCT) $(eval $(inc)) "  CXX        "$(PSX)$(CYAN)$(patsubst tmp.%,%,$<) $(RESET)
-@g++
-endef
-
-define CXXSO
-@$(ECHO) -e $(PCT) $(eval $(inc)) "  CXX [PIC]  "$(PSX)$(CYAN)$(patsubst tmp.%,%,$<) $(RESET)
-@g++ -fPIC
-endef
-
-define MLD
-@$(ECHO) -e $(PCT) $(eval $(inc)) "  LD         "$(PSX)$(MAGENTA)$@ $(RESET)
-@$(LD)
-endef
-
-define MLDSO
-@$(ECHO) -e $(PCT) $(eval $(inc)) "  LD  [PIC]  "$(PSX)$(MAGENTA)$@ $(RESET)
-@$(LD) -shared
-endef
-
-define AR
-@$(ECHO) -e $(PCT) $(eval $(inc)) "  AR         "$(PSX)$(MAGENTA)$@ $(RESET)
-@ar
-endef
-
-define BIN2C
-@$(ECHO) -e $(PCT) $(eval $(inc)) "  BIN2C      "$(PSX)$(YELLOW)$@ $(RESET)
-@xxd -i
-endef
-
-ENTER = @$(ECHO) -e $(PCT) $(eval $(inc)) "  ENTER ==> "$(GREEN)
-LEAVE = @$(ECHO) -e $(PCT) $(eval $(inc)) "  LEAVE <== "$(GREEN)
-
-define RM
-@$(ECHO) -e $(PCT0)               "  CLEAN      "$(PSX)$(MAGENTA)$(if $(CLEAN),$(CLEAN),"<$(notdir $(CURDIR))>") $(RESET)
-@rm -f
-endef
-
-define INST
-@$(ECHO) -e $(PCT0)               "  INSTALL    "$(PSX)$(YELLOW)$* $(RESET)
-@install
-endef
-
-DONE  = @$(ECHO) -e $(PCT1)       "  DONE       "$(MAGENTA)"<$(notdir $(CURDIR))>" $(RESET)
-BAD   = ($(ECHO) -e $(PCT0)       "  BAD        "$(PSX)$(RED)$(1) $(RESET); /bin/false)
-BAD   = ($(ECHO) -e $(PCT0)       "  BAD        "$(PSX)$(RED)$(1) $(RESET); /bin/false)
-MDEP  = $(ECHO) -e $(PCT0) "  MAKEDEP    "$(YELLOW)$(EPREFIX)$(firstword $(MAKEFILE_LIST)) $(RESET) 1>&2
-
-tmp.%.c: %.c
-	@ln -s $< $@
-
-tmp.%.cc: %.cc
-	@ln -s $< $@
-
-tmp.%.cpp: %.cpp
-	@ln -s $< $@
-
-%.pic.o: %.c
-	$(CCSO) $(MMD) $(CFLAGS) $($*_cflags) -c -o $@ $<
-
-%_pic.o: %.c
-	$(CCSO) $(MMD) $(CFLAGS) $($*_cflags) -c -o $@ $<
-
-%.o: %.c
-	$(CC) $(MMD) $(CFLAGS) $($*_cflags) -c -o $@ $<
-
-%.pic.o: %.cc
-	$(CXXSO) $(MMD) $(CFLAGS) $(CXXFLAGS) $($*_cflags) -c -o $@ $<
-
-%_pic.o: %.cc
-	$(CXXSO) $(MMD) $(CFLAGS) $(CXXFLAGS) $($*_cflags) -c -o $@ $<
-
-%.o: %.cc
-	$(CXX) $(MMD) $(CFLAGS) $(CXXFLAGS) $($*_cflags) -c -o $@ $<
-
-%.pic.o: %.cpp
-	$(CXXSO) $(MMD) $(CFLAGS) $(CXXFLAGS) $($*_cflags) -c -o $@ $<
-
-%_pic.o: %.cpp
-	$(CXXSO) $(MMD) $(CFLAGS) $(CXXFLAGS) $($*_cflags) -c -o $@ $<
-
-%.o: %.cpp
-	$(CXX) $(MMD) $(CFLAGS) $(CXXFLAGS) $($*_cflags) -c -o $@ $<
-
-%.bin.c: %
-	$(BIN2C) $< >$@
-
-make_all_%::
-	$(ENTER) $(EPREFIX)$* $(RESET)
-	@$(MAKE) -s -C $*  all DONE= I=$I P=$P TOTAL=$(TOTAL) START=$(START) EPREFIX=$(EPREFIX)$*/
-	@$(eval $(call inc,$(TOTAL_$(strip $*))))
-	$(LEAVE) $(EPREFIX)$* $(RESET)
-
-make_extdir_%::
-	$(ENTER) $(word $*,$(EXTDIRS)) $(RESET)
-	@$(MAKE) -s -C $(word $*,$(EXTDIRS))  all DONE= P=$P TOTAL=$(TOTAL) START=$(START)
-	@$(eval $(call inc,$(TOTAL_make_extdir_$(strip $*))))
-	$(LEAVE) $(word $*,$(EXTDIRS)) $(RESET)
-
-make_clean_%:
-	@$(MAKE) -s -C $* clean CLEAN=$(if $(CLEAN),$(CLEAN)/)$*
-
-install_%.so: %.so
-	@[ -f $(install_dir) ] || mkdir -p $(install_dir)
-	$(INST) $(if $($*_soname),$($*_soname),$*.so) $(install_dir)
-	$(if $($*_soname),@ln -sf $($*_soname) $(install_dir)/$*.so)
-
-install_%: %
-	@[ -f $(install_dir) ] || mkdir -p $(install_dir)
-	$(INST) $* $(if $(install_mode),-m $(install_mode),) $(install_dir)
-
-%: %.c
-%: %.cc
-%: %.cpp
-%: %.o
-
-_COMMA=,
-_method :=
-ifneq (,$(findstring second-expansion,$(.FEATURES)))
-# for gmake v3.81 or above, second-expansion method
-.SECONDEXPANSION:
-_SUB=:.o=.pic.o
-%.pic.a: $$(%_objs$$(_SUB))
-	$(AR) cr $@ $^
-
-%.so: $$(%_objs$$(_SUB))
-#	$(MLDSO) -z defs $(LDFLAGS) -o $(if $($*_soname),$($*_soname) -Wl$(_COMMA)-soname=$($*_soname),$@) $^ $($*_libs) $(LIBPATH) $(LIBS)
-	$(MLDSO) -z defs $(LDFLAGS) -o $(if $($*_soname),$(if $($*_filename), $($*_filename), $($*_soname)) -Wl$(_COMMA)-soname=$($*_soname),$@) $^ $($*_libs) $(LIBPATH) $(LIBS)
-	$(if $($*_soname),@ln -sf $($*_soname) $@)
-	$(if $($*_soname),$(if $($*_filename), @ln -sf $($*_filename) $($*_soname)))
-
-# libdtc.so: $$(%_objs$$(_SUB))
-#	$(MLDSO) -z defs $(LDFLAGS) -o $(if $($*_soname), $filename -Wl$(_COMMA)-soname=$($*_soname),$@) $^ $($*_libs) $(LIBPATH) $(LIBS)
-#	$(if $($*_soname),@ln -sf $(filename) libdtc.so.1)
-#	$(if $($*_soname),@ln -sf libdtc.so.1 $@)
-
-%.a: $$(%_objs)
-	$(AR) cr $@ $^
-
-%: $$(%_objs)
-	@test -n "$^" || $(call BAD,$@)
-	$(MLD) $(LDFLAGS) -o $@ $^ $($*_libs) $(LIBPATH) $(LIBS)
-
-_method := second-expansion
-endif
-
-$(if $(_method),,$(if $(findstring i486,$(shell gcc -dumpmachine)),,$(eval _method := eval)))
-
-ifeq (eval,$(_method))
-# for gmake v3.80, $(eval) method
-define rule-piclib
-$p: $($(p:.pic.a=)_objs:.o=.pic.o)
-	$$(AR) cr $p $$^
-endef
-
-define rule-lib
-$p: $($(p:.a=)_objs)
-	$$(AR) cr $p $$^
-endef
-
-define rule-so
-$p: $($(p:.so=)_objs:.o=.pic.o)
-	$$(MLDSO) -z defs $$(LDFLAGS) -o $(if $($(p:.so=)_soname),$($(p:.so=)_soname) -Wl$(_COMMA)-soname=$($(p:.so=)_soname),$p) $$^ $$($(p:.so=)_libs) $$(LIBPATH) $$(LIBS)
-	$(if $($(p:.so=)_soname),@ln -s $($(p:.so=)_soname) $p)
-endef
-
-define rule-bin
-$p: $($p_objs)
-	$$(MLD) $$(LDFLAGS) -o $p $$($p_objs) $$($p_libs) $$(LIBPATH) $$(LIBS)
-endef
-
-endif
-# gmake 3.80 don't allow ($eval) inside if/endif block
-$(foreach p,$(filter %.pic.a,$(target)),$(if $($(p:.pic.a=)_objs),$(eval $(rule-piclib))))
-$(foreach p,$(filter %.a,$(target)),$(if $($(p:.a=)_objs),$(eval $(rule-lib))))
-$(foreach p,$(filter %.so,$(target)),$(if $($(p:.so=)_objs),$(eval $(rule-so))))
-$(foreach p,$(filter-out %.a %.o %.so,$(target)),$(if $($p_objs),$(eval $(rule-bin))))
-
-ifneq (clean,$(MAKECMDGOALS))
-ifneq (count,$(MAKECMDGOALS))
-ifeq (,$(_method))
-# without $(eval), fallback to temporary Makefile
-_method := makefile
-
-define cmd-piclib
-$(ECHO) '$p: $($(p:.pic.a=)_objs:.o=.pic.o)' >>.make.dep; \
-$(ECHO) '	$$(AR) cr $p $$^' >>.make.dep
-endef
-
-define cmd-lib
-$(ECHO) '$p: $($(p:.a=)_objs)' >>.make.dep; \
-$(ECHO) '	$$(AR) cr $p $$^' >>.make.dep
-endef
-
-define cmd-so
-$(ECHO) '$p: $($(p:.so=)_objs:.o=.pic.o)' >>.make.dep; \
-$(ECHO) '	$$(MLDSO) -z defs $$(LDFLAGS) -o $(if $($(p:.so=)_soname),$($(p:.so=)_soname) -Wl$(_COMMA)-soname=$($(p:.so=)_soname),$p) $$^ $$($(p:.so=)_libs) $$(LIBPATH) $$(LIBS)' >>.make.dep; \
-$(ECHO) '	$(if $($(p:.so=)_soname),@ln -s $($(p:.so=)_soname) $p)' >>.make.dep
-endef
-
-
-define cmd-bin
-$(ECHO) '$p: $($p_objs)' >>.make.dep; \
-$(ECHO) '	$$(MLD) $$(LDFLAGS) -o $p $$($p_objs) $$($p_libs) $$(LIBPATH) $$(LIBS)' >>.make.dep
-endef
-
-ifeq (OK,$(shell [ $(firstword $(MAKEFILE_LIST)) -nt .make.dep ] && $(ECHO) OK))
-$(shell $(MDEP))
-$(shell >.make.dep)
-$(foreach p,$(filter %.pic.a,$(target)),$(if $($(p:.pic.a=)_objs),$(shell $(cmd-piclib))))
-$(foreach p,$(filter %.a,$(target)),$(if $($(p:.a=)_objs),$(shell $(cmd-lib))))
-$(foreach p,$(filter %.so,$(target)),$(if $($(p:.so=)_objs),$(shell $(cmd-so))))
-$(foreach p,$(filter-out %.a %.o %.so,$(target)),$(if $($p_objs),$(shell $(cmd-bin))))
-endif
-include .make.dep
-
-endif
-endif
-endif
-
-
-.SECONDARY:
-
-all::
-	$(DONE)
-
-install:: all;
-
-clean::
-	$(foreach p,$(filter %.so,$(target)),@-rm -f $($(p:.so=)_soname))
-clean::
-	$(RM) .make.* *.o *.a *.d *.so .dep.* tmp.* *.log $(target) $(TSTS)
-
-count::
-	@$(ECHO) TOTAL_$(if $(DIRNAME),$(DIRNAME),all)=$(TOTAL)
-
-method::
-	@$(ECHO) rule method is $(_method).
-
-ifneq ($(wildcard .dep.*),)
--include $(wildcard .dep.*)
-endif
-

src/Makefile

@@ -1,6 +0,0 @@
-include Make.conf
-
-SUBDIRS := agent configcenter libs devel daemons core connector
-
-include Make.rules
-

src/agent/CMakeLists.txt

@@ -1,5 +1,3 @@
-#设置库文件输出路径
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/agent)
 IF("${GPROF}" EQUAL 1)
     ADD_COMPILE_OPTIONS(-pg)
 ENDIF()
@@ -16,14 +14,12 @@ IF("${HAVE_ASSERT_LOG}" EQUAL 1)
     ADD_COMPILE_OPTIONS(-DHAVE_ASSERT_LOG=1)
 ENDIF()
 
-#把当前目录下的源文件列表存放到变量SRC_LIST1里
 FILE(GLOB SRC_LIST1 ./*.c)
 FILE(GLOB SRC_LIST2 ./common/*.c)
 FILE(GLOB SRC_LIST3 ./event/*.c)
 FILE(GLOB SRC_LIST4 ./hashkit/*.c)
 FILE(GLOB SRC_LIST5 ./proto/*.c)
 
-#添加头文件搜索路径，相当于gcc -I
 INCLUDE_DIRECTORIES(
     .
     ./common 
@@ -31,14 +27,11 @@ INCLUDE_DIRECTORIES(
     ./hashkit 
     ./proto)
 
-#链接目标库
 LINK_LIBRARIES(rt) 
 LINK_LIBRARIES(mxml)
 LINK_LIBRARIES(pthread)
 
-#编译参数
 ADD_DEFINITIONS ("-D_GNU_SOURCE")
 
-#编译为.so/.a
 ADD_EXECUTABLE(dtcagent ${SRC_LIST1} ${SRC_LIST2} ${SRC_LIST3} ${SRC_LIST4} ${SRC_LIST5})
 

src/agent/Makefile

@@ -1,41 +0,0 @@
-#include ../Make.conf
-
-VPATH := ./event ./common ./hashkit ./proto ./tools
-CFLAGS+= -I./event -I./common -I./hashkit -I./proto
-
-#for gprof only
-ifeq ($(GPROF),1)
-CFLAGS += -pg
-LDFLAGS += -pg
-endif
-
-#建议在x86中打开
-ifeq ($(USE_REGPARM),1)
-CFLAGS += -DCONFIG_REGPARM=3
-endif
-ifeq ($(HAVE_STATS),1)
-CFLAGS += -DHAVE_STATS=1
-endif
-
-ifeq ($(USE_COMPATIBLE_MODE),1)
-CFLAGS += -DUSE_COMPATIBLE_MODE=1
-endif
-
-ifeq ($(HAVE_ASSERT_LOG),1)
-CFLAGS += -DHAVE_ASSERT_LOG=1
-endif
-
-target = dtcagent
-
-dtcagent_list := da da_log da_mem_pool da_util da_conn da_time da_rbtree \
-				 da_signal da_array da_string da_epoll da_crc16 da_crc32 \
-				 da_fnv da_chash da_hsieh da_jenkins da_ketama da_md5 da_murmur da_listener \
-				 da_one_at_a_time da_msg da_client da_server da_stats da_request da_response \
-				 da_buf da_dtcparse da_conf da_core da_top_percentile
-dtcagent_objs := $(patsubst %,%.o,$(dtcagent_list))
-dtcagent_libs := -lpthread -lrt -lmxml
-
-target_install = dtcagent
-
-install_dir = .
-include ../Make.rules

src/configcenter/Makefile

@@ -1,5 +0,0 @@
-include ../Make.conf
-
-SUBDIRS := ca_api
-
-include ../Make.rules

src/configcenter/ca_api/CMakeLists.txt

@@ -1,15 +1,9 @@
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/configcenter/ca_api)
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/configcenter/ca_api)
-#添加头文件搜索路径，相当于gcc -I
 INCLUDE_DIRECTORIES(.)
     
-#把当前目录下的源文件列表存放到变量SRC_LIST1里
 AUX_SOURCE_DIRECTORY(. SRC_LIST1)
 
-#编译参数
 ADD_DEFINITIONS("-g -Wall -fPIC")
 
-#编译为.so/.a
 ADD_EXECUTABLE(client-tool ${SRC_LIST1})
 ADD_LIBRARY(app-client ${SRC_LIST1})
 

src/configcenter/ca_api/Makefile

@@ -1,33 +0,0 @@
-OBJECTS = app_client_set.o app_shm_manager.o ca_quick_find.o
-
-C_ARGS = -g -Wall -fPIC
-SHARED = -shared
-STATIC = ar
-LD_ARGS = rcs
-
-CXX = g++
-CC = gcc
-
-DY_BINARY = libapp-client.so
-ST_BINARY = libapp-client.a
-CLIENT_TOOL = client-tool
-
-all: $(ST_BINARY) $(CLIENT_TOOL)
-
-.cpp.o:
-	$(CXX) $(C_ARGS) -c $^ 
-
-.cc.o:
-	$(CXX) $(C_ARGS) -c $^ 
-
-.c.o:
-	$(CC) $(C_ARGS) -c $^ 
-
-libapp-client.a: $(OBJECTS)
-	$(STATIC) $(LD_ARGS) $@ $^
-
-	@export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:. ; $(CC) $(C_ARGS) ca_dump_shm.c -o $(CLIENT_TOOL) -g -L./ -lapp-client
-	
-.PHONY: clean
-clean:
-	-rm -f *.o $(DY_BINARY) ${ST_BINARY} $(CLIENT_TOOL)

src/connector/CMakeLists.txt

@@ -1,14 +1,5 @@
-#设置库文件输出路径
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/connector)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-    ADD_COMPILE_OPTIONS(-std=gnu++11)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
-#把当前目录下的源文件列表存放到变量SRC_LIST里
 FILE(GLOB_RECURSE SRC_LIST ./*.cc)
 
-#添加头文件搜索路径，相当于gcc -I
 INCLUDE_DIRECTORIES (
     .
     ../daemons
@@ -27,7 +18,6 @@ INCLUDE_DIRECTORIES (
     ../libs/zlib/include64
     ../libs/yaml-cpp/include/)
 
-#添加.so/.a文件搜索路径，相当于gcc -L
 LINK_DIRECTORIES (
     ${PROJECT_SOURCE_DIR}/libs/rocksdb/lib
     ${PROJECT_SOURCE_DIR}/libs/common
@@ -39,7 +29,6 @@ LINK_DIRECTORIES (
     ${PROJECT_SOURCE_DIR}/libs/stat
 )
 
-#添加链接库，相当于gcc -l
 LINK_LIBRARIES(liblog4cplus.a) 
 LINK_LIBRARIES(libyaml-cpp.a)
 LINK_LIBRARIES(libz64.a)
@@ -54,10 +43,8 @@ LINK_LIBRARIES(libcommon.a)
 LINK_LIBRARIES(libdaemons.a)
 LINK_LIBRARIES(libstat.a)
 
-#编译参数
-ADD_DEFINITIONS ("-g -fPIC -fpermissive -DROCKSDB_COMPILER=1 -DOMN_PLATFORM_UNIX -Wl,--no-undefined -Xlinker -zmuldefs")
-#编译为.so/.a
+ADD_DEFINITIONS ("-g -fPIC -fpermissive -std=gnu++11 -DROCKSDB_COMPILER=1 -DOMN_PLATFORM_UNIX -Wl,--no-undefined -Xlinker -zmuldefs")
+
 ADD_LIBRARY (rocksdb_connector ${SRC_LIST})
 
-#将目标文件与库文件链接
 TARGET_LINK_LIBRARIES(rocksdb_connector liblog4cplus.a libyaml-cpp.a  libz64.a lbdtcd.a libcommon.a libdaemons.a libstat.a)

src/connector/Makefile

@@ -1,49 +0,0 @@
-include ../Make.conf
-
-TARGETEXE = rocksdb_connector
-
-CC = g++
-
-.SUFFIXES: .cc .h
-
-FLAGS = -g -std=c++11 -DROCKSDB_COMPILER=1 -DOMN_PLATFORM_UNIX $(Optimize) -Wl,--no-undefined -Xlinker -zmuldefs
-
-INCDIRS = -I.. -I../libs/common -I../daemons -I../core -I../libs/stat -I../libs/rocksdb/include -I../libs/rocksdb/logging $(LOG4CPLUS_INC)  $(YAML_CPP_INC)
-
-LIBDIR = -L../libs/common  -L../core -L../libs/rocksdb/lib
-
-OBJDIR = .
-
-CREATEOBJDIR = $(shell if [ -d $(OBJDIR) ]; then echo ""; else mkdir $(OBJDIR); fi)
-
-OUTPUTDIR = .
-
-LIBS = -lnsl -lpthread -lstdc++ -ldl -lz -lrocksdb -L../bin 
-
-DLIBS = ../core/libdtcd.a \
-		../libs/common/libcommon.a \
-		../libs/stat/libstat.a \
-		../daemons/libdaemons.a \
-		$(LOG4CPLUS_LIB) \
-		$(YAML_CPP_LIB) \
-#
-# objects and targets
-#
-OBJECTS = $(wildcard *.cc)
-OBJECTS:= $(filter-out comm_main.cc db_process_gauss.cc gauss_db_conn.cc, $(OBJECTS))
-OBJECTS:= $(patsubst %.cc,$(OBJDIR)/%.o,$(OBJECTS))
-
-#
-# Rules for normal comile and link 
-#
-all:: $(TARGETEXE) 
-
-$(TARGETEXE): $(OBJECTS)
-	$(CC) -rdynamic -Wl,--no-as-needed $(FLAGS) -o $(OBJDIR)/$(TARGETEXE) $^  $(LIBDIR) $(DLIBS) $(LIBS) $(DLIBS) 
-$(OBJECTS): $(OBJDIR)/%.o: %.cc
-	$(CREATEOBJDIR)
-	$(CC) -c -static  $(FLAGS) $< $(INCDIRS) -o $@
-
-clean:
-	rm -rf $(OBJDIR)/*.o $(OBJDIR)/$(TARGETEXE)
-	rm -rf ./tester/rocksdata/*

src/core/CMakeLists.txt

@@ -1,14 +1,8 @@
-#设置库文件输出路径
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/core)
-#设置可执行文件输出路径
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/core)
+# #设置库文件输出路径
+# SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/core)
+# #设置可执行文件输出路径
+# SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/core)
 
-if(CMAKE_COMPILER_IS_GNUCXX)
-    add_compile_options(-std=gnu++11)
-endif(CMAKE_COMPILER_IS_GNUCXX)
-
-
-#把当前目录下的源文件列表存放到变量SRC_LIST里
 FILE(GLOB_RECURSE SRC_LIST ./*.cc ./*.c)
 
 #添加头文件搜索路径，相当于gcc -I
@@ -31,9 +25,9 @@ LINK_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/src/libs/log4cplus/libs
     ${PROJECT_SOURCE_DIR}/src/libs/yaml-cpp/libs
     ${PROJECT_SOURCE_DIR}/src/libs/zlib/lib/
-    ${PROJECT_SOURCE_DIR}/src/libs/common
-    ${PROJECT_SOURCE_DIR}/src/libs/stat
-    ${PROJECT_SOURCE_DIR}/src/daemons)
+    ${PROJECT_SOURCE_DIR}/build/src/libs/common
+    ${PROJECT_SOURCE_DIR}/build/src/libs/stat
+    ${PROJECT_SOURCE_DIR}/build/src/daemons)
 
 #添加链接库，相当于gcc -l
 LINK_LIBRARIES(liblog4cplus.a) 
@@ -46,7 +40,7 @@ LINK_LIBRARIES(pthread)
 LINK_LIBRARIES(dl)
 
 #编译参数
-ADD_DEFINITIONS(" -g -rdynamic -fPIC -fpermissive -D_GLIBCXX_USE_CXX11_ABI=0 -export-dynamic -Wl,--version-script,dtcd.export.lst")
+ADD_DEFINITIONS(" -g -rdynamic -fPIC -fpermissive -std=gnu++11 -D_GLIBCXX_USE_CXX11_ABI=0 -export-dynamic -Wl,--version-script,dtcd.export.lst")
 
 #编译为.so/.a
 ADD_EXECUTABLE(dtcd ${SRC_LIST})

src/core/Makefile

@@ -1,43 +0,0 @@
-include ../Make.conf
-
-SRC_FOLDER := $(shell find . -maxdepth 1 -type d)
-VPATH :=../libs/stat $(basename $(patsubst ./%, %/, $(SRC_FOLDER)))
-
-####################compile#################
-CFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11
-CFLAGS += -I./ -I../libs/common -I../devel/cpp -I../libs/stat -I../daemons -I../connector $(LOG4CPLUS_INC)  $(YAML_CPP_INC)
-CFLAGS += $(basename $(patsubst ./%, -I%, $(SRC_FOLDER)))
-
-LIBPATH := -L. -L../libs/common -L../daemons -L../libs/stat -L../devel $(LOG4CPLUS_LIB) $(YAML_CPP_LIB)
-DB%.o tmp.DB%.o:CFLAGS += $(MYSQLINC)
-ifneq ($(findstring x86_64,$(PLATFORM)),)
-BITS=64
-else
-BITS=32
-endif
-
-LIBDTCAPI := -L../devel  -lpthread -Wl,-rpath,\$$ORIGIN/../lib/ -Wl,-rpath,\$$ORIGIN  -Wl,-rpath,\$$ORIGIN/../devel/  -Wl,-rpath,\$$ORIGIN/../ -z origin
-
-target = libdtcd.a dtcd
-target_external = ../devel/cpp/libdtc.a ../libs/stat/libstat.a ../libs/common/libcommon.a 
-
-$(filterout libdtcd.a,$(target)): libdtcd.a;
-
-filelist := feature hash ng_info node_set node_index barrier_ask_answer_chain buffer_bypass_answer_chain buffer_bypass_ask_chain buffer_pond\
-		pt_malloc sys_malloc raw_data raw_data_process buffer_process_answer_chain buffer_process_ask_chain buffer_flush\
-		job_procedure empty_filter black_hole_ask_chain logger task_pendlist lru_bit hb_log\
-		hb_feature container_dtcd col_expand t_tree tree_data\
-		tree_data_process expire_time main_supply main hot_backup_ask_chain system_command_ask_chain 
-libdtcd_objs:= $(sort $(filelist:%=%.o))
-
-#dtcd
-dtcd: CFLAGS += -export-dynamic
-dtcd: LDFLAGS += -Wl,--version-script,dtcd.export.lst
-dtcd_objs:= main.o system_command_ask_chain.o stat_client.o expire_time.o hot_backup_ask_chain.o 
-dtcd_libs:= -lstat -ldaemons  -ldtcd -lcommon -lpthread -ldl $(Z_LIB) -rdynamic
-
-#####################install############
-target_install = dtcd
-install_dir = ../../bin
-
-include ../Make.rules

src/daemons/CMakeLists.txt

@@ -1,11 +1,3 @@
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/daemons)
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/daemons)
-
-if(CMAKE_COMPILER_IS_GNUCXX)
-    add_compile_options(-std=gnu++11)
-endif(CMAKE_COMPILER_IS_GNUCXX)
-
-#添加头文件搜索路径，相当于gcc -I
 INCLUDE_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/src/daemons
     ${PROJECT_SOURCE_DIR}/src/libs/common
@@ -13,18 +5,16 @@ INCLUDE_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/src/libs/log4cplus/include
     ${PROJECT_SOURCE_DIR}/src/libs/yaml-cpp/include)
     
-#添加.so/.a文件搜索路径，相当于gcc -L
 LINK_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/src/libs/log4cplus/libs
     ${PROJECT_SOURCE_DIR}/src/libs/yaml-cpp/libs
-    ${PROJECT_SOURCE_DIR}/src/libs/common
-    ${PROJECT_SOURCE_DIR}/src/libs/stat)
+    ${PROJECT_SOURCE_DIR}/build/src/libs/common
+    ${PROJECT_SOURCE_DIR}/build/src/libs/stat)
+
 
-#把当前目录下的源文件列表存放到变量SRC_LIST1里
 FILE(GLOB_RECURSE SRC_LIST1 ./*.cc ./*.c)
-#aux_source_directory(${PROJECT_SOURCE_DIR}/libs/stat/stat_alarm_reporter SRC_LIST2)
 
-#链接目标库
+
 LINK_LIBRARIES(liblog4cplus.a) 
 LINK_LIBRARIES(libcommon.a)
 LINK_LIBRARIES(libyaml-cpp.a)
@@ -32,13 +22,10 @@ LINK_LIBRARIES(libstat.a)
 LINK_LIBRARIES(pthread)
 LINK_LIBRARIES(dl)
 
-#编译参数
-ADD_DEFINITIONS("-g -fPIC -fpermissive")
+ADD_DEFINITIONS("-g -fPIC -fpermissive -std=gnu++11")
 
-#编译为.so/.a
 ADD_EXECUTABLE(faultlogger ${SRC_LIST1})
 ADD_LIBRARY(daemons ${SRC_LIST1})
 
-#把目标文件与库文件进行链接
 TARGET_LINK_LIBRARIES(faultlogger libstat.a libcommon.a libyaml-cpp.a liblog4cplus.a)
 TARGET_LINK_LIBRARIES(daemons libstat.a liblog4cplus.a libyaml-cpp.a libcommon.a)

src/daemons/Makefile

@@ -1,21 +0,0 @@
-include ../Make.conf
-
-target = libdaemons.a faultlogger
-
-CFLAGS+=-I../libs/common -I../libs/stat -std=gnu++11 -fPIC $(LOG4CPLUS_INC)  $(YAML_CPP_INC)
-VPATH := ../libs/stat
-filelist := daemons base fork helper daemon_listener main run stattool unit logger fault gdb gdb_srv stat_alarm_reporter
-libdaemons_objs := $(filelist:%=%.o) $(LOG4CPLUS_LIB) $(YAML_CPP_LIB) 
-
-faultlogger: LDFLAGS += -shared -e _so_start
-
-faultlogger_objs = fault.pic.o
-
-fault.pic.o fault.o: CFLAGS += -O0
-
-target_install = faultlogger
-
-install_dir = ../../bin
-
-include ../Make.rules
-

src/devel/Makefile

@@ -1,5 +0,0 @@
-include ../Make.conf
-
-SUBDIRS := cpp
-
-include ../Make.rules

src/devel/cpp/CMakeLists.txt

@@ -1,8 +1,3 @@
-
-#设置库文件输出路径
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/devel/cpp)
-
-#把当前目录下的源文件列表存放到变量SRC_LIST1里
 FILE(GLOB SRC_LIST1 ./*.c ./*.cc )
 
 SET(${SRC_LIST2} ../../libs/common/value.c
@@ -23,7 +18,6 @@ SET(${SRC_LIST2} ../../libs/common/value.c
                  ../../libs/common/buffer.cc
                  ../../libs/common/thread/thread.cc)
 
-#添加头文件搜索路径，相当于gcc -I
 INCLUDE_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/src/devel/cpp 
     ${PROJECT_SOURCE_DIR}/src/libs/common 
@@ -32,15 +26,13 @@ INCLUDE_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/src/libs/zlib/include64
     ${PROJECT_SOURCE_DIR}/src/libs/yaml-cpp/include/)
 
-#添加.so/.a文件搜索路径，相当于gcc -L
 LINK_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/src/libs/log4cplus/libs
     ${PROJECT_SOURCE_DIR}/src/libs/yaml-cpp/libs
     ${PROJECT_SOURCE_DIR}/src/libs/zlib/lib/
-    ${PROJECT_SOURCE_DIR}/src/libs/common
-    ${PROJECT_SOURCE_DIR}/src/configcenter/ca_api/)
+    ${PROJECT_SOURCE_DIR}/build/src/libs/common
+    ${PROJECT_SOURCE_DIR}/build/src/configcenter/ca_api/)
 
-#链接目标库
 LINK_LIBRARIES(dl) 
 LINK_LIBRARIES(pthread)
 LINK_LIBRARIES(liblog4cplus.a) 
@@ -49,18 +41,14 @@ LINK_LIBRARIES(libz64.a)
 LINK_LIBRARIES(libapp-client.a)
 LINK_LIBRARIES(libcommon.a)
 
-#编译参数
 ADD_DEFINITIONS ("-g -rdynamic -fPIC -fpermissive -DCLIENTAPI -D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11 ")
 
-#编译为.so/.a
 ADD_LIBRARY(dtc.2 SHARED ${SRC_LIST1} ${SRC_LIST2} )
 ADD_LIBRARY(dtc STATIC ${SRC_LIST1} ${SRC_LIST2} )
 ADD_LIBRARY(dtc.pic STATIC ${SRC_LIST1} ${SRC_LIST2})
 
-#把目标文件与库文件进行链接
 TARGET_LINK_LIBRARIES(dtc.2 libcommon.a libyaml-cpp.a liblog4cplus.a libz64.a libapp-client.a)
 TARGET_LINK_LIBRARIES(dtc libcommon.a libyaml-cpp.a liblog4cplus.a libz64.a libapp-client.a)
 TARGET_LINK_LIBRARIES(dtc.pic libcommon.a libyaml-cpp.a liblog4cplus.a libz64.a libapp-client.a)
 
-#设置make install 安装路径
 INSTALL(TARGETS dtc.2 LIBRARY DESTINATION /usr/lib/)

src/devel/cpp/Makefile

@@ -1,43 +0,0 @@
-LIB_PATH = ../..
-
-include ../../Make.conf
-
-GIT_VERSION=$(shell git log . | head -n 4 | grep "commit" | cut -d " " -f 2 | cut -c 1-7)
-SVN_REVISION = $(shell test -d .svn && (svn info | grep "Last Changed Rev" | cut -d " " -f 4))
-ifeq "$(SVN_REVISION)a" "a"
-	SVN_REVISION = "(unknown)"
-endif
-
-SRC_FOLDER := $(shell find ../../libs/common -maxdepth 1 -type d)
-VPATH = ../../libs/common ../../configcenter/ca_api/ $(basename $(patsubst ./%, %/, $(SRC_FOLDER)))
-################compile#############
-target = libdtc.a container_api.pic.o version.pic.o somain.pic.o libdtc.so libdtc.pic.a 
-
-# CLIENTAPI macro use for scope test only
-CFLAGS += -DCLIENTAPI
-CFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 -std=gnu++11
-CFLAGS += -pthread -I../../libs/common -I../../stat -I../../configcenter/ca_api/ $(LOG4CPLUS_INC) $(ZINC) $(YAML_CPP_INC)
-LIBS = ${Z_LIB} -ldl -lpthread  $(LOG4CPLUS_LIB) $(CA_API_LIB) -L../../libs/common -lcommon $(YAML_CPP_LIB)
-
-filelist := dtcreq value dtcsvr dtcpool dtcwrap dtcwrapp dtcqossvr \
-	poller timer_list key_list table_def log_client mem_check \
-	md5 section decode encode field_api packet_base \
-	packet_client task_base task_const socket_addr udppool compress buffer thread
-#filelist := dtcreq
-
-#lidttc.so: container_api.pic.o version.pic.o
-
-# for auto ln -sf
-libdtc_objs := $(patsubst %,%.o,$(filelist))
-libdtc.so: LDFLAGS += -Wl,--version-script,dtcapi.lst -e _so_start container_api.pic.o version.pic.o somain.pic.o
-libdtc_filename := libdtc-gcc-$(GCCVER)-r$(GIT_VERSION).so
-libdtc_soname := libdtc.so.1
-
-###############install##############
-target_install = libdtc.a libdtc.pic.a libdtc.so dtcapi.h 
-install_dir = ../../../bin
-%.a: install_dir = ../../../lib
-%.h: install_dir = ../../../include
-
-include ../../Make.rules
-

src/libs/CMakeLists.txt

@@ -1,2 +1,2 @@
-add_subdirectory (./common)	
-add_subdirectory (./stat)	
+ADD_SUBDIRECTORY (./common)	
+ADD_SUBDIRECTORY (./stat)	

src/libs/Makefile

@@ -1,5 +0,0 @@
-include ../Make.conf
-
-SUBDIRS := common stat
-
-include ../Make.rules

src/libs/common/CMakeLists.txt

@@ -1,14 +1,5 @@
-#设置库文件输出路径
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/libs/common)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-    ADD_COMPILE_OPTIONS(-std=gnu++11)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
-#把当前目录下的源文件列表存放到变量SRC_LIST里
 FILE(GLOB_RECURSE SRC_LIST ./*.cc ./*.c)
 
-#添加头文件搜索路径，相当于gcc -I
 INCLUDE_DIRECTORIES (
     .
     ../../devel/cpp
@@ -18,23 +9,19 @@ INCLUDE_DIRECTORIES (
     ../zlib/include64
     ../yaml-cpp/include/)
 
-#添加.so/.a文件搜索路径，相当于gcc -L
 LINK_DIRECTORIES (
     ${PROJECT_SOURCE_DIR}/src/libs/zlib/lib/libz64.a
     ${PROJECT_SOURCE_DIR}/src/libs/log4cplus/libs
     ${PROJECT_SOURCE_DIR}/src/libs/yaml-cpp/libs
 )
 
-#添加链接库，相当于gcc -l
 LINK_LIBRARIES(liblog4cplus.a) 
 LINK_LIBRARIES(libyaml-cpp.a)
 LINK_LIBRARIES(libz64.a)
 LINK_LIBRARIES(pthread)
 
-#编译参数
-ADD_DEFINITIONS ("-g -fPIC -fpermissive")
-#编译为.so/.a
+ADD_DEFINITIONS ("-g -fPIC -fpermissive -std=gnu++11")
+
 ADD_LIBRARY (common ${SRC_LIST})
 
-#将目标文件与库文件链接
 TARGET_LINK_LIBRARIES(common liblog4cplus.a libyaml-cpp.a  libz64.a)

src/libs/common/Makefile

@@ -1,44 +0,0 @@
-LIB_PATH = ../..
-
-include ../../Make.conf
-
-target = libcommon.a libcommon_nopic.a
-CFLAGS+=-I../../devel/cpp -I. -I../../daemons -I../stat $(LOG4CPLUS_INC) $(ZINC) -std=gnu++11 $(YAML_CPP_INC)
-LIBS = $(Z_LIB)  $(LOG4CPLUS_LIB) $(YAML_CPP_LIB) 
-SRC_FOLDER := $(shell find . -maxdepth 1 -type d)
-VPATH = ../../daemons $(basename $(patsubst ./%, %/, $(SRC_FOLDER)))
-GIT_VERSION=$(shell git log | head -n 4 | grep "commit" | cut -d " " -f 2 | cut -c 1-7)
-ifeq "$(GIT_VERSION)a" "a"
-	GIT_REVISION = "(unknown)"
-endif
-$(shell sed -i '11s/"[^"]*"/"$(GIT_VERSION)"/' version.h)
-
-filelist := md5 value decode encode field section table_def \
-	packet_base packet_server packet_result \
-	task_const task_base task_pkey task_server task_copy task_request task_api \
-	poller timer_list config version system_lock log \
-	shmem mem_check dbconfig dbconfig_tdef hotbackup_table_def \
-	daemon daemon_wait proc_title thread poller_base poll_thread_group thread_cpu_stat \
-	buffer localip \
-	key_helper bitsop socket_addr socket_bind blacklist blacklist_unit \
-	multi_request task_multi_unit \
-	connector_client data_connector_ask_chain connector_group \
-	listener listener_pool decoder_base \
-	client_sync client_async client_unit client_dgram  \
-	plugin_request plugin_mgr plugin_dgram plugin_sync \
-	plugin_worker plugin_unit plugin_listener_pool \
-	plugin_global plugin_decoder plugin_timer dtc_global\
-	compress client_resource_pool \
-	new_hash remote_dtc_ask_answer_chain consistent_hash_selector chash\
-	file_backed_key_set markup_stl parse_cluster_config key_route_ask_chain \
-	agent_client job_entrance_ask_chain agent_listener agent_listen_pool agent_unit agent_receiver agent_sender \
-	agent_multi_request plugin_proxy_mgr plugin_proxy_listener_pool fork hotback_task table_def_manager
-
-libcommon_objs := $(filelist:%=%_pic.o)
-%_pic.o: CFLAGS  += -pthread -fPIC 
-
-libcommon_nopic_objs := $(filelist:%=%.o)
-%.o: CFLAGS  += -pthread
-
-include ../../Make.rules
-

src/libs/stat/CMakeLists.txt

@@ -1,40 +1,27 @@
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/libs/stat)
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/src/libs/stat)
-
-if(CMAKE_COMPILER_IS_GNUCXX)
-    add_compile_options(-std=gnu++11)
-endif(CMAKE_COMPILER_IS_GNUCXX)
-#添加头文件搜索路径，相当于gcc -I
 INCLUDE_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/src/libs/stat
     ${PROJECT_SOURCE_DIR}/src/libs/common
     ${PROJECT_SOURCE_DIR}/src/libs/log4cplus/include
     ${PROJECT_SOURCE_DIR}/src/libs/yaml-cpp/include)
     
-#添加.so/.a文件搜索路径，相当于gcc -L
 LINK_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/src/libs/log4cplus/libs
     ${PROJECT_SOURCE_DIR}/src/libs/yaml-cpp/libs
-    ${PROJECT_SOURCE_DIR}/src/libs/common)
+    ${PROJECT_SOURCE_DIR}/build/src/libs/common)
 
-#把当前目录下的源文件列表存放到变量SRC_LIST1里
 FILE(GLOB_RECURSE SRC_LIST1 ./*.cc ./*.c)
 
-#链接目标库
 LINK_LIBRARIES(liblog4cplus.a) 
 LINK_LIBRARIES(libcommon.a)
 LINK_LIBRARIES(libyaml-cpp.a)
 LINK_LIBRARIES(pthread)
 LINK_LIBRARIES(dl)
 
-#编译参数
-ADD_DEFINITIONS("-g -fPIC -fpermissive")
+ADD_DEFINITIONS("-g -fPIC -fpermissive -std=gnu++11")
 
-#编译为.so/.a
 ADD_EXECUTABLE(stattool ${SRC_LIST1})
 ADD_LIBRARY(stat ${SRC_LIST1})
 
-#把目标文件与库文件进行链接
 TARGET_LINK_LIBRARIES(stattool libcommon.a libyaml-cpp.a liblog4cplus.a)
 TARGET_LINK_LIBRARIES(stat liblog4cplus.a libyaml-cpp.a libcommon.a)
 

src/libs/stat/Makefile

@@ -1,29 +0,0 @@
-LIB_PATH = ../..
-
-include ../../Make.conf
-
-#################compile ############
-target = libstat.a stattool
-
-CFLAGS+=-I../common -std=gnu++11 $(LOG4CPLUS_INC)
-ifneq ($(findstring x86_64,$(PLATFORM)),)
-BITS=64
-else
-BITS=32
-endif
-
-filelist := stat_manager stat_dtc stat_thread stat_dtc_def stat_client stat_attn stat_table_formater stat_manager_container_thread stat_alarm_reporter stat_tool
-libstat_objs := $(filelist:%=%.o)
-libstat_objs: CFLAGS += -pthread
-
-
-stattool_src := stat_tool stat_table_formater stat_manager stat_attn stat_client stat_dtc_def stat_alarm_reporter
-stattool_objs := $(stattool_src:%=%.o)
-stattool_libs := -L../common -lcommon -ldl -lpthread $(LOG4CPLUS_LIB) $(YAML_CPP_LIB)
-
-##################install #############
-target_install = stattool
-install_dir = ../../../bin
-
-include ../../Make.rules
-

test/CMakeLists.txt

@@ -0,0 +1,14 @@
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/devel/cpp/)
+
+LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/build/src/devel/cpp)
+
+LINK_LIBRARIES(libdtc.2.so) 
+
+ADD_EXECUTABLE(insert "insert.cc")
+ADD_EXECUTABLE(get "get.cc")
+
+TARGET_LINK_LIBRARIES(insert libdtc.2.so)
+TARGET_LINK_LIBRARIES(get libdtc.2.so)
+
+
+

test/get.cc

@@ -66,7 +66,7 @@ void select(DTC::Server server) {
     printf("uin[%u] data not exist.\n", uid);
 
   /* 读取结果的Key值 */
-  printf("result key: %d\n", result.int_key());
+  printf("result key: %lld\n", result.int_key());
 
   /* 输出结果的行数 */
   printf("NumRows:%d\n", result.get_num_row_size());
@@ -81,20 +81,19 @@ void select(DTC::Server server) {
     }
     /* 如果一切正确，则可以输出数据了 */
     /* 输出int类型的数据 */
-    printf("uid: %d\n", result.int_value("uid"));
+    printf("uid: %lld\n", result.int_value("uid"));
     /* 输出binary类型的数据 */
     printf("name: %s\n", result.binary_value("name"));
     /* 输出string类型的数据 */
     printf("city: %s\n", result.string_value("city"));
-    printf("age:%d\n", result.int_value("age"));
-    printf("sex:%d\n", result.int_value("sex"));
+    printf("age:%lld\n", result.int_value("age"));
+    printf("sex:%lld\n", result.int_value("sex"));
   }
 }
 
 int main(int argc, char *argv[]) {
   /* 只要server不析构，后台会保持长连接 */
   DTC::Server server;
-
   /* 设置的dtc的ip和端口 */
   server.set_address("127.0.0.1", "20015");
   /* 设置网络超时时间,单次网络IO的超时,单位秒 */