Works well. Pushed. Thanks!
On 02/25/2013 04:45 PM, Jakub Filak wrote:
- closes #602
Signed-off-by: Jakub Filak <jfilak(a)redhat.com>
---
Makefile.am | 39 +++++++++++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a52072f..cc820ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,17 +68,40 @@ DIST=rawhide
scratch-build: srpm
koji build --scratch dist-$(DIST) `make srpm | grep Wrote | cut -d' ' -f2`
+UPLOAD_URL ?= fedorahosted.org:abrt
+
+upload: dist
+ scp $(distdir).tar.gz $$(test -n "$$UPLOAD_LOGIN" && echo
"$$UPLOAD_LOGIN@")$(UPLOAD_URL)
+
+.PHONY: release-fix
release-fix:
OLD_VER=$$(git describe --tags --match "[0-9]*" --abbrev=0 HEAD
2>/dev/null); \
- Mm_VER=$$(echo $$OLD_VER | cut -d. -f 1,2); \
- F_VER=$$(echo $$OLD_VER | cut -d. -f 3); \
- MmF_VER="$$Mm_VER.$$((F_VER+1))"; \
- echo "* $$(date +'%a %b %d %Y') $$(git config --get user.name) <$$(git
config --get user.email)> $$MmF_VER-1" > /tmp/changelog.tmp; \
+ MAJOR_VER=$$(echo $$OLD_VER | cut -d. -f 1); \
+ MINOR_VER=$$(echo $$OLD_VER | cut -d. -f 2); \
+ FIX_VER=$$(echo $$OLD_VER | cut -d. -f 3); \
+ $(MAKE) release OLD_VER=$$OLD_VER
NEW_VER="$$MAJOR_VER.$$MINOR_VER.$$((FIX_VER+1))"
+
+.PHONY: release-minor
+release-minor:
+ OLD_VER=$$(git describe --tags --match "[0-9]*" --abbrev=0 HEAD
2>/dev/null); \
+ MAJOR_VER=$$(echo $$OLD_VER | cut -d. -f 1); \
+ MINOR_VER=$$(echo $$OLD_VER | cut -d. -f 2); \
+ $(MAKE) release OLD_VER=$$OLD_VER NEW_VER="$$MAJOR_VER.$$((MINOR_VER+1)).0"
+
+.PHONY: release-major
+release-major:
+ OLD_VER=$$(git describe --tags --match "[0-9]*" --abbrev=0 HEAD
2>/dev/null); \
+ MAJOR_VER=$$(echo $$OLD_VER | cut -d. -f 1); \
+ $(MAKE) release OLD_VER=$$OLD_VER NEW_VER="$$((MAJOR_VER+1)).0.0"
+
+.PHONY: release
+release:
+ echo "* $$(date +'%a %b %d %Y') $$(git config --get user.name) <$$(git
config --get user.email)> $$NEW_VER-1" > /tmp/changelog.tmp; \
git log --oneline $$OLD_VER..HEAD | awk '{$$1=""; print "-"
$$0} END {print ""}' >> /tmp/changelog.tmp; \
sed "$$(grep -n changelog abrt.spec.in | cut -f1 -d:)"'r
/tmp/changelog.tmp' -i abrt.spec.in; \
git add abrt.spec.in; \
- git commit -m "New version $$MmF_VER"; \
- git tag "$$MmF_VER"; \
- ./gen-version
+ git commit -m "New version $$NEW_VER"; \
+ git tag "$$NEW_VER"; \
+ echo -n "$$NEW_VER" > abrt-version
autoconf --force
- $(MAKE) dist
+ $(MAKE) upload
--
Richard Marko