Merge branch 'remove_makefiles' into develop

query_classifier/makefile

@@ -1,79 +0,0 @@
-include ../build_gateway.inc
-include ../makefile.inc
-
-CC = gcc
-CPP = g++
-
-SRCS 			:= query_classifier.cc
-UTILS_PATH		:= $(ROOT_PATH)/utils
-QUERY_CLASSIFIER_PATH 	:= $(ROOT_PATH)/query_classifier
-LOG_MANAGER_PATH	:= $(ROOT_PATH)/log_manager
-SERVER_INC_PATH		:= $(ROOT_PATH)/server/include
-MODULE_INC_PATH		:= $(ROOT_PATH)/server/modules/include
-
-makeall: clean all
-
-clean:
-	$(MAKE) -C $(UTILS_PATH) clean
-	- $(DEL) query_classifier.o 
-	- $(DEL) libquery_classifier.so
-	- $(DEL) libquery_classifier.so.1.0.1 
-	- $(DEL) *~
-	- $(DEL) depend
-
-all: utils lib
-
-cleantests:
-	$(MAKE) -C test cleantests
-
-buildtests:
-	$(MAKE) -C test DEBUG=Y DYNLIB=Y buildtests
-
-runtests:
-	$(MAKE) -C test runtests
-
-testall: 
-	$(MAKE) -C test testall
-	
-utils:
-	$(MAKE) -C $(UTILS_PATH) clean all
-
-lib: libcomp liblink
-
-libcomp: 
-	$(CPP) -c $(CFLAGS) \
-	$(MYSQL_HEADERS) \
-	-I$(LOG_MANAGER_PATH) \
-	-I$(SERVER_INC_PATH) \
-	-I$(MODULE_INC_PATH) \
-	-I$(UTILS_PATH) \
-	-I./ \
-	-fPIC ./query_classifier.cc -o query_classifier.o
-
-liblink:
-	 $(CPP) -shared \
-	-L$(EMBEDDED_LIB) \
-	-Wl,-soname,libquery_classifier.so \
-	-Wl,-rpath,$(DEST)/lib \
-	-Wl,-rpath,$(EMBEDDED_LIB) \
-	-o libquery_classifier.so.1.0.1 ./query_classifier.o \
-	$(LDLIBS) $(LDMYSQL) $(CPP_LDLIBS)
-	$(DEL) ./libquery_classifier.so
-	$(LINK) ./libquery_classifier.so.1.0.1 ./libquery_classifier.so
-
-
-install: liblink
-	install ./libquery_classifier.so.1.0.1 ./libquery_classifier.so $(DEST)/lib
-
-depend:
-	@$(DEL) depend
-	$(CPP) -M $(CFLAGS) \
-	$(MYSQL_HEADERS) \
-	-I$(LOG_MANAGER_PATH) \
-	-I$(SERVER_INC_PATH) \
-	-I$(MODULE_INC_PATH) \
-	-I$(UTILS_PATH) \
-	-I./ \
-	$(SRCS) > depend
-
-include depend

query_classifier/test/canonical_tests/Makefile

@@ -1,62 +0,0 @@
-# cleantests 	- clean local and subdirectories' tests
-# buildtests	- build all local and subdirectories' tests
-# runtests	- run all local tests 
-# testall	- clean, build and run local and subdirectories' tests
-
-include ../../../build_gateway.inc
-include ../../../makefile.inc
-include ../../../test.inc
-
-CC = gcc
-CPP = g++
-
-TESTPATH 		:= $(shell pwd)
-TESTLOG			:= $(TESTPATH)/testqclass.log
-QUERY_CLASSIFIER_PATH 	:= $(ROOT_PATH)/query_classifier
-LOG_MANAGER_PATH 	:= $(ROOT_PATH)/log_manager
-UTILS_PATH		:= $(ROOT_PATH)/utils
-CORE_PATH		:= $(ROOT_PATH)/server/core
-TESTAPP			= $(TESTPATH)/canonizer
-
-LDFLAGS=-L$(QUERY_CLASSIFIER_PATH) \
-	-L$(LOG_MANAGER_PATH) \
-	-L$(EMBEDDED_LIB) \
-	-Wl,-rpath,$(DEST)/lib \
-	-Wl,-rpath,$(EMBEDDED_LIB) \
-	-Wl,-rpath,$(LOG_MANAGER_PATH) \
-	-Wl,-rpath,$(QUERY_CLASSIFIER_PATH)
-
-LIBS=-lstdc++ -lpthread -lquery_classifier -lz -ldl -lssl -laio -lcrypt -lcrypto -lrt -lm \
-	-llog_manager $(UTILS_PATH)/skygw_utils.o $(CORE_PATH)/buffer.o $(CORE_PATH)/atomic.o $(CORE_PATH)/spinlock.o $(CORE_PATH)/hint.o
-
-CFLAGS=-g $(MYSQL_HEADERS) \
-	-I$(QUERY_CLASSIFIER_PATH) \
-	$(MYSQL_HEADERS) \
-	-I$(ROOT_PATH)/server/include \
-	-I$(UTILS_PATH)
-
-
-testall:
-	$(MAKE) cleantests
-	$(MAKE) buildtests
-	$(MAKE) runtests
-
-cleantests:
-	- $(DEL) *.o 
-	- $(DEL) *~
-	- $(DEL) canonizer
-	- $(DEL) aria_log*
-	- $(DEL) ib*
-
-buildtests: $(OBJS)
-	cp $(ERRMSG)/errmsg.sys .
-	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) canonizer.c -o $(TESTAPP) $(LDLIBS) $(LDMYSQL)
-
-runtests:
-	@echo ""				>  $(TESTLOG)
-	@echo "-------------------------------"	>> $(TESTLOG)
-	@echo $(shell date)			>> $(TESTLOG)
-	@echo "Canonical Query Tests"		>> $(TESTLOG)
-	@echo "-------------------------------"	>> $(TESTLOG)
-	@echo ""				>> $(TESTLOG)
-	./canontest.sh $(TESTLOG) input.sql output.sql expected.sql

query_classifier/test/makefile

@@ -1,83 +0,0 @@
-# cleantests 	- clean local and subdirectories' tests
-# buildtests	- build all local and subdirectories' tests
-# runtests	- run all local tests 
-# testall	- clean, build and run local and subdirectories' tests
-
-include ../../build_gateway.inc
-include ../../makefile.inc
-include ../../test.inc
-
-CC = gcc
-CPP = g++
-
-TESTPATH 		:= $(shell pwd)
-TESTLOG			:= $(TESTPATH)/testqclass.log
-QUERY_CLASSIFIER_PATH 	:= $(ROOT_PATH)/query_classifier
-LOG_MANAGER_PATH 	:= $(ROOT_PATH)/log_manager
-UTILS_PATH		:= $(ROOT_PATH)/utils
-TESTAPP = $(TESTPATH)/testmain
-
-testall:buildtests
-	$(MAKE) -C canonical_tests testall
-testalllaters: 
-	$(MAKE) cleantests 
-	$(MAKE) DEBUG=Y DYNLIB=Y buildtests 
-	$(MAKE) runtests
-	
-
-cleantests:
-	- $(DEL) testmain.o 
-	- $(DEL) testmain
-	- $(DEL) data
-	- $(DEL) *~
-
-buildtests:
-	@echo ""
-	@echo "*********************************************************"
-	@echo "Query classifier test disabled for now. vraa 4.7.2014"
-	@echo "*********************************************************"
-	@echo ""
-	
-buildtestslaters:
-	$(CC) $(CFLAGS)	 \
-	-L$(QUERY_CLASSIFIER_PATH) \
-	-L$(LOG_MANAGER_PATH) \
-	-L$(EMBEDDED_LIB) \
-	-Wl,-rpath,$(DEST)/lib \
-	-Wl,-rpath,$(EMBEDDED_LIB) \
-	-Wl,-rpath,$(LOG_MANAGER_PATH) \
-	-Wl,-rpath,$(QUERY_CLASSIFIER_PATH) \
-	-o testmain -DSS_DEBUG \
-	$(MYSQL_HEADERS) \
-	-I$(QUERY_CLASSIFIER_PATH) \
-	-I./ \
-	-I$(UTILS_PATH) \
-	testmain.c \
-	$(UTILS_PATH)/skygw_utils.o \
-	-lquery_classifier -lz -ldl -lssl -laio -lcrypt -lrt \
-	-llog_manager \
-	$(LDLIBS) $(LDMYSQL) 
-
-runtests:
-	@echo ""				>  $(TESTLOG)
-	@echo "-------------------------------"	>> $(TESTLOG)
-	@echo $(shell date)			>> $(TESTLOG)
-	@echo "Test Query Classifier"		>> $(TESTLOG)
-	@echo "-------------------------------"	>> $(TESTLOG)
-	@echo "Query Classifier NOT TESTED due deprecated tests. vraa 4.7.2014" >> $(TESTLOG)
-	@cat $(TESTLOG)			>> $(TEST_MAXSCALE_LOG)
-	
-	
-runtestslaters:
-	@echo ""				>  $(TESTLOG)
-	@echo "-------------------------------"	>> $(TESTLOG)
-	@echo $(shell date)			>> $(TESTLOG)
-	@echo "Test Query Classifier"		>> $(TESTLOG)
-	@echo "-------------------------------"	>> $(TESTLOG)
-	@ -$(LAUNCH_DEBUGGER) $(TESTAPP) $(BACKGR)	2>> $(TESTLOG)
-ifeq ($?, 0)
-	@echo "Query Classifier PASSED"	>> $(TESTLOG)
-else
-	@echo "Query Classifier FAILED"	>> $(TESTLOG)
-endif
-	@cat $(TESTLOG)			>> $(TEST_MAXSCALE_LOG)