2008-01-31 10:32:35 +00:00
|
|
|
# Makefile - for the org-mode distribution
|
|
|
|
#
|
|
|
|
# Maintainer: Carsten Dominik <dominik@science.uva.nl>
|
|
|
|
# Version: VERSIONTAG
|
|
|
|
#
|
|
|
|
# To install org-mode, edit the Makefile, type `make', then `make install'.
|
|
|
|
# To create the PDF and HTML documentation files, type `make doc'.
|
|
|
|
|
|
|
|
##----------------------------------------------------------------------
|
2010-06-30 18:56:11 +00:00
|
|
|
## YOU MUST EDIT THE FOLLOWING LINES
|
2008-01-31 10:32:35 +00:00
|
|
|
##----------------------------------------------------------------------
|
|
|
|
|
|
|
|
# Name of your emacs binary
|
|
|
|
EMACS=emacs
|
|
|
|
|
|
|
|
# Where local software is found
|
2008-06-15 07:44:21 +00:00
|
|
|
prefix=/usr/local
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2011-12-20 23:16:05 +00:00
|
|
|
# Where local lisp files go
|
2010-06-30 18:56:11 +00:00
|
|
|
lispdir = $(prefix)/share/emacs/site-lisp
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2011-12-30 19:30:56 +00:00
|
|
|
# Where data files go
|
|
|
|
# $(datadir) contains auxiliary files for use with ODT exporter.
|
|
|
|
# See comments under DATAFILES.
|
|
|
|
datadir = $(prefix)/share/emacs/etc
|
2011-12-20 23:16:05 +00:00
|
|
|
|
|
|
|
# Where info files go
|
2008-10-09 09:45:10 +00:00
|
|
|
infodir = $(prefix)/share/info
|
2008-01-31 10:32:35 +00:00
|
|
|
|
|
|
|
##----------------------------------------------------------------------
|
|
|
|
## YOU MAY NEED TO EDIT THESE
|
|
|
|
##----------------------------------------------------------------------
|
|
|
|
|
|
|
|
# Using emacs in batch mode.
|
2008-01-31 10:38:36 +00:00
|
|
|
|
2010-06-12 00:38:51 +00:00
|
|
|
BATCH=$(EMACS) -batch -q -no-site-file -eval \
|
2011-12-30 19:30:56 +00:00
|
|
|
"(setq load-path (cons (expand-file-name \"./lisp/\") (cons \"$(lispdir)\" load-path)))" $(BATCH_EXTRA)
|
2008-01-31 10:38:36 +00:00
|
|
|
|
2008-01-31 10:32:35 +00:00
|
|
|
# Specify the byte-compiler for compiling org-mode files
|
|
|
|
ELC= $(BATCH) -f batch-byte-compile
|
|
|
|
|
|
|
|
# How to make a pdf file from a texinfo file
|
|
|
|
TEXI2PDF = texi2pdf
|
|
|
|
|
|
|
|
# How to create directories
|
|
|
|
MKDIR = mkdir -p
|
|
|
|
|
|
|
|
# How to create the info files from the texinfo file
|
|
|
|
MAKEINFO = makeinfo
|
|
|
|
|
|
|
|
# How to create the HTML file
|
2008-01-31 10:38:20 +00:00
|
|
|
TEXI2HTML = makeinfo --html --number-sections
|
2010-04-28 06:53:17 +00:00
|
|
|
TEXI2HTMLNOPSLIT = makeinfo --html --no-split --number-sections
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2008-09-08 10:16:33 +00:00
|
|
|
# How to copy the lisp files and elc files to their distination.
|
2011-12-30 19:30:56 +00:00
|
|
|
CP = cp -pr
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2008-09-24 13:20:33 +00:00
|
|
|
# Name of the program to install info files
|
|
|
|
INSTALL_INFO=install-info
|
|
|
|
|
2008-01-31 10:32:35 +00:00
|
|
|
##----------------------------------------------------------------------
|
|
|
|
## BELOW THIS LINE ON YOUR OWN RISK!
|
|
|
|
##----------------------------------------------------------------------
|
|
|
|
|
|
|
|
# The following variables need to be defined by the maintainer
|
2010-06-30 18:56:11 +00:00
|
|
|
LISPF = org.el \
|
|
|
|
org-agenda.el \
|
|
|
|
org-ascii.el \
|
|
|
|
org-attach.el \
|
|
|
|
org-archive.el \
|
|
|
|
org-bbdb.el \
|
|
|
|
org-beamer.el \
|
|
|
|
org-bibtex.el \
|
|
|
|
org-capture.el \
|
|
|
|
org-clock.el \
|
|
|
|
org-colview.el \
|
|
|
|
org-colview-xemacs.el \
|
|
|
|
org-compat.el \
|
2011-01-31 17:40:05 +00:00
|
|
|
org-pcomplete.el \
|
2010-06-30 18:56:11 +00:00
|
|
|
org-crypt.el \
|
|
|
|
org-ctags.el \
|
|
|
|
org-datetree.el \
|
|
|
|
org-docview.el \
|
|
|
|
org-entities.el \
|
|
|
|
org-exp.el \
|
|
|
|
org-exp-blocks.el \
|
|
|
|
org-docbook.el \
|
|
|
|
org-faces.el \
|
|
|
|
org-feed.el \
|
|
|
|
org-footnote.el \
|
|
|
|
org-freemind.el \
|
|
|
|
org-gnus.el \
|
2011-12-21 08:43:48 +00:00
|
|
|
org-eshell.el \
|
2010-06-30 18:56:11 +00:00
|
|
|
org-habit.el \
|
|
|
|
org-html.el \
|
|
|
|
org-icalendar.el \
|
|
|
|
org-id.el \
|
|
|
|
org-indent.el \
|
|
|
|
org-info.el \
|
|
|
|
org-inlinetask.el \
|
|
|
|
org-jsinfo.el \
|
|
|
|
org-irc.el \
|
|
|
|
org-latex.el \
|
|
|
|
org-list.el \
|
2011-12-04 21:00:57 +00:00
|
|
|
org-lparse.el \
|
2010-06-30 18:56:11 +00:00
|
|
|
org-mac-message.el \
|
|
|
|
org-macs.el \
|
|
|
|
org-mew.el \
|
|
|
|
org-mhe.el \
|
|
|
|
org-mks.el \
|
|
|
|
org-mobile.el \
|
|
|
|
org-mouse.el \
|
2011-12-04 21:00:57 +00:00
|
|
|
org-odt.el \
|
2010-06-30 18:56:11 +00:00
|
|
|
org-publish.el \
|
|
|
|
org-plot.el \
|
|
|
|
org-protocol.el \
|
|
|
|
org-remember.el \
|
|
|
|
org-rmail.el \
|
2011-01-03 21:08:10 +00:00
|
|
|
org-special-blocks.el \
|
2010-06-30 18:56:11 +00:00
|
|
|
org-src.el \
|
|
|
|
org-table.el \
|
|
|
|
org-taskjuggler.el \
|
|
|
|
org-timer.el \
|
|
|
|
org-vm.el \
|
|
|
|
org-w3m.el \
|
|
|
|
org-wl.el \
|
2010-07-03 00:14:13 +00:00
|
|
|
org-xoxo.el \
|
|
|
|
ob.el \
|
2010-06-30 18:56:11 +00:00
|
|
|
ob-table.el \
|
|
|
|
ob-lob.el \
|
|
|
|
ob-ref.el \
|
|
|
|
ob-exp.el \
|
|
|
|
ob-tangle.el \
|
|
|
|
ob-comint.el \
|
2010-07-04 22:09:20 +00:00
|
|
|
ob-eval.el \
|
2010-07-03 00:14:13 +00:00
|
|
|
ob-keys.el \
|
2011-05-26 13:28:30 +00:00
|
|
|
ob-awk.el \
|
2010-07-03 00:14:13 +00:00
|
|
|
ob-C.el \
|
2010-11-13 00:02:24 +00:00
|
|
|
ob-calc.el \
|
2010-06-30 18:56:11 +00:00
|
|
|
ob-ditaa.el \
|
|
|
|
ob-haskell.el \
|
|
|
|
ob-perl.el \
|
|
|
|
ob-sh.el \
|
|
|
|
ob-R.el \
|
|
|
|
ob-dot.el \
|
2010-07-06 01:43:55 +00:00
|
|
|
ob-mscgen.el \
|
2010-06-30 18:56:11 +00:00
|
|
|
ob-latex.el \
|
2010-12-27 14:29:23 +00:00
|
|
|
ob-lisp.el \
|
2010-07-23 16:23:44 +00:00
|
|
|
ob-ledger.el \
|
2010-06-30 18:56:11 +00:00
|
|
|
ob-python.el \
|
|
|
|
ob-sql.el \
|
|
|
|
ob-asymptote.el \
|
|
|
|
ob-emacs-lisp.el \
|
|
|
|
ob-matlab.el \
|
|
|
|
ob-ruby.el \
|
|
|
|
ob-sqlite.el \
|
|
|
|
ob-clojure.el \
|
|
|
|
ob-ocaml.el \
|
|
|
|
ob-sass.el \
|
|
|
|
ob-css.el \
|
|
|
|
ob-gnuplot.el \
|
|
|
|
ob-octave.el \
|
2010-08-26 15:36:08 +00:00
|
|
|
ob-screen.el \
|
2010-08-26 16:01:21 +00:00
|
|
|
ob-plantuml.el \
|
2010-08-27 22:59:08 +00:00
|
|
|
ob-org.el \
|
2010-08-28 00:01:24 +00:00
|
|
|
ob-js.el \
|
2011-07-08 01:33:56 +00:00
|
|
|
ob-scheme.el \
|
2011-07-18 16:07:49 +00:00
|
|
|
ob-lilypond.el \
|
2011-10-07 01:54:22 +00:00
|
|
|
ob-java.el \
|
2011-11-08 21:18:57 +00:00
|
|
|
ob-shen.el \
|
2011-11-29 16:05:31 +00:00
|
|
|
ob-fortran.el \
|
|
|
|
ob-picolisp.el
|
2010-06-30 18:56:11 +00:00
|
|
|
|
|
|
|
LISPFILES0 = $(LISPF:%=lisp/%)
|
|
|
|
LISPFILES = $(LISPFILES0) lisp/org-install.el
|
|
|
|
ELCFILES0 = $(LISPFILES0:.el=.elc)
|
|
|
|
ELCFILES = $(LISPFILES:.el=.elc)
|
|
|
|
DOCFILES = doc/org.texi doc/org.pdf doc/org doc/dir \
|
|
|
|
doc/pdflayout.sty doc/.nosearch \
|
|
|
|
doc/orgguide.texi doc/orgguide.pdf
|
|
|
|
CARDFILES = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf
|
|
|
|
TEXIFILES = doc/org.texi
|
|
|
|
INFOFILES = doc/org
|
2011-12-30 19:30:56 +00:00
|
|
|
|
|
|
|
# etc/styles contains OpenDocument style files. These files *must* be
|
|
|
|
# installed for the ODT exporter to function. These files are
|
|
|
|
# distirbuted with GNU ELPA as well as with stock Emacs >= 24.1.
|
|
|
|
|
|
|
|
# contrib/odt/etc/schema contains OpenDocument schema files. It is
|
|
|
|
# *desirable* but *not* mandatory that these files be installed.
|
|
|
|
# These files are not distributed with stock Emacs. This is because
|
|
|
|
# the terms under which OASIS distributes these files are not
|
|
|
|
# agreeable to FSF.
|
|
|
|
|
|
|
|
# BasicODConverter-x.y.z.oxt is a LibreOffice extension for converting
|
|
|
|
# OpenDocument files to numerous other formats. It is similar to
|
|
|
|
# unoconv and is implemented in StarBasic. It is *desirable* but
|
|
|
|
# *not* *mandatory* that the converter be installed. It is
|
|
|
|
# distributed under the same license as GNU Emacs. This file is *not*
|
|
|
|
# part of GNU Emacs.
|
|
|
|
DATAFILES = etc/styles \
|
|
|
|
# contrib/odt/BasicODConverter/BasicODConverter*.oxt \
|
|
|
|
# contrib/odt/etc/schema \
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2010-10-05 10:11:09 +00:00
|
|
|
# Package Manager (ELPA)
|
|
|
|
PKG_TAG = $(shell date +%Y%m%d)
|
|
|
|
PKG_DOC = "Outline-based notes management and organizer"
|
|
|
|
PKG_REQ = "nil"
|
|
|
|
|
|
|
|
PKG_FILES = $(LISPFILES0) \
|
|
|
|
doc/dir doc/org \
|
|
|
|
doc/pdflayout.sty \
|
|
|
|
doc/org.pdf \
|
|
|
|
doc/orgguide.pdf \
|
|
|
|
doc/orgcard.tex \
|
|
|
|
doc/orgcard.pdf \
|
2011-12-10 15:09:07 +00:00
|
|
|
doc/orgcard_letter.pdf \
|
|
|
|
etc/
|
2008-01-31 15:04:26 +00:00
|
|
|
|
2008-01-31 10:32:35 +00:00
|
|
|
.SUFFIXES: .el .elc .texi
|
|
|
|
SHELL = /bin/sh
|
|
|
|
|
2008-03-31 10:59:00 +00:00
|
|
|
# Additional distribution files
|
2011-12-13 00:31:00 +00:00
|
|
|
DISTFILES_extra= Makefile request-assign-future.txt contrib etc
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2010-06-30 18:56:11 +00:00
|
|
|
default: $(ELCFILES) $(ELCBFILES)
|
2008-03-31 10:59:00 +00:00
|
|
|
|
2010-06-30 18:56:11 +00:00
|
|
|
all: $(ELCFILES) $(ELCBFILES) $(INFOFILES)
|
2008-03-31 10:59:00 +00:00
|
|
|
|
2009-06-02 12:15:00 +00:00
|
|
|
up2: update
|
|
|
|
sudo ${MAKE} install
|
2009-06-02 08:29:06 +00:00
|
|
|
|
|
|
|
update:
|
|
|
|
git pull
|
2009-06-02 12:15:00 +00:00
|
|
|
${MAKE} clean
|
|
|
|
${MAKE} all
|
2009-06-02 08:29:06 +00:00
|
|
|
|
2010-06-30 18:56:11 +00:00
|
|
|
compile: $(ELCFILES0) $(ELCBFILES)
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2011-12-30 19:30:56 +00:00
|
|
|
install: install-lisp install-data
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2010-10-29 06:37:30 +00:00
|
|
|
doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2008-01-31 10:34:04 +00:00
|
|
|
p:
|
2009-06-02 12:15:00 +00:00
|
|
|
${MAKE} pdf && open doc/org.pdf
|
2008-01-31 10:34:04 +00:00
|
|
|
|
2010-04-28 06:53:17 +00:00
|
|
|
g:
|
|
|
|
${MAKE} pdf && open doc/orgguide.pdf
|
|
|
|
|
2011-12-30 19:30:56 +00:00
|
|
|
# Always force re-compilation of org-odt
|
|
|
|
lisp/org-odt.elc: org-odt-data-dir
|
|
|
|
org-odt-data-dir:
|
|
|
|
|
|
|
|
# Sleight of hand to "hard code" the value of $(datadir) in
|
|
|
|
# org-odt.el. See variables `org-odt-styles-dir-list' and
|
|
|
|
# `org-odt-schema-dir-list'.
|
|
|
|
install-lisp: BATCH_EXTRA = -eval "(setq org-odt-data-dir (expand-file-name \"$(datadir)\"))"
|
|
|
|
|
2010-07-03 00:14:13 +00:00
|
|
|
install-lisp: $(LISPFILES) $(ELCFILES)
|
2008-01-31 10:32:35 +00:00
|
|
|
if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;
|
2010-06-30 18:56:11 +00:00
|
|
|
$(CP) $(LISPFILES) $(lispdir)
|
|
|
|
$(CP) $(ELCFILES) $(lispdir)
|
2008-01-31 10:32:35 +00:00
|
|
|
|
|
|
|
install-info: $(INFOFILES)
|
2008-10-07 16:37:08 +00:00
|
|
|
if [ ! -d $(infodir) ]; then $(MKDIR) $(infodir); else true; fi ;
|
|
|
|
$(CP) $(INFOFILES) $(infodir)
|
2009-03-12 06:31:57 +00:00
|
|
|
$(INSTALL_INFO) --infodir=$(infodir) $(INFOFILES)
|
2009-03-11 10:50:47 +00:00
|
|
|
|
2011-12-30 19:30:56 +00:00
|
|
|
install-data: $(DATAFILES)
|
|
|
|
if [ ! -d $(datadir) ]; then $(MKDIR) $(datadir); else true; fi ;
|
|
|
|
$(CP) $(DATAFILES) $(datadir)
|
2011-12-20 23:16:05 +00:00
|
|
|
|
2008-03-22 15:52:18 +00:00
|
|
|
autoloads: lisp/org-install.el
|
|
|
|
|
2010-07-03 00:14:13 +00:00
|
|
|
lisp/org-install.el: $(LISPFILES0) Makefile
|
2008-01-31 10:37:51 +00:00
|
|
|
$(BATCH) --eval "(require 'autoload)" \
|
2011-07-16 12:58:53 +00:00
|
|
|
--eval '(find-file "lisp/org-install.el")' \
|
2008-01-31 10:37:51 +00:00
|
|
|
--eval '(erase-buffer)' \
|
2011-07-16 12:58:53 +00:00
|
|
|
--eval '(mapc (lambda (x) (generate-file-autoloads (symbol-name x))) (quote ($(LISPF))))' \
|
2008-01-31 10:38:00 +00:00
|
|
|
--eval '(insert "\n(provide (quote org-install))\n")' \
|
2008-01-31 10:37:51 +00:00
|
|
|
--eval '(save-buffer)'
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2008-03-22 15:52:18 +00:00
|
|
|
doc/org: doc/org.texi
|
2011-05-30 08:25:35 +00:00
|
|
|
(cd doc && $(MAKEINFO) --no-split org.texi -o org)
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2008-03-22 15:52:18 +00:00
|
|
|
doc/org.pdf: doc/org.texi
|
2011-05-30 08:25:35 +00:00
|
|
|
(cd doc && $(TEXI2PDF) org.texi)
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2010-04-28 06:53:17 +00:00
|
|
|
doc/orgguide.pdf: doc/orgguide.texi
|
2011-05-30 08:25:35 +00:00
|
|
|
(cd doc && $(TEXI2PDF) orgguide.texi)
|
2010-04-28 06:53:17 +00:00
|
|
|
|
2008-03-22 15:52:18 +00:00
|
|
|
doc/org.html: doc/org.texi
|
2011-05-30 08:25:35 +00:00
|
|
|
(cd doc && $(TEXI2HTML) --no-split -o org.html org.texi)
|
2008-11-27 11:00:21 +00:00
|
|
|
UTILITIES/manfull.pl doc/org.html
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2010-03-05 07:28:01 +00:00
|
|
|
doc/orgcard.pdf: doc/orgcard.tex
|
2011-05-30 08:25:35 +00:00
|
|
|
(cd doc && pdftex orgcard.tex)
|
2008-01-31 10:34:42 +00:00
|
|
|
|
2010-05-12 14:21:00 +00:00
|
|
|
doc/orgcard.txt: doc/orgcard.tex
|
2011-05-30 08:25:35 +00:00
|
|
|
(cd doc && perl ../UTILITIES/orgcard2txt.pl orgcard.tex > orgcard.txt)
|
2010-05-12 14:21:00 +00:00
|
|
|
|
2010-03-05 07:28:01 +00:00
|
|
|
doc/orgcard_letter.tex: doc/orgcard.tex
|
|
|
|
perl -pe 's/\\pdflayout=\(0l\)/\\pdflayout=(1l)/' \
|
|
|
|
doc/orgcard.tex > doc/orgcard_letter.tex
|
2008-01-31 10:34:42 +00:00
|
|
|
|
2010-03-05 07:28:01 +00:00
|
|
|
doc/orgcard_letter.pdf: doc/orgcard_letter.tex
|
2011-05-30 08:25:35 +00:00
|
|
|
(cd doc && pdftex orgcard_letter.tex)
|
2008-01-31 10:34:42 +00:00
|
|
|
|
2008-01-31 10:32:35 +00:00
|
|
|
# Below here are special targets for maintenance only
|
|
|
|
|
2008-03-22 15:52:18 +00:00
|
|
|
html: doc/org.html
|
2008-01-31 10:38:20 +00:00
|
|
|
|
2008-04-01 14:42:15 +00:00
|
|
|
html_manual: doc/org.texi
|
2008-03-22 15:52:18 +00:00
|
|
|
rm -rf doc/manual
|
|
|
|
mkdir doc/manual
|
|
|
|
$(TEXI2HTML) -o doc/manual doc/org.texi
|
2008-11-27 11:00:21 +00:00
|
|
|
UTILITIES/mansplit.pl doc/manual/*.html
|
2008-01-31 10:38:20 +00:00
|
|
|
|
2010-04-28 06:53:17 +00:00
|
|
|
html_guide: doc/orgguide.texi
|
|
|
|
rm -rf doc/guide
|
|
|
|
mkdir doc/guide
|
|
|
|
$(TEXI2HTML) -o doc/guide doc/orgguide.texi
|
|
|
|
UTILITIES/guidesplit.pl doc/guide/*.html
|
|
|
|
|
2008-03-22 15:52:18 +00:00
|
|
|
info: doc/org
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2010-04-28 06:53:17 +00:00
|
|
|
pdf: doc/org.pdf doc/orgguide.pdf
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2010-05-12 14:21:00 +00:00
|
|
|
card: doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgcard.txt
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2010-07-20 14:16:13 +00:00
|
|
|
testrelease:
|
2011-07-07 06:53:40 +00:00
|
|
|
git checkout -b testrelease origin/maint
|
2010-07-20 14:16:13 +00:00
|
|
|
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
|
|
|
|
|
2011-01-09 17:49:18 +00:00
|
|
|
# The following target makes a full release for the stuff that is
|
2010-10-15 10:13:32 +00:00
|
|
|
# currently on master. Do it like this:
|
|
|
|
#
|
|
|
|
# make release TAG=7.01
|
|
|
|
|
2010-07-20 14:16:13 +00:00
|
|
|
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)
|
2010-11-01 13:03:17 +00:00
|
|
|
rm -f org-$(TAG)*.zip
|
|
|
|
rm -f org-$(TAG)*.tar.gz
|
2010-07-20 14:16:13 +00:00
|
|
|
make pushreleasetag TAG=$(TAG)
|
2010-10-29 04:02:15 +00:00
|
|
|
git push -f origin maint
|
2010-07-20 14:16:13 +00:00
|
|
|
git checkout master
|
2010-10-15 10:13:32 +00:00
|
|
|
git merge -s ours maint
|
2010-12-10 17:58:39 +00:00
|
|
|
UTILITIES/set-version.pl -a $(TAG)
|
2010-10-15 10:13:32 +00:00
|
|
|
git commit -a -m "Update website to show $(TAG) as current release"
|
|
|
|
git push
|
|
|
|
|
2011-01-09 17:49:18 +00:00
|
|
|
# The following target makes a release, but from the stuff that is on
|
2010-10-15 10:13:32 +00:00
|
|
|
# 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)
|
2010-10-29 04:02:15 +00:00
|
|
|
git push -f origin maint
|
2010-10-15 10:13:32 +00:00
|
|
|
git checkout master
|
2010-07-21 03:53:45 +00:00
|
|
|
git merge -s ours maint
|
2010-07-20 14:16:13 +00:00
|
|
|
UTILITIES/set-version.pl -o $(TAG)
|
|
|
|
git commit -a -m "Update website to show $(TAG) as current release"
|
|
|
|
git push
|
2011-01-15 10:55:59 +00:00
|
|
|
|
2011-01-15 10:58:33 +00:00
|
|
|
# ~$ make relup only makes sense from orgmode.org server
|
|
|
|
# Don't call it from your computer!
|
2011-01-15 10:55:59 +00:00
|
|
|
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
|
|
|
|
|
2011-01-15 10:58:33 +00:00
|
|
|
# ~$ make sync_release only makes sense from orgmode.org server
|
|
|
|
# Don't call it from your computer!
|
2011-01-15 10:55:59 +00:00
|
|
|
sync_release:
|
|
|
|
rsync -avuz RELEASEDIR/ /var/www/orgmode.org/
|
|
|
|
|
2011-01-15 10:58:33 +00:00
|
|
|
# ~$ make sync_manual only makes sense from orgmode.org server
|
|
|
|
# Don't call it from your computer!
|
2011-01-15 10:55:59 +00:00
|
|
|
sync_manual:
|
|
|
|
rsync -avuz --delete doc/manual/ /var/www/orgmode.org/manual/
|
|
|
|
rsync -avuz --delete doc/guide/ /var/www/orgmode.org/guide/
|
2010-07-20 14:16:13 +00:00
|
|
|
|
2008-01-31 10:32:35 +00:00
|
|
|
distfile:
|
|
|
|
@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
|
2008-03-31 10:59:00 +00:00
|
|
|
touch doc/org.texi doc/orgcard.tex # force update
|
2009-06-02 12:15:00 +00:00
|
|
|
${MAKE} cleancontrib
|
|
|
|
${MAKE} info
|
|
|
|
${MAKE} doc
|
|
|
|
${MAKE} lisp/org-install.el
|
2008-01-31 10:32:35 +00:00
|
|
|
rm -rf org-$(TAG) org-$(TAG).zip
|
|
|
|
$(MKDIR) org-$(TAG)
|
2008-03-31 10:59:00 +00:00
|
|
|
$(MKDIR) org-$(TAG)/doc
|
|
|
|
$(MKDIR) org-$(TAG)/lisp
|
|
|
|
cp -r $(LISPFILES) org-$(TAG)/lisp
|
|
|
|
cp -r $(DOCFILES) $(CARDFILES) org-$(TAG)/doc
|
|
|
|
cp -r $(DISTFILES_extra) org-$(TAG)/
|
|
|
|
cp -r README_DIST org-$(TAG)/README
|
2008-01-31 10:32:35 +00:00
|
|
|
zip -r org-$(TAG).zip org-$(TAG)
|
2011-01-15 10:39:12 +00:00
|
|
|
tar zcvf org-$(TAG).tar.gz org-$(TAG)
|
2008-01-31 10:32:35 +00:00
|
|
|
|
2010-10-05 10:11:09 +00:00
|
|
|
pkg:
|
|
|
|
@if [ "X$(PKG_TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
|
|
|
|
touch doc/org.texi doc/orgcard.tex # force update
|
|
|
|
${MAKE} info
|
|
|
|
${MAKE} doc
|
|
|
|
rm -rf org-$(PKG_TAG) org-$(PKG_TAG).tar
|
|
|
|
$(MKDIR) org-$(PKG_TAG)
|
|
|
|
cp -r $(PKG_FILES) org-$(PKG_TAG)
|
|
|
|
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
|
|
|
|
|
2010-07-20 14:16:13 +00:00
|
|
|
cleanall:
|
|
|
|
${MAKE} clean
|
|
|
|
rm -f lisp/org-install.el
|
2010-07-20 13:38:28 +00:00
|
|
|
|
2010-07-20 14:16:13 +00:00
|
|
|
clean:
|
|
|
|
${MAKE} cleanelc
|
|
|
|
${MAKE} cleandoc
|
|
|
|
${MAKE} cleanrel
|
|
|
|
rm -f *~ */*~ */*/*~
|
2008-04-25 13:44:07 +00:00
|
|
|
|
2008-09-22 10:15:33 +00:00
|
|
|
cleancontrib:
|
|
|
|
find contrib -name \*~ -exec rm {} \;
|
|
|
|
|
2008-03-28 10:38:31 +00:00
|
|
|
cleanelc:
|
2008-03-22 15:52:18 +00:00
|
|
|
rm -f $(ELCFILES)
|
2008-03-28 10:38:31 +00:00
|
|
|
cleandoc:
|
2011-05-30 08:25:35 +00:00
|
|
|
-(cd doc && rm -f org.pdf org org.html orgcard.pdf orgguide.pdf)
|
|
|
|
-(cd doc && rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs)
|
|
|
|
-(cd doc && rm -f *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps)
|
|
|
|
-(cd doc && rm -f orgcard_letter.tex orgcard_letter.pdf)
|
|
|
|
-(cd doc && rm -rf manual)
|
2008-10-12 13:27:07 +00:00
|
|
|
|
|
|
|
cleanrel:
|
|
|
|
rm -rf RELEASEDIR
|
2010-08-14 17:55:00 +00:00
|
|
|
rm -rf org-7.*
|
|
|
|
rm -rf org-7*zip org-7*tar.gz
|
2008-10-12 13:27:07 +00:00
|
|
|
|
2008-01-31 10:32:35 +00:00
|
|
|
.el.elc:
|
|
|
|
$(ELC) $<
|
|
|
|
|
2008-01-31 15:04:26 +00:00
|
|
|
|
|
|
|
push:
|
2011-07-07 11:43:25 +00:00
|
|
|
git push orgmode@orgmode.org:org-mode.git master
|
2008-02-07 23:07:48 +00:00
|
|
|
|
|
|
|
pushtag:
|
2011-07-07 11:43:25 +00:00
|
|
|
git tag -m "Adding tag" -a $(TAG)
|
|
|
|
git push orgmode@orgmode.org:org-mode.git $(TAG)
|
2008-04-14 12:59:37 +00:00
|
|
|
|
2008-04-14 22:06:34 +00:00
|
|
|
pushreleasetag:
|
2011-07-07 11:43:25 +00:00
|
|
|
git tag -m "Adding release tag" -a release_$(TAG)
|
|
|
|
git push orgmode@orgmode.org:org-mode.git release_$(TAG)
|
2008-04-14 22:06:34 +00:00
|
|
|
|
2008-04-14 12:59:37 +00:00
|
|
|
# Dependencies
|
|
|
|
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org.elc: lisp/org-macs.el lisp/org-compat.el lisp/org-faces.el
|
|
|
|
lisp/org-agenda.elc: lisp/org.el
|
|
|
|
lisp/org-ascii.elc: lisp/org-exp.el
|
|
|
|
lisp/org-attach.elc: lisp/org.el lisp/org-id.el
|
|
|
|
lisp/org-archive.elc: lisp/org.el
|
|
|
|
lisp/org-bbdb.elc: lisp/org.el
|
2009-12-11 07:53:29 +00:00
|
|
|
lisp/org-beamer.elc: lisp/org.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-bibtex.elc: lisp/org.el
|
2010-06-23 04:37:54 +00:00
|
|
|
lisp/org-capture.elc: lisp/org.el lisp/org-mks.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-clock.elc: lisp/org.el
|
|
|
|
lisp/org-colview.elc: lisp/org.el
|
|
|
|
lisp/org-colview-xemacs.elc: lisp/org.el
|
|
|
|
lisp/org-compat.elc: lisp/org-macs.el
|
2009-09-16 13:03:35 +00:00
|
|
|
lisp/org-crypt.elc: lisp/org-crypt.el lisp/org.el
|
2010-01-02 07:24:54 +00:00
|
|
|
lisp/org-ctags.elc: lisp/org.el
|
2009-11-08 15:00:39 +00:00
|
|
|
lisp/org-datetree.elc: lisp/org.el
|
2009-12-03 15:50:18 +00:00
|
|
|
lisp/org-docview.elc: lisp/org.el
|
2010-06-30 18:56:11 +00:00
|
|
|
lisp/org-entities.elc:
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-exp.elc: lisp/org.el lisp/org-agenda.el
|
2009-06-17 16:16:26 +00:00
|
|
|
lisp/org-exp-blocks.elc: lisp/org.el
|
2009-12-11 07:53:29 +00:00
|
|
|
lisp/org-latex.elc: lisp/org.el lisp/org-exp.el lisp/org-beamer.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-docbook.elc: lisp/org.el lisp/org-exp.el
|
|
|
|
lisp/org-faces.elc: lisp/org-macs.el lisp/org-compat.el
|
|
|
|
lisp/org-feed.elc: lisp/org.el
|
|
|
|
lisp/org-footnotes.elc: lisp/org-macs.el lisp/org-compat.el
|
2009-10-27 15:28:03 +00:00
|
|
|
lisp/org-freemind.elc: lisp/org.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-gnus.elc: lisp/org.el
|
|
|
|
lisp/org-html.elc: lisp/org-exp.el
|
2009-10-27 15:28:03 +00:00
|
|
|
lisp/org-habit.elc: lisp/org.el lisp/org-agenda.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-icalendar.elc: lisp/org-exp.el
|
|
|
|
lisp/org-id.elc: lisp/org.el
|
2009-06-30 05:24:57 +00:00
|
|
|
lisp/org-indent.elc: lisp/org.el lisp/org-macs.el lisp/org-compat.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-info.elc: lisp/org.el
|
2009-03-31 18:12:37 +00:00
|
|
|
lisp/org-inlinetask.elc:
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-irc.elc: lisp/org.el
|
|
|
|
lisp/org-jsinfo.elc: lisp/org.el lisp/org-exp.el
|
|
|
|
lisp/org-list.elc: lisp/org-macs.el lisp/org-compat.el
|
2011-12-04 21:00:57 +00:00
|
|
|
lisp/org-lparse.elc: lisp/org-exp.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-mac-message.elc: lisp/org.el
|
2008-04-14 12:59:37 +00:00
|
|
|
lisp/org-macs.elc:
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-mew.elc: lisp/org.el
|
|
|
|
lisp/org-mhe.elc: lisp/org.el
|
2010-06-30 18:56:11 +00:00
|
|
|
lisp/org-mks.elc:
|
2009-09-15 18:06:44 +00:00
|
|
|
lisp/org-mobile.elc: lisp/org.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-mouse.elc: lisp/org.el
|
2011-12-04 21:00:57 +00:00
|
|
|
lisp/org-odt.elc: lisp/org-lparse.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-plot.elc: lisp/org.el lisp/org-exp.el lisp/org-table.el
|
2008-04-14 12:59:37 +00:00
|
|
|
lisp/org-publish.elc:
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-protocol.elc: lisp/org.el
|
|
|
|
lisp/org-remember.elc: lisp/org.el
|
|
|
|
lisp/org-rmail.elc: lisp/org.el
|
2011-03-01 06:24:14 +00:00
|
|
|
lisp/org-special-blocks.elc: lisp/org-compat.el
|
2009-06-07 14:27:07 +00:00
|
|
|
lisp/org-src.elc: lisp/org-macs.el lisp/org-compat.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-table.elc: lisp/org.el
|
2010-06-08 07:37:23 +00:00
|
|
|
lisp/org-taskjuggler.elc: lisp/org.el lisp/org-exp.el
|
2009-04-09 15:25:44 +00:00
|
|
|
lisp/org-timer.elc: lisp/org.el
|
|
|
|
lisp/org-vm.elc: lisp/org.el
|
|
|
|
lisp/org-w3m.elc: lisp/org.el
|
|
|
|
lisp/org-wl.elc: lisp/org.el
|
2010-08-26 15:36:08 +00:00
|
|
|
lisp/org-xoxo.elc: lisp/org-exp.el
|
2011-07-05 09:27:13 +00:00
|
|
|
|
|
|
|
# Describe valid make targets for org-mode.
|
|
|
|
targets help:
|
|
|
|
@echo "make - compile Org ELisp files"
|
|
|
|
@echo "make clean - clean Elisp and documentation files"
|
|
|
|
@echo "make all - compile Org ELisp files and documentation"
|
|
|
|
@echo ""
|
|
|
|
@echo "make doc - make all documentation"
|
|
|
|
@echo "make info - make Info documentation"
|
|
|
|
@echo "make html - make HTML documentation"
|
|
|
|
@echo "make pdf - make pdf documentation"
|
|
|
|
@echo "make card - make refcards documentation"
|
|
|
|
@echo ""
|
|
|
|
@echo "make install - install Org"
|
|
|
|
@echo "make install-lisp - install Org ELisp files"
|
|
|
|
@echo "make install-info - install Org Info file"
|