diff options
| author | Max Romanov <max.romanov@nginx.com> | 2019-12-24 17:59:52 +0300 |
|---|---|---|
| committer | Max Romanov <max.romanov@nginx.com> | 2019-12-24 17:59:52 +0300 |
| commit | f5a2984acf9a562b6b1eb45a21d9af2be2415659 (patch) | |
| tree | 5e61bb9fef4adc52f8e9a46803dc065b4b0faaf2 | |
| parent | a427ecd4c547958079cce2dae13060b2d60aa4d4 (diff) | |
| download | unit-f5a2984acf9a562b6b1eb45a21d9af2be2415659.tar.gz unit-f5a2984acf9a562b6b1eb45a21d9af2be2415659.tar.bz2 | |
Go: moving source files to the root of the project.
This patch includes packaging changes related to files move.
| -rw-r--r-- | auto/modules/go | 2 | ||||
| -rw-r--r-- | go/ldflags-lrt.go (renamed from src/go/unit/ldflags-lrt.go) | 0 | ||||
| -rw-r--r-- | go/ldflags.go (renamed from src/go/unit/ldflags.go) | 0 | ||||
| -rw-r--r-- | go/nxt_cgo_lib.c (renamed from src/go/unit/nxt_cgo_lib.c) | 0 | ||||
| -rw-r--r-- | go/nxt_cgo_lib.h (renamed from src/go/unit/nxt_cgo_lib.h) | 0 | ||||
| -rw-r--r-- | go/port.go (renamed from src/go/unit/port.go) | 0 | ||||
| -rw-r--r-- | go/request.go (renamed from src/go/unit/request.go) | 0 | ||||
| -rw-r--r-- | go/response.go (renamed from src/go/unit/response.go) | 0 | ||||
| -rw-r--r-- | go/unit.go (renamed from src/go/unit/unit.go) | 0 | ||||
| -rw-r--r-- | pkg/deb/Makefile | 2 | ||||
| -rw-r--r-- | pkg/deb/debian.module/rules-noarch.in | 1 | ||||
| -rwxr-xr-x | pkg/deb/debian.module/rules.in | 1 | ||||
| -rw-r--r-- | pkg/deb/debian/rules.in | 1 | ||||
| -rw-r--r-- | pkg/rpm/Makefile | 2 |
14 files changed, 6 insertions, 3 deletions
diff --git a/auto/modules/go b/auto/modules/go index fad31036..a6ea8bc8 100644 --- a/auto/modules/go +++ b/auto/modules/go @@ -107,7 +107,7 @@ ${NXT_GO}-install: ${NXT_GO}-install-src ${NXT_GO}-install-env ${NXT_GO}-install-src: 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_VERSION_H} ${NXT_BUILD_DIR}/${NXT_LIB_UNIT_STATIC} diff --git a/src/go/unit/ldflags-lrt.go b/go/ldflags-lrt.go index f5a63508..f5a63508 100644 --- a/src/go/unit/ldflags-lrt.go +++ b/go/ldflags-lrt.go diff --git a/src/go/unit/ldflags.go b/go/ldflags.go index 68f2ab78..68f2ab78 100644 --- a/src/go/unit/ldflags.go +++ b/go/ldflags.go diff --git a/src/go/unit/nxt_cgo_lib.c b/go/nxt_cgo_lib.c index 5cb31b5a..5cb31b5a 100644 --- a/src/go/unit/nxt_cgo_lib.c +++ b/go/nxt_cgo_lib.c diff --git a/src/go/unit/nxt_cgo_lib.h b/go/nxt_cgo_lib.h index 5317380b..5317380b 100644 --- a/src/go/unit/nxt_cgo_lib.h +++ b/go/nxt_cgo_lib.h diff --git a/src/go/unit/port.go b/go/port.go index a68cae74..a68cae74 100644 --- a/src/go/unit/port.go +++ b/go/port.go diff --git a/src/go/unit/request.go b/go/request.go index 1d8c6702..1d8c6702 100644 --- a/src/go/unit/request.go +++ b/go/request.go diff --git a/src/go/unit/response.go b/go/response.go index 767d66b7..767d66b7 100644 --- a/src/go/unit/response.go +++ b/go/response.go diff --git a/src/go/unit/unit.go b/go/unit.go index 1534479e..1534479e 100644 --- a/src/go/unit/unit.go +++ b/go/unit.go diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 788d5a1f..13063fd8 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -195,7 +195,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 version + LICENSE NOTICE CHANGES README configure auto src test version go mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz cd debuild && tar zxf unit_$(VERSION).orig.tar.gz diff --git a/pkg/deb/debian.module/rules-noarch.in b/pkg/deb/debian.module/rules-noarch.in index 823675ba..a24602c4 100644 --- a/pkg/deb/debian.module/rules-noarch.in +++ b/pkg/deb/debian.module/rules-noarch.in @@ -27,6 +27,7 @@ config.env.%: cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in index 1391e01a..8ee277b3 100755 --- a/pkg/deb/debian.module/rules.in +++ b/pkg/deb/debian.module/rules.in @@ -27,6 +27,7 @@ config.env.%: cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in index bee9223f..a4696793 100644 --- a/pkg/deb/debian/rules.in +++ b/pkg/deb/debian/rules.in @@ -31,6 +31,7 @@ config.env.%: cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 39082d34..34f79bcc 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -204,7 +204,7 @@ endif rpmbuild/SOURCES/unit-$(VERSION).tar.gz: cd ../.. && tar -czf pkg/rpm/rpmbuild/SOURCES/unit-$(VERSION).tar.gz \ --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 @echo "===> Building $@ package" ; \ |