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

This patch includes packaging changes related to files move.
nginx · Dec 24, 2019 · f5a2984 · f5a2984
1 parent a427ecd
commit f5a2984
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 3 deletions.
diff --git 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 → go/ldflags-lrt.go b/src/go/unit/ldflags-lrt.go → go/ldflags-lrt.go
diff --git a/src/go/unit/ldflags.go → go/ldflags.go b/src/go/unit/ldflags.go → go/ldflags.go
diff --git a/src/go/unit/nxt_cgo_lib.c → go/nxt_cgo_lib.c b/src/go/unit/nxt_cgo_lib.c → go/nxt_cgo_lib.c
diff --git a/src/go/unit/nxt_cgo_lib.h → go/nxt_cgo_lib.h b/src/go/unit/nxt_cgo_lib.h → go/nxt_cgo_lib.h
diff --git a/src/go/unit/port.go → go/port.go b/src/go/unit/port.go → go/port.go
diff --git a/src/go/unit/request.go → go/request.go b/src/go/unit/request.go → go/request.go
diff --git a/src/go/unit/response.go → go/response.go b/src/go/unit/response.go → go/response.go
diff --git a/src/go/unit/unit.go → go/unit.go b/src/go/unit/unit.go → go/unit.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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" ; \