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

Go: moving source files to the root of the project.

Browse Source 
This patch includes packaging changes related to files move.
This commit is contained in:
Max Romanov
2019-12-24 17:59:52 +03:00
parent a427ecd4c5
commit f5a2984acf
14 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
auto/modules/go
View File

@@ -107,7 +107,7 @@ ${NXT_GO}-install: ${NXT_GO}-install-src ${NXT_GO}-install-env
${NXT_GO}-install-src: ${NXT_GO}-install-src:
install -d \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG} install -d \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}
install -p -m644 ./src/go/unit/* \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/ install -p -m644 ./go/* \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/
${NXT_GO}-install-env: \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/env.go \ ${NXT_GO}-install-env: \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/env.go \
${NXT_VERSION_H} ${NXT_BUILD_DIR}/${NXT_LIB_UNIT_STATIC} ${NXT_VERSION_H} ${NXT_BUILD_DIR}/${NXT_LIB_UNIT_STATIC}

0
src/go/unit/ldflags-lrt.go → go/ldflags-lrt.go
View File

0
src/go/unit/ldflags.go → go/ldflags.go
View File

0
src/go/unit/nxt_cgo_lib.c → go/nxt_cgo_lib.c
View File

0
src/go/unit/nxt_cgo_lib.h → go/nxt_cgo_lib.h
View File

0
src/go/unit/port.go → go/port.go
View File

0
src/go/unit/request.go → go/request.go
View File

0
src/go/unit/response.go → go/response.go
View File

0
src/go/unit/unit.go → go/unit.go
View File

2
pkg/deb/Makefile
View File

@@ -195,7 +195,7 @@ endif
debuild/unit_$(VERSION).orig.tar.gz: | debuild/$(SRCDIR)/debian debuild/unit_$(VERSION).orig.tar.gz: | debuild/$(SRCDIR)/debian
cd ../.. && tar -czf pkg/deb/debuild/$(SRCDIR).tar.gz \ cd ../.. && tar -czf pkg/deb/debuild/$(SRCDIR).tar.gz \
--transform "s#^#$(SRCDIR)/#" \ --transform "s#^#$(SRCDIR)/#" \
LICENSE NOTICE CHANGES README configure auto src test version LICENSE NOTICE CHANGES README configure auto src test version go
mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz
cd debuild && tar zxf unit_$(VERSION).orig.tar.gz cd debuild && tar zxf unit_$(VERSION).orig.tar.gz

1
pkg/deb/debian.module/rules-noarch.in
View File

@@ -27,6 +27,7 @@ config.env.%:
cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
touch $@ touch $@
configure.unit: config.env.unit configure.unit: config.env.unit

1
pkg/deb/debian.module/rules.in
View File

@@ -27,6 +27,7 @@ config.env.%:
cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
touch $@ touch $@
configure.unit: config.env.unit configure.unit: config.env.unit

1
pkg/deb/debian/rules.in
View File

@@ -31,6 +31,7 @@ config.env.%:
cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
touch $@ touch $@
configure.unit: config.env.unit configure.unit: config.env.unit

2
pkg/rpm/Makefile
View File

@@ -204,7 +204,7 @@ endif
rpmbuild/SOURCES/unit-$(VERSION).tar.gz: rpmbuild/SOURCES/unit-$(VERSION).tar.gz:
cd ../.. && tar -czf pkg/rpm/rpmbuild/SOURCES/unit-$(VERSION).tar.gz \ cd ../.. && tar -czf pkg/rpm/rpmbuild/SOURCES/unit-$(VERSION).tar.gz \
--transform "s#^#unit-$(VERSION)/#" \ --transform "s#^#unit-$(VERSION)/#" \
LICENSE NOTICE CHANGES README configure auto src test version LICENSE NOTICE CHANGES README configure auto src test version go
unit: check-build-depends-unit rpmbuild/SPECS/unit.spec rpmbuild/SOURCES/unit-$(VERSION).tar.gz unit: check-build-depends-unit rpmbuild/SPECS/unit.spec rpmbuild/SOURCES/unit-$(VERSION).tar.gz
@echo "===> Building $@ package" ; \ @echo "===> Building $@ package" ; \