summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-03-19 22:37:52 +0100
committerBastien Guerry <bzg@altern.org>2012-03-19 22:38:45 +0100
commitbe2e3039a1bf118c8a13d0f29cffaf19f373b3f9 (patch)
treeb6df7a28da43ddc0ed16d5cea60d1f6659c1401c
parent00365ede15043d6e7745683e439ef36de0f3ee8a (diff)
downloadorg-mode-be2e3039a1bf118c8a13d0f29cffaf19f373b3f9.tar.gz
Fix Makefile.release_7.8.06
There was two problems: fixrelease merged the wrong way (merging master into maint) and cleanrel tried to clean up files that were already deleted.
-rw-r--r--Makefile15
1 files changed, 4 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 1753dd8..8a7bde1 100644
--- a/Makefile
+++ b/Makefile
@@ -353,18 +353,15 @@ release:
git checkout maint
git merge -s recursive -X theirs master
UTILITIES/set-version.pl $(TAG)
- git commit -a -m "Release $(TAG)"
+ git commit -a -m "Major release $(TAG) from master"
make relup TAG=$(TAG)
make cleanrel
- rm -rf org-$(TAG)
- rm -f org-$(TAG)*.zip
- rm -f org-$(TAG)*.tar.gz
make pushreleasetag TAG=$(TAG)
git push -f origin maint
git checkout master
git merge -s ours maint
UTILITIES/set-version.pl -a $(TAG)
- git commit -a -m "Update website to show $(TAG) as current release"
+ git commit -a -m "Bump to version $(TAG) as current release from master"
git push
# The following target makes a release, but from the stuff that is on
@@ -379,20 +376,16 @@ release:
fixrelease:
git checkout maint
- git merge -s recursive -X theirs master
UTILITIES/set-version.pl $(TAG)
- git commit -a -m "Release $(TAG)"
+ git commit -a -m "Bugfix release $(TAG) from maint"
make relup TAG=$(TAG)
make cleanrel
- rm -rf org-$(TAG)
- rm org-$(TAG)*.zip
- rm org-$(TAG)*.tar.gz
make pushreleasetag TAG=$(TAG)
git push -f origin maint
git checkout master
git merge -s ours maint
UTILITIES/set-version.pl -o $(TAG)
- git commit -a -m "Update website to show $(TAG) as current release"
+ git commit -a -m "Bump to version $(TAG) as current release from maint"
git push
# ~$ make relup only makes sense from orgmode.org server