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

Packages: unified check-build-depends target.

Browse Source
This commit is contained in:
Andrei Belov
2018-03-01 23:03:03 +03:00
parent d27e100b44
commit 5d5117ce34
2 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/deb/Makefile
View File

@@ -84,33 +84,19 @@ export CR=\\n
default: default:
@echo "valid targets: all modules unit $(addprefix unit-, $(MODULES)) test test-debug clean" @echo "valid targets: all modules unit $(addprefix unit-, $(MODULES)) test test-debug clean"
all: check-build-depends unit modules all: check-build-depends-all unit modules
modules: $(addprefix unit-, $(MODULES)) modules: $(addprefix unit-, $(MODULES))
check-build-depends:
@{ \
not_installed= ; \
for pkg in $(BUILD_DEPENDS); do \
dpkg -s $${pkg} >/dev/null 2>&1 ; \
if [ $$? -ne 0 ]; then \
not_installed="$${not_installed} $${pkg}" ; \
fi ; \
done ; \
if test -n "$${not_installed}" ; then \
echo "" >&2 ; \
echo "The following packages are required in order to proceed:" >&2 ; \
echo "" >&2 ; \
echo $${not_installed} >&2 ; \
echo "" >&2 ; \
exit 1 ; \
fi \
}
check-build-depends-%: check-build-depends-%:
@{ \ @{ \
case "$*" in \
all) pkgs="$(BUILD_DEPENDS)" ;; \
unit) pkgs="$(BUILD_DEPENDS_unit)" ;; \
*) pkgs="$(BUILD_DEPENDS_unit) $(BUILD_DEPENDS_$*)" ;; \
esac ; \
not_installed= ; \ not_installed= ; \
for pkg in $(BUILD_DEPENDS_unit) $(BUILD_DEPENDS_$*); do \ for pkg in $${pkgs}; do \
dpkg -s $${pkg} >/dev/null 2>&1 ; \ dpkg -s $${pkg} >/dev/null 2>&1 ; \
if [ $$? -ne 0 ]; then \ if [ $$? -ne 0 ]; then \
not_installed="$${not_installed} $${pkg}" ; \ not_installed="$${not_installed} $${pkg}" ; \
@@ -125,6 +111,7 @@ check-build-depends-%:
exit 1 ; \ exit 1 ; \
fi \ fi \
} }
touch $@
debuild/$(SRCDIR)/debian: debuild/$(SRCDIR)/debian:
@{ \ @{ \
@@ -254,8 +241,9 @@ test-debug: unit modules
clean: clean:
rm -rf debuild debuild-* debs ../../build rm -rf debuild debuild-* debs ../../build
rm -f check-build-depends-*
find . -maxdepth 1 -type l -delete find . -maxdepth 1 -type l -delete
.PHONY: default all modules check-build-depends test test-debug clean .PHONY: default all modules test test-debug clean
.SECONDARY: .SECONDARY: $(addprefix check-build-depends-, $(MODULES)) $(addprefix debuild-, $(MODULES))

35
pkg/rpm/Makefile
View File

@@ -55,35 +55,21 @@ export CR=\\n
default: default:
@echo "valid targets: all modules unit $(addprefix unit-, $(MODULES)) rpmlint specs test test-debug clean" @echo "valid targets: all modules unit $(addprefix unit-, $(MODULES)) rpmlint specs test test-debug clean"
all: check-build-depends unit modules all: check-build-depends-all unit modules
modules: $(addprefix unit-, $(MODULES)) modules: $(addprefix unit-, $(MODULES))
specs: $(addsuffix .spec, $(addprefix rpmbuild/SPECS/unit-, $(MODULES))) specs: $(addsuffix .spec, $(addprefix rpmbuild/SPECS/unit-, $(MODULES)))
check-build-depends:
@{ \
not_installed= ; \
for pkg in $(BUILD_DEPENDS); do \
rpm -qi $${pkg} >/dev/null 2>&1 ; \
if [ $$? -ne 0 ]; then \
not_installed="$${not_installed} $${pkg}" ; \
fi ; \
done ; \
if test -n "$${not_installed}" ; then \
echo "" >&2 ; \
echo "The following packages are required in order to proceed:" >&2 ; \
echo "" >&2 ; \
echo $${not_installed} >&2 ; \
echo "" >&2 ; \
exit 1 ; \
fi \
}
check-build-depends-%: check-build-depends-%:
@{ \ @{ \
case "$*" in \
all) pkgs="$(BUILD_DEPENDS)" ;; \
unit) pkgs="$(BUILD_DEPENDS_unit)" ;; \
*) pkgs="$(BUILD_DEPENDS_unit) $(BUILD_DEPENDS_$*)" ;; \
esac ; \
not_installed= ; \ not_installed= ; \
for pkg in $(BUILD_DEPENDS_unit) $(BUILD_DEPENDS_$*); do \ for pkg in $${pkgs}; do \
rpm -qi $${pkg} >/dev/null 2>&1 ; \ rpm -qi $${pkg} >/dev/null 2>&1 ; \
if [ $$? -ne 0 ]; then \ if [ $$? -ne 0 ]; then \
not_installed="$${not_installed} $${pkg}" ; \ not_installed="$${not_installed} $${pkg}" ; \
@@ -98,6 +84,7 @@ check-build-depends-%:
exit 1 ; \ exit 1 ; \
fi \ fi \
} }
touch $@
rpmbuild/SPECS: rpmbuild/SPECS:
mkdir -p rpmbuild/SPECS mkdir -p rpmbuild/SPECS
@@ -197,9 +184,9 @@ test-debug: unit modules
clean: clean:
rm -rf rpmbuild/SPECS rpmbuild/BUILD rpmbuild/BUILDROOT rpmbuild/RPMS rpmbuild/SRPMS ../../build rm -rf rpmbuild/SPECS rpmbuild/BUILD rpmbuild/BUILDROOT rpmbuild/RPMS rpmbuild/SRPMS ../../build
rm -f rpmbuild/SOURCES/unit-*.tar.gz unit rm -f rpmbuild/SOURCES/unit-*.tar.gz check-build-depends-*
find . -maxdepth 1 -type l -delete find . -maxdepth 1 -type l -delete
.PHONY: default all modules specs check-build-depends rpmlint test test-debug clean .PHONY: default all modules specs rpmlint test test-debug clean
.SECONDARY: .SECONDARY: $(addprefix check-build-depends-, $(MODULES))