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:37:52 +0100
commit6bcba149195c2c281eefc3065dabe2ec1fdea687 (patch)
treed5946cc984820d0ce7e6c75fa8e8521e1d94d4fa
parentecd0562c5f6e69ce0e4546d9f64d8e89eda8eef1 (diff)
downloadorg-mode-6bcba149195c2c281eefc3065dabe2ec1fdea687.tar.gz
Fix Makefile.
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 1022cdc..89d75d0 100644
--- a/Makefile
+++ b/Makefile
@@ -355,18 +355,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
@@ -381,20 +378,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