diff options
author | Carsten Dominik <carsten.dominik@gmail.com> | 2010-10-15 12:13:32 +0200 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2010-10-15 12:13:32 +0200 |
commit | 912ca556015c745a035d481b18d3e3bf8e930955 (patch) | |
tree | f78c19aafcd0e273911960117f1a4a86639fcfc0 | |
parent | fd5acb383393ee9fe6502ea245c0d9d948013aea (diff) | |
download | org-mode-912ca556015c745a035d481b18d3e3bf8e930955.tar.gz |
New Makefile target fixrelease to make a minor release from the maint branch
-rw-r--r-- | Makefile | 34 |
1 files changed, 34 insertions, 0 deletions
@@ -295,6 +295,11 @@ testrelease: git checkout master git branch -D testrelease +# The following target makes a full release fro the stuff that is +# currently on master. Do it like this: +# +# make release TAG=7.01 + release: git checkout maint git merge -s recursive -X theirs master @@ -314,6 +319,35 @@ release: git push make updateweb +# The following target makes a release, but from the studd that is on +# maint, not from the stuff that is on master. The idea is that it pushes +# out a minor fix into a minor update, while development on master +# already went full steam ahead. To make a micro-relesse, cherry-pick +# the necessary changes into maint, then run (with proper version number) +# This is just like release, but we skip the step which merges master +# into maint. +# +# make fixrelease TAG=7.01.02 + +fixrelease: + git checkout maint + git merge -s recursive -X theirs master + UTILITIES/set-version.pl $(TAG) + git commit -a -m "Release $(TAG)" + 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 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 push + make updateweb + relup: ${MAKE} makerelease ${MAKE} upload_release |