technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removing auto/modules directory before commiting the new module

Browse Source 
configuration infrastructure.
This commit is contained in:
Igor Sysoev
2017-08-17 21:47:19 +03:00
parent 1ba2f44ad9
commit 5ef8e0ee89
7 changed files with 0 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
auto/modules/conf
View File

@@ -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

37
auto/modules/go/conf
View File

@@ -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"

44
auto/modules/go/make
View File

@@ -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

56
auto/modules/php/conf
View File

@@ -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"

24
auto/modules/php/make
View File

@@ -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

57
auto/modules/python/conf
View File

@@ -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"

24
auto/modules/python/make
View File

@@ -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