diff options
author | Igor Sysoev <igor@sysoev.ru> | 2017-08-17 21:47:19 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2017-08-17 21:47:19 +0300 |
commit | 5ef8e0ee8933e914b1847168255b53f07c3727b3 (patch) | |
tree | f4e4b512d86a8a92eeb48c44e54db510660ea4fe | |
parent | 1ba2f44ad9b95670452f31a0923b8a118a08d867 (diff) | |
download | unit-5ef8e0ee8933e914b1847168255b53f07c3727b3.tar.gz unit-5ef8e0ee8933e914b1847168255b53f07c3727b3.tar.bz2 |
Removing auto/modules directory before commiting the new module
configuration infrastructure.
-rw-r--r-- | auto/modules/conf | 58 | ||||
-rw-r--r-- | auto/modules/go/conf | 37 | ||||
-rw-r--r-- | auto/modules/go/make | 44 | ||||
-rw-r--r-- | auto/modules/php/conf | 56 | ||||
-rw-r--r-- | auto/modules/php/make | 24 | ||||
-rw-r--r-- | auto/modules/python/conf | 57 | ||||
-rw-r--r-- | auto/modules/python/make | 24 |
7 files changed, 0 insertions, 300 deletions
diff --git a/auto/modules/conf b/auto/modules/conf deleted file mode 100644 index e4f68044..00000000 --- a/auto/modules/conf +++ /dev/null @@ -1,58 +0,0 @@ - -# Copyright (C) Valentin V. Bartenev -# Copyright (C) NGINX, Inc. - - -NXT_MODULES_INIT= -NXT_MODULES_SRCS= - - -if [ $NXT_PYTHON_MODULE != NO ]; then - . auto/modules/python/conf -fi - -if [ $NXT_PHP_MODULE != NO ]; then - . auto/modules/php/conf -fi - -if [ $NXT_GO_MODULE != NO ]; then - . auto/modules/go/conf -fi - - -NXT_MODULES_SRC=$NXT_BUILD_DIR/nxt_modules.c - - -cat << END > $NXT_MODULES_SRC - -#include <nxt_main.h> -#include <nxt_runtime.h> - - -END - - -for nxt_init in $NXT_MODULES_INIT -do - $echo "extern nxt_int_t $nxt_init(nxt_thread_t *thr, nxt_runtime_t *rt);" \ - >> $NXT_MODULES_SRC -done - - -cat << END >> $NXT_MODULES_SRC - - -nxt_module_init_t nxt_init_modules[] = { -END - -for nxt_init in $NXT_MODULES_INIT -do - $echo " $nxt_init," >> $NXT_MODULES_SRC -done - -cat << END >> $NXT_MODULES_SRC -}; - - -nxt_uint_t nxt_init_modules_n = nxt_nitems(nxt_init_modules); -END diff --git a/auto/modules/go/conf b/auto/modules/go/conf deleted file mode 100644 index e7c346e1..00000000 --- a/auto/modules/go/conf +++ /dev/null @@ -1,37 +0,0 @@ - -# Copyright (C) Max Romanov -# Copyright (C) NGINX, Inc. - - -$echo -n "checking for Go ..." -$echo "checking for Go ..." >> $NXT_AUTOCONF_ERR - -nxt_go_test="GOPATH=`pwd` CGO_CPPFLAGS=-DNXT_CONFIGURE \ - \"${NXT_GO}\" build -o build/nxt_go_gen.a --buildmode=c-archive nginext" - - -if /bin/sh -c "$nxt_go_test" >> $NXT_AUTOCONF_ERR 2>&1; then - $echo " found" - - NXT_GO_VERSION="`${NXT_GO} version`" - $echo " + Go version: ${NXT_GO_VERSION}" - -else - $echo "----------" >> $NXT_AUTOCONF_ERR - $echo $nxt_go_test >> $NXT_AUTOCONF_ERR - $echo "----------" >> $NXT_AUTOCONF_ERR - $echo - $echo - $echo $0: error: no Go found. - $echo - exit 1; -fi - - -NXT_GO_MODULE_SRCS=" \ - src/nxt_go.c \ -" - - -NXT_MODULES_INIT="$NXT_MODULES_INIT nxt_go_module_init" -NXT_MODULES_SRCS="$NXT_MODULES_SRCS $NXT_GO_MODULE_SRCS" diff --git a/auto/modules/go/make b/auto/modules/go/make deleted file mode 100644 index ebacf0df..00000000 --- a/auto/modules/go/make +++ /dev/null @@ -1,44 +0,0 @@ - -# Copyright (C) Max Romanov -# Copyright (C) NGINX, Inc. - - -$echo >> $NXT_MAKEFILE -$echo >> $NXT_MAKEFILE - - -# The go module object files. - -for nxt_src in $NXT_GO_MODULE_SRCS -do - nxt_obj=`$echo $nxt_src | sed -e "s/\.c$/\.o/"` - cat << END >> $NXT_MAKEFILE - -$NXT_BUILD_DIR/$nxt_obj: $nxt_src - \$(CC) -c \$(CFLAGS) \$(NXT_INCS) \\ - $NXT_LIB_AUX_CFLAGS \\ - -o $NXT_BUILD_DIR/$nxt_obj \\ - $nxt_src -END - -done - -cat << END >> $NXT_MAKEFILE -.PHONY: golang-nginext-install - -NXT_ROOT = \$(shell pwd) - -GOPATH = \$(shell go env GOPATH) -GOOS = \$(shell go env GOOS) -GOARCH = \$(shell go env GOARCH) - -golang-nginext-install: - install -d \$(GOPATH)/src/nginext - install -p ./src/nginext/*.c ./src/nginext/*.h ./src/nginext/*.go \$(GOPATH)/src/nginext/ - CGO_CFLAGS="-I\$(NXT_ROOT)/build -I\$(NXT_ROOT)/src" CGO_LDFLAGS="-L\$(NXT_ROOT)/build" go install -v nginext - -golang-nginext-uninstall: - rm -rf \$(GOPATH)/src/nginext - rm -f \$(GOPATH)/pkg/\$(GOOS)_\$(GOARCH)/nginext.a - -END diff --git a/auto/modules/php/conf b/auto/modules/php/conf deleted file mode 100644 index 445baa29..00000000 --- a/auto/modules/php/conf +++ /dev/null @@ -1,56 +0,0 @@ - -# Copyright (C) Max Romanov -# Copyright (C) NGINX, Inc. - - -$echo -n "checking for PHP ..." -$echo "checking for PHP ..." >> $NXT_AUTOCONF_ERR - -nxt_found=no - -NXT_PHP_CONFIG="${NXT_PHP}-config" - -if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then - - $echo " found" - - NXT_PHP_VERSION="`${NXT_PHP_CONFIG} --version`" - $echo " + PHP version: ${NXT_PHP_VERSION}" - $echo " + PHP SAPI: [`${NXT_PHP_CONFIG} --php-sapis`]" - - NXT_PHP_INCLUDE="`${NXT_PHP_CONFIG} --includes`" - NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}" - # "php-config --ldflags" does not contain path to libphp. - - nxt_feature="PHP embed SAPI" - nxt_feature_name=NXT_HAVE_PHP - nxt_feature_run=no - nxt_feature_incs="${NXT_PHP_INCLUDE}" - nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}" - nxt_feature_test=" - #include <php.h> - #include <php_main.h> - - int main() { - php_request_startup(); - return 0; - }" - - . auto/feature -fi - -if [ $nxt_found = no ]; then - $echo - $echo $0: error: no PHP embed SAPI found. - $echo - exit 1; -fi - -NXT_PHP_MODULE_SRCS=" \ - src/nxt_php_sapi.c \ -" - -NXT_MODULES_INIT="$NXT_MODULES_INIT nxt_php_sapi_init" -NXT_MODULES_SRCS="$NXT_MODULES_SRCS $NXT_PHP_MODULE_SRCS" - -NXT_LIB_AUX_LIBS="$NXT_LIB_AUX_LIBS $NXT_PHP_LIB $NXT_PHP_LDFLAGS" diff --git a/auto/modules/php/make b/auto/modules/php/make deleted file mode 100644 index f4bd7f97..00000000 --- a/auto/modules/php/make +++ /dev/null @@ -1,24 +0,0 @@ - -# Copyright (C) Max Romanov -# Copyright (C) NGINX, Inc. - - -$echo >> $NXT_MAKEFILE -$echo >> $NXT_MAKEFILE - - -# The php module object files. - -for nxt_src in $NXT_PHP_MODULE_SRCS -do - nxt_obj=`$echo $nxt_src | sed -e "s/\.c$/\.o/"` - cat << END >> $NXT_MAKEFILE - -$NXT_BUILD_DIR/$nxt_obj: $nxt_src - \$(CC) -c \$(CFLAGS) \$(NXT_INCS) $NXT_PHP_INCLUDE \\ - $NXT_LIB_AUX_CFLAGS \\ - -o $NXT_BUILD_DIR/$nxt_obj \\ - $nxt_src -END - -done diff --git a/auto/modules/python/conf b/auto/modules/python/conf deleted file mode 100644 index cb045bf9..00000000 --- a/auto/modules/python/conf +++ /dev/null @@ -1,57 +0,0 @@ - -# Copyright (C) Valentin V. Bartenev -# Copyright (C) NGINX, Inc. - - -$echo "checking for Python ..." >> $NXT_AUTOCONF_ERR - -nxt_found=no - -NXT_PYTHON_CONFIG="${NXT_PYTHON}-config" - -if /bin/sh -c "$NXT_PYTHON_CONFIG --prefix" >> $NXT_AUTOCONF_ERR 2>&1; then - - NXT_PYTHON_INCLUDE=`${NXT_PYTHON_CONFIG} --includes` - NXT_PYTHON_LIBS=`${NXT_PYTHON_CONFIG} --ldflags` - - nxt_feature="Python" - nxt_feature_name=NXT_HAVE_PYTHON - nxt_feature_run=no - nxt_feature_incs="${NXT_PYTHON_INCLUDE}" - nxt_feature_libs="${NXT_PYTHON_LIBS}" - nxt_feature_test=" - #include <Python.h> - - int main() { - Py_Initialize(); - return 0; - }" - - . auto/feature -fi - -if [ $nxt_found = no ]; then - $echo "checking for Python ..." - $echo - $echo $0: error: no Python found. - $echo - exit 1; -fi - - -NXT_PYTHON_VERSION=`${NXT_PYTHON} -c \ - 'import sys; \ - sys.stdout.write(sys.version[:3])'` - -$echo " + Python version: ${NXT_PYTHON_VERSION}" - - -NXT_PYTHON_MODULE_SRCS=" \ - src/nxt_python_wsgi.c \ -" - - -NXT_MODULES_INIT="$NXT_MODULES_INIT nxt_python_wsgi_init" -NXT_MODULES_SRCS="$NXT_MODULES_SRCS $NXT_PYTHON_MODULE_SRCS" - -NXT_LIB_AUX_LIBS="$NXT_LIB_AUX_LIBS $NXT_PYTHON_LIBS" diff --git a/auto/modules/python/make b/auto/modules/python/make deleted file mode 100644 index b405a03a..00000000 --- a/auto/modules/python/make +++ /dev/null @@ -1,24 +0,0 @@ - -# Copyright (C) Valentin V. Bartenev -# Copyright (C) NGINX, Inc. - - -$echo >> $NXT_MAKEFILE -$echo >> $NXT_MAKEFILE - - -# The python module object files. - -for nxt_src in $NXT_PYTHON_MODULE_SRCS -do - nxt_obj=`$echo $nxt_src | sed -e "s/\.c$/\.o/"` - cat << END >> $NXT_MAKEFILE - -$NXT_BUILD_DIR/$nxt_obj: $nxt_src - \$(CC) -c \$(CFLAGS) \$(NXT_INCS) $NXT_PYTHON_INCLUDE \\ - $NXT_LIB_AUX_CFLAGS \\ - -o $NXT_BUILD_DIR/$nxt_obj \\ - $nxt_src -END - -done |