From be049932b100c7a64c0dd261d21b73ea817f8100 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 27 Dec 2018 11:07:24 +0300 Subject: Packages: Ubuntu 18.10 "cosmic" support added. --- pkg/deb/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'pkg/deb/Makefile') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 2dcf6f50..1a16b6ee 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -17,6 +17,18 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 18.10 +ifeq ($(CODENAME),cosmic) +include Makefile.php +include Makefile.python27 +include Makefile.python36 +include Makefile.python37 +include Makefile.go19 +include Makefile.go110 +include Makefile.perl +include Makefile.ruby +endif + # Ubuntu 18.04 ifeq ($(CODENAME),bionic) include Makefile.php -- cgit From 608e09e9def182756e2f1650c6f3416b209fbf58 Mon Sep 17 00:00:00 2001 From: Alexander Borisov Date: Fri, 22 Feb 2019 16:31:44 +0300 Subject: Improvement and unification of version processing in build scripts. This also eliminates expressions that incompatible with BSD make, thus fixing installation of Node.js module on FreeBSD (broken by dace60fc4926). --- pkg/deb/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkg/deb/Makefile') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 1a16b6ee..29792f90 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -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) -- cgit From aa7478267aa53667a29a021ddc0d425cf877b89e Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Tue, 26 Feb 2019 14:53:28 +0300 Subject: Packages: yet another fix added, missed in a7af31b69692. --- pkg/deb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/deb/Makefile') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 29792f90..ffd9aa2e 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -170,7 +170,7 @@ endif debuild/unit_$(VERSION).orig.tar.gz: | debuild/$(SRCDIR)/debian cd ../.. && tar -czf pkg/deb/debuild/$(SRCDIR).tar.gz \ --transform "s#^#$(SRCDIR)/#" \ - LICENSE NOTICE CHANGES README configure auto src test + LICENSE NOTICE CHANGES README configure auto src test version mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz cd debuild && tar zxf unit_$(VERSION).orig.tar.gz -- cgit From 7ce6f0597543baee4275e8d66567d08f2ddaf48b Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 28 Feb 2019 18:22:15 +0300 Subject: Packages: added unit-jsc (Java Servlet Container) family. --- pkg/deb/Makefile | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'pkg/deb/Makefile') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index ffd9aa2e..3d747402 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -26,6 +26,9 @@ include Makefile.go19 include Makefile.go110 include Makefile.perl include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc8 +include Makefile.jsc11 endif # Ubuntu 18.04 @@ -37,6 +40,9 @@ include Makefile.go19 include Makefile.go110 include Makefile.perl include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc8 +include Makefile.jsc10 endif # Ubuntu 17.10 @@ -69,6 +75,8 @@ include Makefile.python35 include Makefile.go include Makefile.perl include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc8 endif # Ubuntu 14.04 @@ -87,6 +95,8 @@ include Makefile.go17 include Makefile.go18 include Makefile.perl include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc8 endif # Debian 8 @@ -200,7 +210,11 @@ else -e "s#%%CODENAME%%#$(CODENAME)#g" \ > $@/$(SRCDIR)/debian/changelog endif - cp debian/copyright debuild-$*/$(SRCDIR)/debian/ + if [ -f debian.module/copyright.unit-$(MODULE_SUFFIX_$*) ]; then \ + cp debian.module/copyright.unit-$(MODULE_SUFFIX_$*) debuild-$*/$(SRCDIR)/debian/copyright ; \ + else \ + cp debian/copyright debuild-$*/$(SRCDIR)/debian/ ; \ + fi @{ \ set -e ; \ for src in $(MODULE_SOURCES_$*); do \ @@ -209,8 +223,9 @@ endif definitions=`echo "$$MODULE_DEFINITIONS_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ prebuild=`echo "$$MODULE_PREBUILD_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ preinstall=`echo "$$MODULE_PREINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ + postinstall=`echo "$$MODULE_POSTINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ post=`echo "$$MODULE_POST_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ - cat debian.module/control.in | sed \ + cat debian.module/$(if $(MODULE_NOARCH_$*),control-noarch.in,control.in) | sed \ -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \ -e "s#%%SUMMARY%%#$(MODULE_SUMMARY_$*)#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ @@ -221,7 +236,7 @@ endif -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \ -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \ > $@/$(SRCDIR)/debian/control ; \ - cat debian.module/rules.in | sed \ + cat debian.module/$(if $(MODULE_NOARCH_$*),rules-noarch.in,rules.in) | sed \ -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \ @@ -233,6 +248,7 @@ endif -e "s#%%MODULE_DEFINITIONS%%#$${definitions}#g" \ -e "s#%%MODULE_PREBUILD%%#$${prebuild}#g" \ -e "s#%%MODULE_PREINSTALL%%#$${preinstall}#g" \ + -e "s#%%MODULE_POSTINSTALL%%#$${postinstall}#g" \ > $@/$(SRCDIR)/debian/rules ; \ cat debian.module/preinst.in | sed \ -e "s#%%MODULE_POST%%#$$post#g" \ @@ -249,8 +265,9 @@ unit-%: check-build-depends-% | debuild-% test: unit modules @{ \ - for so in `find debuild-*/unit-$(VERSION)/debian/build-unit/ -type f -name "*.so"` ; do \ + for so in `find debuild-*/unit-$(VERSION)/debian/build-unit/ -type f \( -name "*.so" -o -name "*.jar" \)`; do \ soname=`basename $${so}` ; \ + test "$${soname}" = "java.unit.so" && continue ; \ test -h debuild/unit-$(VERSION)/debian/build-unit/build/$${soname} || \ ln -fs `pwd`/$${so} debuild/unit-$(VERSION)/debian/build-unit/build/$${soname} ; \ done ; \ @@ -259,8 +276,9 @@ test: unit modules test-debug: unit modules @{ \ - for so in `find debuild-*/unit-$(VERSION)/debian/build-unit-debug/ -type f -name "*.so"` ; do \ + for so in `find debuild-*/unit-$(VERSION)/debian/build-unit-debug/ -type f \( -name "*.so" -o -name "*.jar" \)`; do \ soname=`basename $${so}` ; \ + test "$${soname}" = "java.unit.so" && continue ; \ test -h debuild/unit-$(VERSION)/debian/build-unit-debug/build/$${soname} || \ ln -fs `pwd`/$${so} debuild/unit-$(VERSION)/debian/build-unit-debug/build/$${soname} ; \ done ; \ -- cgit From 5b98f0a55204c65b42fc5606e0ad2ba9bd01568c Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Fri, 1 Mar 2019 10:46:46 +0300 Subject: Packages: removed Ubuntu 17.04 and 17.10 references due to EOL. --- pkg/deb/Makefile | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'pkg/deb/Makefile') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 3d747402..f481ff02 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -45,28 +45,6 @@ include Makefile.jsc8 include Makefile.jsc10 endif -# Ubuntu 17.10 -ifeq ($(CODENAME),artful) -include Makefile.php -include Makefile.python27 -include Makefile.python36 -include Makefile.go18 -include Makefile.go19 -include Makefile.perl -include Makefile.ruby -endif - -# Ubuntu 17.04 -ifeq ($(CODENAME),zesty) -include Makefile.php -include Makefile.python27 -include Makefile.python35 -include Makefile.go17 -include Makefile.go18 -include Makefile.perl -include Makefile.ruby -endif - # Ubuntu 16.04 ifeq ($(CODENAME),xenial) include Makefile.php -- cgit