ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Achim Gratz 2012-08-27 19:37:00 +02:00
parent e1b1046685 e20cb6f92b
commit 82e1c4b3ec
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -32,6 +32,7 @@ orgcard.txt
org org
org-install.el org-install.el
org-version.el org-version.el
doc/org-version.inc
org-*.tar* org-*.tar*
org-*.zip org-*.zip
version.mk version.mk

35
mk/server.mk
View File

@ -29,17 +29,17 @@ SERVERMK ?= true # or just any value at all, really
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ORGCOMM = README request-assign-future.txt lisp/ doc/ ORGCOMM = README lisp/
ORGFULL = $(ORGCOMM) Makefile \ ORGFULL = $(ORGCOMM) Makefile request-assign-future.txt \
mk/default.mk mk/targets.mk mk/version.mk \ mk/default.mk mk/targets.mk mk/version.mk \
mk/org-fixup.el \ mk/org-fixup.el \
etc/ contrib/ etc/ contrib/ doc/
ORGFULL := $(ORGFULL:%/=%/*) ORGFULL := $(ORGFULL:%/=%/*)
ORGELPA = $(ORGCOMM) etc/styles/ org-pkg.el ORGELPA = $(ORGCOMM) doc/dir doc/org doc/orgcard.pdf \
etc/styles/ org-pkg.el
ORGELPA := $(ORGELPA:%/=%/*) ORGELPA := $(ORGELPA:%/=%/*)
release: ORG_MAKE_DOC=info pdf card # do not make HTML documentation release: cleanall info pdf card rel-dirty tagwarn
release: cleanall doc rel-dirty tagwarn
rel-dirty rel-up: ORGDIR=org-$(GITVERSION:release_%=%) rel-dirty rel-up: ORGDIR=org-$(GITVERSION:release_%=%)
rel-dirty: rel-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-dist version autoloads @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-dist version autoloads
@ -48,25 +48,25 @@ rel-dirty:
tar -zcf $(ORGDIR).tar.gz $(foreach dist, $(ORGFULL), $(ORGDIR)/$(dist)) tar -zcf $(ORGDIR).tar.gz $(foreach dist, $(ORGFULL), $(ORGDIR)/$(dist))
zip -r9 $(ORGDIR).zip $(foreach dist, $(ORGFULL), $(ORGDIR)/$(dist)) zip -r9 $(ORGDIR).zip $(foreach dist, $(ORGFULL), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR) -@$(RM) $(ORGDIR)
rel-up: rel-dirty rel-up: info pdf card rel-dirty
$(CP) $(ORGDIR).tar.gz $(ORGDIR).zip $(SERVROOT)/ $(CP) $(ORGDIR).tar.gz $(ORGDIR).zip $(SERVROOT)/
PKG_TAG = $(shell date +%Y%m%d) PKG_TAG = $(shell date +%Y%m%d)
PKG_DOC = "Outline-based notes management and organizer" PKG_DOC = "Outline-based notes management and organizer"
PKG_REQ = "nil" PKG_REQ = "nil"
elpa: ORG_MAKE_DOC=info # do not make HTML PDF card documentation elpa: cleanall info card elpa-dirty
elpa: cleanall doc elpa-dirty
elpa-dirty elpa-up: ORGDIR=org-$(PKG_TAG) elpa-dirty elpa-up: ORGDIR=org-$(PKG_TAG)
elpa-dirty: elpa-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads
-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP) -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
ln -s . $(ORGDIR) ln -s . $(ORGDIR)
echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" >org-pkg.el echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
> org-pkg.el
tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
$(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist)) $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR) org-pkg.el -@$(RM) $(ORGDIR) org-pkg.el
elpa-up: elpa-dirty elpa-up: info card elpa-dirty
$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/ $(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/
tagwarn: tagwarn:
@ -87,14 +87,13 @@ cleanall clean: cleanrel
cleanrel: cleanrel:
-$(RM) org-$(PKG_TAG)* org-$(DISTVERSION)* org-*.zip org-*.tar* mk/version.mk -$(RM) org-$(PKG_TAG)* org-$(DISTVERSION)* org-*.zip org-*.tar* mk/version.mk
doc-up: doc-up: info pdf card html
$(MAKE) -C doc html manual guide $(MAKE) -C doc manual guide
$(CP) doc/org.html $(SERVROOT) $(CP) doc/org.html $(SERVROOT)
$(CP) doc/manual/* $(SERVROOT)/manual $(CP) doc/manual/* $(SERVROOT)/manual
$(CP) doc/guide/* $(SERVROOT)/guide $(CP) doc/guide/* $(SERVROOT)/guide
upload upload-elpa upload-release upload-doc: ORG_MAKE_DOC=info pdf card upload: cleanall elpa-up rel-up doc-up
upload: cleanall doc elpa-up rel-up doc-up upload-elpa: cleanall elpa-up
upload-elpa: cleanall doc elpa-up upload-release: cleanall rel-up
upload-release: cleanall doc rel-up upload-doc: cleanall doc-up
upload-doc: cleanall doc doc-up

2
mk/targets.mk
View File

@ -40,7 +40,7 @@ endif
compile compile-dirty uncompiled \ compile compile-dirty uncompiled \
config config-test config-exe config-all config-eol config config-test config-exe config-all config-eol
CONF_BASE = EMACS DESTDIR ORGCM CONF_BASE = EMACS DESTDIR ORGCM ORG_MAKE_DOC
CONF_DEST = lispdir infodir datadir testdir CONF_DEST = lispdir infodir datadir testdir
CONF_TEST = BTEST_PRE BTEST_POST BTEST_OB_LANGUAGES BTEST_EXTRA CONF_TEST = BTEST_PRE BTEST_POST BTEST_OB_LANGUAGES BTEST_EXTRA
CONF_EXEC = CP MKDIR RM RMR FIND SUDO PDFTEX TEXI2PDF TEXI2HTML MAKEINFO INSTALL_INFO CONF_EXEC = CP MKDIR RM RMR FIND SUDO PDFTEX TEXI2PDF TEXI2HTML MAKEINFO INSTALL_INFO