diff options
-rw-r--r-- | DEVELOPERS.md | 4 | ||||
-rwxr-xr-x | maint/release.in | 33 |
2 files changed, 23 insertions, 14 deletions
diff --git a/DEVELOPERS.md b/DEVELOPERS.md index c39c755..7c80c1c 100644 --- a/DEVELOPERS.md +++ b/DEVELOPERS.md @@ -50,6 +50,10 @@ Only on Debian systems can you build the Debian package: ./maint/release push deb rcm-*.tar.gz ./maint/release clean deb rcm-*.tar.gz +This will create both a binary and a signed source package. + +Source packages go in the `deb-src` directory on the `gh-pages` branch. + 5. Contact package maintainers: Gentoo Anton Ilin <anton@ilin.dn.ua> 0xCB2AA11FEB76CE36 diff --git a/maint/release.in b/maint/release.in index 40af317..58ba8c8 100755 --- a/maint/release.in +++ b/maint/release.in @@ -1,7 +1,7 @@ #!/bin/sh -ORIGIN_URL=$(shell git config --get remote.origin.url) -CURRENT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) +ORIGIN_URL=$(git config --get remote.origin.url) +CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) PACKAGE='@PACKAGE@' PACKAGE_VERSION='@PACKAGE_VERSION@' abs_srcdir='@abs_srcdir@' @@ -79,20 +79,24 @@ release_clean_arch() { # Deb release_build_deb() { ([ -d deb-build ] || mkdir -p deb-build) && \ - cp $(DIST_ARCHIVES) deb-build/$(PACKAGE)_$(PACKAGE_VERSION).orig.tar.gz && \ - tar -C deb-build -xf deb-build/$(PACKAGE)_$(PACKAGE_VERSION).orig.tar.gz && \ - cp -R debian deb-build/$(PACKAGE)-$(PACKAGE_VERSION) && \ - cd deb-build/$(PACKAGE)-$(PACKAGE_VERSION) && \ + cp ${DIST_ARCHIVES} deb-build/${PACKAGE}_${PACKAGE_VERSION}.orig.tar.gz && \ + tar -C deb-build -xf deb-build/${PACKAGE}_${PACKAGE_VERSION}.orig.tar.gz && \ + cp -R debian deb-build/${PACKAGE}-${PACKAGE_VERSION} && \ + cd deb-build/${PACKAGE}-${PACKAGE_VERSION} && \ dch -d "New upstream release" && dch -r "" && \ - cp debian/changelog $(abs_srcdir)/debian/changelog && \ - debuild -us -uc && \ - cd $(abs_srcdir) && \ - ([ -d gh-pages ] || git clone --branch gh-pages $(ORIGIN_URL) gh-pages) && \ + debuild -F && \ + cd ${abs_top_builddir} && \ + ([ -d gh-pages ] || git clone --branch gh-pages ${ORIGIN_URL} gh-pages) && \ ([ -d gh-pages/debs ] || mkdir gh-pages/debs) && \ - cp deb-build/$(PACKAGE)_$(PACKAGE_VERSION)*.deb gh-pages/debs && \ + ([ -d gh-pages/deb-src ] || mkdir gh-pages/deb-src) && \ + cp deb-build/${PACKAGE}_${PACKAGE_VERSION}*.deb gh-pages/debs && \ + cp deb-build/${PACKAGE}_${PACKAGE_VERSION}*.dsc gh-pages/deb-src && \ + cp deb-build/${PACKAGE}_${PACKAGE_VERSION}*.{orig,debian}.tar.gz gh-pages/deb-src && \ cd gh-pages && \ - git add debs/$(PACKAGE)_$(PACKAGE_VERSION)*deb && \ - git commit -m "Release version $(PACKAGE_VERSION) for Debian" -- debs/$(PACKAGE)_$(PACKAGE_VERSION)*deb + git add debs/${PACKAGE}_${PACKAGE_VERSION}*deb && \ + git add deb-src/${PACKAGE}_${PACKAGE_VERSION}*dsc && \ + git add deb-src/${PACKAGE}_${PACKAGE_VERSION}*{orig,debian}.tar.gz && \ + git commit -m "Release version ${PACKAGE_VERSION} for Debian" -- debs/${PACKAGE}_${PACKAGE_VERSION}*deb } release_push_deb() { @@ -116,6 +120,7 @@ release_push_tag() { } release_clean_tag() { + : } generate_dist_sha() { @@ -145,7 +150,7 @@ release_clean_man_html() { # Main: -if [ $# < 3 ]; then +if [ $# -lt 3 ]; then echo "Usage: release (build|push|clean) (tarball|homebrew|arch|deb|tag|man_html) DIST_ARCHIVES" >&2 exit 64 fi |