summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-01-15 11:55:59 +0100
committerBastien Guerry <bzg@altern.org>2011-01-15 11:55:59 +0100
commit0dea2069712d7c59b188a35d5211e7fa3664ba19 (patch)
tree73f50f8e041a932e50db0fc73db1df6b9a3fe2a8
parentd168fa81f8213aa62327eba8b73c6076b8838914 (diff)
downloadorg-mode-0dea2069712d7c59b188a35d5211e7fa3664ba19.tar.gz
Makefile: New sync_* directives and a small fix
sync_release and sync_manual are copying release files from the temporary RELEASE directory to the server at /var/www/orgmode.org the relup directive now calls makerelease and sync_* directives. A small fix: remove calls to updateweb.
-rw-r--r--Makefile46
1 files changed, 28 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index e0c6e56..4391136 100644
--- a/Makefile
+++ b/Makefile
@@ -318,7 +318,6 @@ release:
UTILITIES/set-version.pl -a $(TAG)
git commit -a -m "Update website to show $(TAG) as current release"
git push
- make updateweb
# The following target makes a release, but from the stuff that is on
# maint, not from the stuff that is on master. The idea is that it pushes
@@ -347,7 +346,34 @@ fixrelease:
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} sync_release
+ ${MAKE} sync_manual
+
+makerelease:
+ @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
+ ${MAKE} distfile
+ ${MAKE} doc
+ UTILITIES/gplmanual.pl
+ ${MAKE} html_manual
+ ${MAKE} html_guide
+ rm -rf RELEASEDIR
+ $(MKDIR) RELEASEDIR
+ cp org-$(TAG).zip org-$(TAG).tar.gz RELEASEDIR
+ cp doc/org.pdf doc/orgcard.pdf doc/org.texi doc/org.html RELEASEDIR
+ cp doc/org_dual_license.texi RELEASEDIR
+ cp doc/orgguide.pdf doc/orgcard.txt RELEASEDIR
+ cp RELEASEDIR/org-$(TAG).zip RELEASEDIR/org.zip
+ cp RELEASEDIR/org-$(TAG).tar.gz RELEASEDIR/org.tar.gz
+
+sync_release:
+ rsync -avuz RELEASEDIR/ /var/www/orgmode.org/
+
+sync_manual:
+ rsync -avuz --delete doc/manual/ /var/www/orgmode.org/manual/
+ rsync -avuz --delete doc/guide/ /var/www/orgmode.org/guide/
distfile:
@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
@@ -378,22 +404,6 @@ pkg:
echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" > org-$(PKG_TAG)/org-pkg.el
tar cf org-$(PKG_TAG).tar org-$(PKG_TAG) --remove-files
-makerelease:
- @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
- ${MAKE} distfile
- ${MAKE} doc
- UTILITIES/gplmanual.pl
- ${MAKE} html_manual
- ${MAKE} html_guide
- rm -rf RELEASEDIR
- $(MKDIR) RELEASEDIR
- cp org-$(TAG).zip org-$(TAG).tar.gz RELEASEDIR
- cp doc/org.pdf doc/orgcard.pdf doc/org.texi doc/org.html RELEASEDIR
- cp doc/org_dual_license.texi RELEASEDIR
- cp doc/orgguide.pdf doc/orgcard.txt RELEASEDIR
- cp RELEASEDIR/org-$(TAG).zip RELEASEDIR/org.zip
- cp RELEASEDIR/org-$(TAG).tar.gz RELEASEDIR/org.tar.gz
-
cleanall:
${MAKE} clean
rm -f lisp/org-install.el