nginext has been renamed to unit.
This commit is contained in:
@@ -180,7 +180,7 @@ done
|
||||
$echo >> $NXT_MAKEFILE
|
||||
|
||||
|
||||
# nginext executable.
|
||||
# unit executable.
|
||||
|
||||
cat << END >> $NXT_MAKEFILE
|
||||
|
||||
@@ -193,7 +193,7 @@ $NXT_BUILD_DIR/$NXT_BIN: $NXT_BUILD_DIR/$NXT_LIB_STATIC \\
|
||||
END
|
||||
|
||||
|
||||
# nginext object files.
|
||||
# unit object files.
|
||||
|
||||
for nxt_src in $NXT_MAKE_SRCS
|
||||
do
|
||||
|
||||
@@ -97,24 +97,23 @@ GOARCH = `${NXT_GO} env GOARCH`
|
||||
|
||||
${NXT_GO}: $NXT_BUILD_DIR/nxt_go_gen.h
|
||||
|
||||
$NXT_BUILD_DIR/nxt_go_gen.h:
|
||||
$NXT_BUILD_DIR/nxt_go_gen.h: src/go/unit/*.go
|
||||
GOPATH=`pwd` \\
|
||||
CGO_CPPFLAGS='-DNXT_CONFIGURE \\
|
||||
-I`pwd`/src' \\
|
||||
${NXT_GO} build -o $NXT_BUILD_DIR/nxt_go_gen.a \\
|
||||
--buildmode=c-archive nginext
|
||||
--buildmode=c-archive go/unit
|
||||
|
||||
${NXT_GO}-install: ${NXT_GO}
|
||||
install -d \$(GOPATH)/src/nginext
|
||||
install -p ./src/nginext/*.c ./src/nginext/*.h \\
|
||||
./src/nginext/*.go \$(GOPATH)/src/nginext/
|
||||
install -d \$(GOPATH)/src/unit
|
||||
install -p ./src/go/unit/* \$(GOPATH)/src/unit/
|
||||
CGO_CFLAGS="-I\$(NXT_ROOT)/$NXT_BUILD_DIR -I\$(NXT_ROOT)/src" \\
|
||||
CGO_LDFLAGS="-L\$(NXT_ROOT)/$NXT_BUILD_DIR ${NXT_LIBRT}" \\
|
||||
GOPATH=$NXT_GO_PATH \\
|
||||
${NXT_GO} install -v nginext
|
||||
${NXT_GO} install -v unit
|
||||
|
||||
${NXT_GO}-uninstall:
|
||||
rm -rf \$(GOPATH)/src/nginext
|
||||
rm -f \$(GOPATH)/pkg/\$(GOOS)_\$(GOARCH)/nginext.a
|
||||
rm -rf \$(GOPATH)/src/unit
|
||||
rm -f \$(GOPATH)/pkg/\$(GOOS)_\$(GOARCH)/unit.a
|
||||
|
||||
END
|
||||
|
||||
@@ -118,7 +118,7 @@ if grep ^$NXT_PHP_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
$echo " + PHP module: nginext.${NXT_PHP_MODULE}"
|
||||
$echo " + PHP module: unit.${NXT_PHP_MODULE}"
|
||||
|
||||
|
||||
$echo >> $NXT_MAKEFILE
|
||||
@@ -152,10 +152,10 @@ cat << END >> $NXT_MAKEFILE
|
||||
|
||||
all: ${NXT_PHP_MODULE}
|
||||
|
||||
${NXT_PHP_MODULE}: $NXT_BUILD_DIR/nginext.${NXT_PHP_MODULE}
|
||||
${NXT_PHP_MODULE}: $NXT_BUILD_DIR/unit.${NXT_PHP_MODULE}
|
||||
|
||||
$NXT_BUILD_DIR/nginext.${NXT_PHP_MODULE}: $nxt_objs
|
||||
$NXT_MODULE_LINK -o $NXT_BUILD_DIR/nginext.${NXT_PHP_MODULE} \\
|
||||
$NXT_BUILD_DIR/unit.${NXT_PHP_MODULE}: $nxt_objs
|
||||
$NXT_MODULE_LINK -o $NXT_BUILD_DIR/unit.${NXT_PHP_MODULE} \\
|
||||
$nxt_objs ${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}
|
||||
|
||||
END
|
||||
|
||||
@@ -115,7 +115,7 @@ if grep ^$NXT_PYTHON_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
$echo " + Python module: nginext.${NXT_PYTHON_MODULE}"
|
||||
$echo " + Python module: unit.${NXT_PYTHON_MODULE}"
|
||||
|
||||
|
||||
$echo >> $NXT_MAKEFILE
|
||||
@@ -149,10 +149,10 @@ cat << END >> $NXT_MAKEFILE
|
||||
|
||||
all: ${NXT_PYTHON_MODULE}
|
||||
|
||||
${NXT_PYTHON_MODULE}: $NXT_BUILD_DIR/nginext.${NXT_PYTHON_MODULE}
|
||||
${NXT_PYTHON_MODULE}: $NXT_BUILD_DIR/unit.${NXT_PYTHON_MODULE}
|
||||
|
||||
$NXT_BUILD_DIR/nginext.${NXT_PYTHON_MODULE}: $nxt_objs
|
||||
$NXT_MODULE_LINK -o $NXT_BUILD_DIR/nginext.${NXT_PYTHON_MODULE} \\
|
||||
$NXT_BUILD_DIR/unit.${NXT_PYTHON_MODULE}: $nxt_objs
|
||||
$NXT_MODULE_LINK -o $NXT_BUILD_DIR/unit.${NXT_PYTHON_MODULE} \\
|
||||
$nxt_objs $NXT_PYTHON_LIBS
|
||||
|
||||
END
|
||||
|
||||
@@ -22,7 +22,7 @@ nxt_feature_test="#include <sys/mman.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
int main() {
|
||||
static char name[] = \"/nginext.configure\";
|
||||
static char name[] = \"/unit.configure\";
|
||||
|
||||
shm_unlink(name);
|
||||
|
||||
@@ -49,7 +49,7 @@ nxt_feature_test="#include <linux/memfd.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
int main() {
|
||||
static char name[] = \"/nginext.configure\";
|
||||
static char name[] = \"/unit.configure\";
|
||||
|
||||
int fd = syscall(SYS_memfd_create, name, MFD_CLOEXEC);
|
||||
if (fd == -1)
|
||||
|
||||
@@ -7,11 +7,11 @@ cat << END
|
||||
|
||||
Configuration summary:
|
||||
|
||||
nginext pid file: "$NXT_PID"
|
||||
nginext log file: "$NXT_LOG"
|
||||
nginext modules path: "$NXT_MODULES"
|
||||
unit pid file: "$NXT_PID"
|
||||
unit log file: "$NXT_LOG"
|
||||
unit modules path: "$NXT_MODULES"
|
||||
|
||||
nginext control API socket: "$NXT_CONTROL"
|
||||
unit control API socket: "$NXT_CONTROL"
|
||||
|
||||
non-privileged user: "$NXT_USER"
|
||||
non-privileged group: "$NXT_GROUP"
|
||||
|
||||
Reference in New Issue
Block a user