IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-27 01:11:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Configure: the --build= option.

Browse Source 
If set, its value is output in "nginx -v" and in the error log.
This commit is contained in:
Ruslan Ermilov 2014-05-20 16:10:07 +04:00
parent 27899a923a
commit 1736c180f4
6 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auto/configure vendored
View File

@ -108,4 +108,8 @@ have=NGX_HTTP_SCGI_TEMP_PATH value="\"$NGX_HTTP_SCGI_TEMP_PATH\""
have=NGX_USER value="\"$NGX_USER\"" . auto/define have=NGX_USER value="\"$NGX_USER\"" . auto/define
have=NGX_GROUP value="\"$NGX_GROUP\"" . auto/define have=NGX_GROUP value="\"$NGX_GROUP\"" . auto/define
if [ ".$NGX_BUILD" != "." ]; then
have=NGX_BUILD value="\"$NGX_BUILD\"" . auto/define
fi
. auto/summary . auto/summary

3
auto/options
View File

@ -14,6 +14,7 @@ NGX_PID_PATH=
NGX_LOCK_PATH= NGX_LOCK_PATH=
NGX_USER= NGX_USER=
NGX_GROUP= NGX_GROUP=
NGX_BUILD=
CC=${CC:-cc} CC=${CC:-cc}
CPP= CPP=
@ -178,6 +179,7 @@ do
--crossbuild=*) NGX_PLATFORM="$value" ;; --crossbuild=*) NGX_PLATFORM="$value" ;;
--build=*) NGX_BUILD="$value" ;;
--builddir=*) NGX_OBJS="$value" ;; --builddir=*) NGX_OBJS="$value" ;;
--with-rtsig_module) EVENT_RTSIG=YES ;; --with-rtsig_module) EVENT_RTSIG=YES ;;
@ -341,6 +343,7 @@ cat << END
--group=GROUP set non-privileged group for --group=GROUP set non-privileged group for
worker processes worker processes
--build=NAME set build name
--builddir=DIR set build directory --builddir=DIR set build directory
--with-rtsig_module enable rtsig module --with-rtsig_module enable rtsig module

2
src/core/nginx.c
View File

@ -217,7 +217,7 @@ main(int argc, char *const *argv)
} }
if (ngx_show_version) { if (ngx_show_version) {
ngx_write_stderr("nginx version: " NGINX_VER NGX_LINEFEED); ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED);
if (ngx_show_help) { if (ngx_show_help) {
ngx_write_stderr( ngx_write_stderr(

6
src/core/nginx.h
View File

@ -13,6 +13,12 @@
#define NGINX_VERSION "1.7.1" #define NGINX_VERSION "1.7.1"
#define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VER "nginx/" NGINX_VERSION
#ifdef NGX_BUILD
#define NGINX_VER_BUILD NGINX_VER " (" NGX_BUILD ")"
#else
#define NGINX_VER_BUILD NGINX_VER
#endif
#define NGINX_VAR "NGINX" #define NGINX_VAR "NGINX"
#define NGX_OLDPID_EXT ".oldbin" #define NGX_OLDPID_EXT ".oldbin"

2
src/os/unix/ngx_posix_init.c
View File

@ -82,7 +82,7 @@ ngx_os_init(ngx_log_t *log)
void void
ngx_os_status(ngx_log_t *log) ngx_os_status(ngx_log_t *log)
{ {
ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER); ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER_BUILD);
#ifdef NGX_COMPILER #ifdef NGX_COMPILER
ngx_log_error(NGX_LOG_NOTICE, log, 0, "built by " NGX_COMPILER); ngx_log_error(NGX_LOG_NOTICE, log, 0, "built by " NGX_COMPILER);

2
src/os/win32/ngx_win32_init.c
View File

@ -247,7 +247,7 @@ ngx_os_status(ngx_log_t *log)
{ {
ngx_osviex_stub_t *osviex_stub; ngx_osviex_stub_t *osviex_stub;
ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER); ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER_BUILD);
if (osviex) { if (osviex) {