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

Improvement and unification of version processing in build scripts.

Browse Source 
This also eliminates expressions that incompatible with BSD make, thus fixing
installation of Node.js module on FreeBSD (broken by dace60fc4926).
This commit is contained in:
Alexander Borisov
2019-02-22 16:31:44 +03:00
parent c96b2baca5
commit 608e09e9de
13 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/Makefile
View File

@@ -1,8 +1,8 @@
#!/usr/bin/make
VERSION ?= $(shell grep 'define NXT_VERSION' ../src/nxt_main.h \
| sed -e 's/^.*"\(.*\)".*/\1/')
include ../version
VERSION ?= $(NXT_VERSION)
RELEASE ?= 1
default:

5
pkg/deb/Makefile
View File

@@ -1,11 +1,10 @@
#!/usr/bin/make
DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \
| sed -e 's/^.*"\(.*\)".*/\1/')
include ../../version
DEFAULT_RELEASE := 1
VERSION ?= $(DEFAULT_VERSION)
VERSION ?= $(NXT_VERSION)
RELEASE ?= $(DEFAULT_RELEASE)
SRCDIR= unit-$(VERSION)

6
pkg/docker/Makefile
View File

@@ -1,10 +1,10 @@
#!/usr/bin/make
DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \
| sed -e 's/^.*"\(.*\)".*/\1/')
include ../../version
DEFAULT_RELEASE := 1
VERSION ?= $(DEFAULT_VERSION)
VERSION ?= $(NXT_VERSION)
RELEASE ?= $(DEFAULT_RELEASE)
CODENAME := stretch

10
pkg/npm/Makefile
View File

@@ -1,13 +1,9 @@
#!/usr/bin/make
DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \
| sed -e 's/^.*"\(.*\)".*/\1/')
include ../../version
DEFAULT_VERNUM := $(shell grep 'define NXT_VERNUM' ../../src/nxt_main.h \
| sed -e 's/[^0-9]//g')
VERSION ?= $(DEFAULT_VERSION)
VERNUM ?= $(DEFAULT_VERNUM)
VERSION ?= $(NXT_VERSION)
VERNUM ?= $(NXT_VERNUM)
NPM ?= npm
default:

5
pkg/rpm/Makefile
View File

@@ -1,11 +1,10 @@
#!/usr/bin/make
DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \
| sed -e 's/^.*"\(.*\)".*/\1/')
include ../../version
DEFAULT_RELEASE := 1
VERSION ?= $(DEFAULT_VERSION)
VERSION ?= $(NXT_VERSION)
RELEASE ?= $(DEFAULT_RELEASE)
ifeq ($(shell rpm --eval "%{?rhel}"), 6)