#9 #11 #16

Author: dedok

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "third_party/tarantool-c"]
-	path = third_party/tarantool-c
-	url = https://github.com/tarantool/tarantool-c.git
 [submodule "third_party/yajl"]
 	path = third_party/yajl
 	url = https://github.com/lloyd/yajl.git
+[submodule "third_party/msgpuck"]
+	path = third_party/msgpuck
+	url = https://github.com/rtsisyk/msgpuck.git

Makefile

@@ -1,17 +1,16 @@
 CUR_PATH    = $(shell pwd)
 YAJL_PATH   = $(CUR_PATH)/third_party/yajl
-TNTC_PATH   = $(CUR_PATH)/third_party/tarantool-c
 
 NGX_PATH    = nginx
 MODULE_PATH = $(CUR_PATH)
 PREFIX_PATH = $(CUR_PATH)/test-root
 INC_FLAGS   = -I$(CUR_PATH)/third_party
-INC_FLAGS  += -I$(TNTC_PATH)/src/msgpuck
-INC_FLAGS  += -I$(YAJL_PATH)/build/yajl-2.1.0/include/
-YAJL_LIB   = $(YAJL_PATH)/build/yajl-2.1.0/lib/libyajl_s.a
-LDFLAGS    = -L$(YAJL_PATH)/build/yajl-2.1.0/lib/
+INC_FLAGS  += -I$(YAJL_PATH)/build/yajl-2.1.0/include
+INC_FLAGS  += -I$(CUR_PATH)/third_party/msgpuck
+YAJL_LIB    = $(YAJL_PATH)/build/yajl-2.1.0/lib/libyajl_s.a
+LDFLAGS     = -L$(YAJL_PATH)/build/yajl-2.1.0/lib
 
-CFLAGS     += -ggdb3 -O0 -Wall -Werror
+DEV_CFLAGS += -ggdb3 -O0 -Wall -Werror
 
 .PHONY: all build
 all: build
@@ -21,20 +20,16 @@ yajl:
 	ln -sf src third_party/yajl/yajl
 	cd $(YAJL_PATH); ./configure; make distro
 
-tarantool-c:
-	cd $(TNTC_PATH)
-	git submodule init
-	git submodule update --recursive
-
 build: utils
 	$(MAKE) -C $(NGX_PATH)
 
 configure-debug:
 	cd $(NGX_PATH) && \
-	CFLAGS=" -DMY_DEBUG -Wall -Werror -ggdb3 $(INC_FLAGS)" ./configure \
+	CFLAGS=" -DMY_DEBUG -Wall -Werror -ggdb3 $(INC_FLAGS)" ./auto/configure \
 						--prefix=$(PREFIX_PATH) \
 						--add-module=$(MODULE_PATH) \
-						--with-debug --with-ld-opt='$(LDFLAGS)'
+						--with-debug \
+						--with-ld-opt='$(LDFLAGS)'
 	mkdir -p $(PREFIX_PATH)/conf $(PREFIX_PATH)/logs
 	unlink $(PREFIX_PATH)/conf/nginx.conf > /dev/null || echo "pass"
 	cp -Rf $(NGX_PATH)/conf/* $(PREFIX_PATH)/conf
@@ -43,19 +38,20 @@ configure-debug:
 
 configure:
 	cd $(NGX_PATH) && \
-	./configure --with-cc-opt='$(INC_FLAGS)'\
+	./auto/configure \
+			--with-cc-opt='$(INC_FLAGS)'\
 			--add-module='$(MODULE_PATH)'\
 			--with-ld-opt='$(LDFLAGS)'
 
 json2tp:
-	$(CC) $(CFLAGS) $(INC_FLAGS) $(LDFLAGS) -I$(CUR_PATH) \
+	$(CC) $(CFLAGS) $(DEV_CFLAGS) $(INC_FLAGS) $(LDFLAGS) -I$(CUR_PATH) \
 				$(CUR_PATH)/misc/json2tp.c \
 				tp_transcode.c \
 				-o misc/json2tp \
 				-lyajl_s
 
 tp_dump:
-	$(CC) $(CFLAGS) $(INC_FLAGS) $(LDFLAGS) -I$(CUR_PATH) \
+	$(CC) $(CFLAGS) $(DEV_CFLAGS) $(INC_FLAGS) $(LDFLAGS) -I$(CUR_PATH) \
 				$(CUR_PATH)/misc/tp_dump.c \
 				tp_transcode.c \
 				-o misc/tp_dump \
@@ -70,8 +66,8 @@ clean:
 	rm -f misc/tp_{send,dump} misc/json2tp
 
 utils: json2tp tp_dump
-build-all: yajl tarantool-c configure build utils
-build-all-debug: yajl tarantool-c configure-debug build utils
+build-all: yajl configure build utils
+build-all-debug: yajl configure-debug build utils
 
 TAG = $(shell git describe --abbrev=0)
 

README.md

@@ -147,8 +147,7 @@ Gamma/Stable.
 
     $ git clone https://github.com/tarantool/nginx_upstream_module.git nginx_upstream_module
     $ cd nginx_upstream_module
-    $ git submodule init
-    $ git submodule update --recursive
+    $ git submodule update --init --recursive
     $ git clone https://github.com/nginx/nginx.git nginx
     $ make build-all # build-all-debug i.e. debug version
 

config

@@ -4,7 +4,8 @@ CORE_INCS="$CORE_INCS $ngx_feature_path \
           "
 
 CORE_LIBS="$CORE_LIBS $ngx_feature_libs \
-           $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a"
+           $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \
+           "
 
 HTTP_MODULES="$HTTP_MODULES               \
               ngx_http_tnt_module         \
@@ -15,6 +16,9 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS                               \
                 $ngx_addon_dir/tp_transcode.c                 \
                 "
 
-
-CFLAGS="$CFLAGS -I$ngx_addon_dir -I$ngx_addon_dir/third_party \
-                -I$ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/include"
+CFLAGS="$CFLAGS \
+        -I$ngx_addon_dir \
+        -I$ngx_addon_dir/third_party \
+        -I$ngx_addon_dir/third_party/msgpuck \
+        -I$ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/include \
+        "

misc/tp_dump.c

@@ -5,7 +5,8 @@
 #include <stdlib.h>
 #include <getopt.h>
 
-#include <tarantool-c/src/tp.h>
+#define TP_H_AUTH_OFF 1
+#include "tp.h"
 #include "tp_transcode.h"
 
 void