diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2010-07-20 15:38:28 +0200 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2010-07-20 15:56:34 +0200 |
| commit | 30253e5ed85091aa1a938261b767dfd35bc83dad (patch) | |
| tree | 37cbcab19b4e54ab8d10e367de3dac90f521274a | |
| parent | 056515e8dafe5a614f072e1db24ca8f053f44ca0 (diff) | |
| download | org-mode-30253e5ed85091aa1a938261b767dfd35bc83dad.tar.gz | |
New release targets in the Makefile
| -rw-r--r-- | Makefile | 35 |
1 files changed, 31 insertions, 4 deletions
@@ -293,7 +293,7 @@ distfile: zip -r org-$(TAG).zip org-$(TAG) gtar zcvf org-$(TAG).tar.gz org-$(TAG) -release: +makerelease: @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi ${MAKE} distfile ${MAKE} doc @@ -316,7 +316,7 @@ upload_manual: rsync -avuz --delete doc/guide/ cdominik@orgmode.org:orgmode.org/guide/ relup0: - ${MAKE} release + ${MAKE} makerelease ${MAKE} upload_release relup: @@ -324,8 +324,35 @@ relup: ${MAKE} upload_release ${MAKE} upload_manual -db: - grep -e '(debug)' lisp/*el +testrelease: + git checkout -b testrelease maint + git merge -s recursive -X theirs master + UTILITIES/set-version.pl testing + git commit -a -m "Release testing" + make distfile TAG=testversion + make cleanrel + rm -rf org-testversion* + git reset --hard + git checkout master + git branch -D testrelease + +release: + 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 + UTILITIES/set-version.pl -o $(TAG) + git commit -a -m "Update website to show $(TAG) as current release" + git push + make updateweb cleancontrib: find contrib -name \*~ -exec rm {} \; |