* mk/default.mk (GIT_BRANCH): New configuration variable to specify a
Git branch that is checked out before updating.
* mk/targets.mk (up0 up1 up2): Check out the branch in GIT_BRANCH
before doing an update. Stays on the current branch if GIT_BRANCH
is undefined or empty.
* mk/default.mk (BTEST_INIT): Isolate load-path manipulation into
BTEST_LOAD and do whitespace cleanup. (EMACSQ): New variable for an
Emacs with no configuration files. (NOBATCH, BATCH): Use EMACSQ.
* mk/targets.mk (vanilla): Do not echo command line and explicitly say
that we don't get a return value. (CONF_CALL): Add NOBATCH to the
list of things shown in `make config-all´.
* mk/default.mk: Add default for new variable BTEST_RE to select all
tests. (BTEST_OB_LANGUAGES): Remove sh (always needed, as
emacs-lisp) and add comment for ruby. (BTEST): Use BTEST_RE to
select tests from the test suite. Reorganize pre-loading of Org,
Babel, Ox and babel languages into a known clean environment.
* mk/targets.mk (CONF_TEST): Add BTEST_RE to the output of
config-test.
* testing/org-batch-test-init.el: New file. Remove all traces of any
Org built into Emacs or otherwise present in the environment so it
can not be picked up spuriously during testing or conceal errors in
the Org version under test.
* testing/org-test.el (org-test-run-batch-tests): Showtest selection
in messages. (org-test-run-all-tests): Update ID locations.
e.g., to run a single test without re-compiling Org-mode use the
following.
make single-test-dirty TEST=test-ob/org-babel-remove-result--results-code
This should aid in isolating errors with git bisect.
* mk/targets.mk (up0): Explicitly remove additions from contrib/
before moving HEAD via git since the files might be renamed, deleted
or moved by checking out a new version.
Thanks to Suvayu Ali for pointing to this problem. The user still has
to remember to do this when moving HEAD manually, though.
* org-fixup.el (org-make-org-version): Use defvar instead of
defconst to define the `org-odt-data-dir' autoload.
Thanks to Glenn Morris for pointing at this.
* mk/targets.mk: Remove invocation of $(SHOWVER). Emacs does some
stupid ioctl when org-fixup gets invoked and messes up the output.
* mk/default.mk: Remove definition of $(SHOWVER).
* mk/targets.mk: Implement target `config-version´ to show the version
of Org from both make's and Emacs' perspective. Run that target at
the end of all `config-*´ targets.
* mk/default.mk: Add SHOWVER with the appropriate invocation of emacs
to output the Org version.
* Makefile: Document new target `config-version´ in `helpall´.
* mk/server.mk: Correct generation of the package description vector.
Use empty list instead of nil and add the package type "tar". With
these changes a local copy of the package directory is recognized
correctly. Add local file variable to the package description files
so that the byte compiler does not try to compile them.
Based on the proposal by Eric Schulte on the mailing list.
Also use the /var/www/orgmode.org/elpa/ directory as the
place where to store ELPA archives (whether they are further
downloaded to the elpa.gnu.org server or not.)
Mention COPYING in READMEs.
Fix the header of ob-fortran.el (see this fix in Emacs trunk:
http://lists.gnu.org/archive/html/emacs-diffs/2012-09/msg00365.html)
Specify that org-colview-xemacs.el is *not* part of Emacs.
Specify that org-element.el is part of Emacs (prepare the sync.)
Add COPYING in the release (mk/server.mk).
Delete README_DIST.
Use README as the readme file for the distribution.
Use README_ELPA as the readme file for ELPA packages.
New README_git file to describe readme files in git.
Update mk/server.mk to include the correct READMEs.
Update mk/set-version.pl to update README.
Add some more help info in mk/server.mk.
* mk/targets.mk: Move copy of contrib additions to lisp/Makefile.
* lisp/Makefile: Let `autoloads´ in lisp re-generate contrib files by
depending on new target `addcontrib´ in the right order.
This reverts commit ef125abe61.
This was committed to the wrong branch and deletes a variable that
should be kept. Will be re-done differently from maint.
* mk/server.mk: Rename org-pkg.el to orgplus-pkg.el, rename the
package to orgplus also. The package manager will otherwise not
recognize the package. This means we will need to educate users not
to install both packages at the same time or try to introduce this
dependency in a different way.
* mk/server.mk: Add new targets elpaplus, eplaplus-up, eplaplus-dirty
and upload-eplaplus as copy of respective epla targets, but with all
files from contrib added.
* .gitignore: Add orgplus EPLA archive to the patterns.
* mk/targets.mk: Add contrib files already for autoloads so that
uncompiled can have contrib/lisp/ added, too. Remove all files from
contrib/lisp/ that are found in lisp/ for `cleanlisp´ so that
switching between different contrib configurations becomes easier.
Remove variable ORG_TO_LISP since it is not needed anymore.
* mk/server.mk: Drop some documentation files from ELPA archive.
Correct dependencies for documentation, ORG_MAKE_DOC can not be used
as a per-target definition because it has been expanded before.
Directly give the dependencies instead.
* Makefile: Include default.mk and targets.mk from mk/ where they've
been moved to.
* README_maintainer: Rename utils to make throughout.
* doc/Makefile: Rename utils to make throughout.
* doc/org.texi: Remove reference to utils/, x11idle.c is now in
contrib/scripts.
* mk/make_emacs_changelog: Add mk/ to list of directories not to be
reported in Emacs' ChangeLog. Also retain utils/ and re-add
UTILITIES; add a comment explaining why these need to stay.
* mk/default.mk: Rename utils to make throughout. Include version.mk
from mk/ where it's been moved to.
* mk/targets.mk: Rename utils to make throughout.
* mk/server.mk: Rename utils to make throughout. Only put those files
from mk/ into the archives that are needed outside the server:
default.mk targets.mk version.mk and org-fixup.el.
* lisp/org-compat.el: Rename utils to make throughout.
* .gitignore: Rename utils to make throughout.
Achim Gratz
Bastien Guerry
schulte.eric@gmail.com
Carsten Dominik
Nicolas Goaziou
Eric Schulte