upgrade to nginx 1.13.7 (#10)

* update nginx version to 1.13.7 * change to multi-crate workspace modularize the makefile * clean up main makefile
nginxinc · Nov 22, 2017 · 8c6b968 · 8c6b968
1 parent 7693ea2
commit 8c6b968
Show file tree

Hide file tree

Showing 16 changed files with 977 additions and 186 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,20 +1,4 @@
-[package]
-name = "ngx-rust"
-version = "0.1.1"
-authors = ["Sehyo Chang   sehyo@nginx.com"]
-
-[lib]
-doctest = false
-test = true
-crate-type = ["staticlib","rlib"]
-
-
-[dev-dependencies]
-futures = "0.1.14"
-hyper = "0.11.2"
-tokio-core = "0.1.9"
-
-[build-dependencies]
-bindgen = "0.30.0"
-
-
+[workspace]
+members = [
+    "ngx-binding"
+]
diff --git a/Makefile b/Makefile
@@ -1,13 +1,3 @@
-MODULE_NAME=ngx_http_rust_module
-MODULE_PROJ_NAME=ngx-rust
-NGX_DEBUG="--with-debug"
-include nginx.mk
-
-
 clean:
 	cargo clean
-	rm -f src/bindings.rs
-
-
-super_clean: clean
-	rm -rf nginx
+	make -C ngx-binding clean
diff --git a/nginx.mk b/nginx.mk
@@ -1,4 +1,4 @@
-NGINX_VER = 1.13.5
+NGINX_VER = 1.13.7
 UNAME_S := $(shell uname -s)
 NGX_MODULES = --with-compat  --with-threads --with-http_addition_module \
      --with-http_auth_request_module   --with-http_gunzip_module --with-http_gzip_static_module  \

diff --git a/ngx-binding/.gitignore b/ngx-binding/.gitignore
@@ -0,0 +1 @@
+nginx