summaryrefslogtreecommitdiffhomepage
path: root/pkg/deb
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/deb')
-rw-r--r--pkg/deb/Makefile26
-rw-r--r--pkg/deb/Makefile.jsc1971
-rw-r--r--pkg/deb/debian.module/control.in2
-rw-r--r--pkg/deb/debian.module/unit.example-jsc19-config15
-rw-r--r--pkg/deb/debian/control.in4
-rw-r--r--pkg/deb/debian/rules.in9
6 files changed, 121 insertions, 6 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index c4f085f8..580cb655 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -19,6 +19,21 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
MODULES=
+# Ubuntu 22.10
+ifeq ($(CODENAME),kinetic)
+include Makefile.php
+include Makefile.python27
+include Makefile.python310
+include Makefile.go
+include Makefile.perl
+include Makefile.ruby
+include Makefile.jsc-common
+include Makefile.jsc11
+include Makefile.jsc17
+include Makefile.jsc18
+include Makefile.jsc19
+endif
+
# Ubuntu 22.04
ifeq ($(CODENAME),jammy)
include Makefile.php
@@ -100,7 +115,7 @@ include Makefile.jsc-common
include Makefile.jsc11
endif
-CONFIGURE_ARGS=\
+CONFIGURE_ARGS_COMMON=\
--prefix=/usr \
--state=/var/lib/unit \
--control="unix:/var/run/control.unit.sock" \
@@ -112,6 +127,10 @@ CONFIGURE_ARGS=\
--tests \
--openssl
+CONFIGURE_ARGS=\
+ $(CONFIGURE_ARGS_COMMON) \
+ --njs
+
export CR=\\n
default:
@@ -156,6 +175,7 @@ debuild/$(SRCDIR)/debian:
echo '3.0 (quilt)' > debuild/$(SRCDIR)/debian/source/format ; \
cat debian/control.in | sed \
-e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
+ -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \
> debuild/$(SRCDIR)/debian/control ; \
cat debian/rules.in | sed \
-e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
@@ -179,7 +199,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.md CONTRIBUTING.md configure auto src test version go docs/man/unitd.8.in
+ LICENSE NOTICE CHANGES README.md CONTRIBUTING.md configure auto src test version go pkg/contrib docs/man/unitd.8.in
mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz
cd debuild && tar zxf unit_$(VERSION).orig.tar.gz
@@ -241,7 +261,7 @@ endif
-e "s#%%CODENAME%%#$(CODENAME)#g" \
-e "s#%%UNIT_VERSION%%#$(VERSION)#g" \
-e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \
- -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
+ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS_COMMON)#g" \
-e "s#%%MODULE_CONFARGS%%#$(MODULE_CONFARGS_$*)#g" \
-e "s#%%MODULE_MAKEARGS%%#$(MODULE_MAKEARGS_$*)#g" \
-e "s#%%MODULE_INSTARGS%%#$(MODULE_INSTARGS_$*)#g" \
diff --git a/pkg/deb/Makefile.jsc19 b/pkg/deb/Makefile.jsc19
new file mode 100644
index 00000000..2a6ef7db
--- /dev/null
+++ b/pkg/deb/Makefile.jsc19
@@ -0,0 +1,71 @@
+MODULES+= jsc19
+MODULE_SUFFIX_jsc19= jsc19
+
+MODULE_SUMMARY_jsc19= Java 19 module for NGINX Unit
+
+MODULE_VERSION_jsc19= $(VERSION)
+MODULE_RELEASE_jsc19= 1
+
+MODULE_CONFARGS_jsc19= java --module=java19 --home=/usr/lib/jvm/java-19-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
+MODULE_MAKEARGS_jsc19= java19
+MODULE_INSTARGS_jsc19= java19-install
+
+MODULE_SOURCES_jsc19= unit.example-jsc-app \
+ unit.example-jsc19-config
+
+BUILD_DEPENDS_jsc19= openjdk-19-jdk-headless openjdk-19-jre-headless
+BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc19)
+
+MODULE_BUILD_DEPENDS_jsc19=,openjdk-19-jdk-headless
+MODULE_DEPENDS_jsc19=,openjdk-19-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
+
+define MODULE_PREINSTALL_jsc19
+ mkdir -p debian/unit-jsc19/usr/share/doc/unit-jsc19/examples/jsc-app
+ install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc19/usr/share/doc/unit-jsc19/examples/jsc-app/index.jsp
+ install -m 644 -p debian/unit.example-jsc19-config debian/unit-jsc19/usr/share/doc/unit-jsc19/examples/unit.config
+ install -m 644 -p src/java/README.JSR-340 debian/unit-jsc19/usr/share/doc/unit-jsc19/
+endef
+export MODULE_PREINSTALL_jsc19
+
+define MODULE_POSTINSTALL_jsc19
+ cd $$\(BUILDDIR_unit\) \&\& \
+ DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
+endef
+export MODULE_POSTINSTALL_jsc19
+
+define MODULE_POST_jsc19
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_jsc19) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc19)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8800/
+
+Online documentation is available at https://unit.nginx.org
+
+NOTICE:
+
+This version of Unit code is made available in support of the open source
+development process. This is an intermediate build made available for
+testing purposes only. This Unit code is untested and presumed incompatible
+with the JSR 340 Java Servlet 3.1 specification. You should not deploy or
+write to this code. You should instead deploy and write production
+applications on pre-built binaries that have been tested and certified
+to meet the JSR-340 compatibility requirements such as certified binaries
+published for the JSR-340 reference implementation available at
+https://javaee.github.io/glassfish/.
+
+Redistribution of any Intermediate Build must retain this notice.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_jsc19
diff --git a/pkg/deb/debian.module/control.in b/pkg/deb/debian.module/control.in
index f5ce8ae4..f82362d1 100644
--- a/pkg/deb/debian.module/control.in
+++ b/pkg/deb/debian.module/control.in
@@ -14,7 +14,7 @@ Section: admin
Architecture: any
Depends: lsb-base,
${misc:Depends}, ${shlibs:Depends},
- unit (= %%UNIT_VERSION%%-%%UNIT_RELEASE%%~%%CODENAME%%)%%MODULE_DEPENDS%%
+ unit-r%%UNIT_VERSION%%%%MODULE_DEPENDS%%
Description: %%SUMMARY%%
NGINX Unit is a runtime and delivery environment for modern distributed
applications. It runs the application code in multiple languages
diff --git a/pkg/deb/debian.module/unit.example-jsc19-config b/pkg/deb/debian.module/unit.example-jsc19-config
new file mode 100644
index 00000000..106b694b
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-jsc19-config
@@ -0,0 +1,15 @@
+{
+ "applications": {
+ "example_java19": {
+ "processes": 1,
+ "type": "java 19",
+ "webapp": "/usr/share/doc/unit-jsc19/examples/jsc-app"
+ }
+ },
+
+ "listeners": {
+ "*:8800": {
+ "pass": "applications/example_java19"
+ }
+ }
+}
diff --git a/pkg/deb/debian/control.in b/pkg/deb/debian/control.in
index 691bafed..579f41e3 100644
--- a/pkg/deb/debian/control.in
+++ b/pkg/deb/debian/control.in
@@ -5,7 +5,8 @@ Maintainer: %%PACKAGE_VENDOR%%
Build-Depends: debhelper (>= 11),
linux-libc-dev,
libssl-dev,
- libpcre2-dev
+ libpcre2-dev,
+ pkg-config
Standards-Version: 4.1.4
Homepage: https://unit.nginx.org
@@ -14,6 +15,7 @@ Section: admin
Architecture: any
Depends: lsb-base,
${misc:Depends}, ${shlibs:Depends}
+Provides: unit-r%%UNIT_VERSION%%
Description: NGINX Unit
NGINX Unit is a runtime and delivery environment for modern distributed
applications. It runs the application code in multiple languages
diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in
index d2e34796..23812926 100644
--- a/pkg/deb/debian/rules.in
+++ b/pkg/deb/debian/rules.in
@@ -20,7 +20,12 @@ BASEDIR = $(CURDIR)
DOTESTS = 0
-config.env.%:
+njs:
+ dh_testdir
+ cd pkg/contrib && make .njs
+ touch $@
+
+config.env.%: njs
dh_testdir
mkdir -p $(BUILDDIR_$*)
cp -Pa $(CURDIR)/auto $(BUILDDIR_$*)/
@@ -40,6 +45,7 @@ config.env.%:
configure.unit: config.env.unit
cd $(BUILDDIR_unit) && \
+ PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
CFLAGS= ./configure \
%%CONFIGURE_ARGS%% \
--modules=/usr/lib/unit/modules \
@@ -50,6 +56,7 @@ configure.unit: config.env.unit
configure.unit_debug: config.env.unit_debug
cd $(BUILDDIR_unit_debug) && \
+ PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
CFLAGS= ./configure \
%%CONFIGURE_ARGS%% \
--modules=/usr/lib/unit/debug-modules \
generated by cgit (git 2.34.1) at 2025-01-10 13:42:34 +0000