Commit Graph

108 Commits

Author SHA1 Message Date
Achim Gratz aaee171921 Merge branch 'maint' 2015-02-03 09:23:58 +01:00
Achim Gratz 5542a4fd95 mk/server.mk: correct file globs for contrib/lisp 2015-02-03 09:23:20 +01:00
Achim Gratz 2f8067c915 Merge branch 'maint' 2014-09-10 10:51:02 +02:00
Achim Gratz d4a7ba2a96 mk/org-fixup.el: Do not use toggle-read-only
* mk/org-fixup.el (org-make-org-version, org-make-org-loaddefs,
  org-make-local-mk, org-make-letterformat): Do not use
  `toggle-read-only' as it has been obsoleted in 24.4 and the
  replacement read-only-mode should not be used from Lisp in most
  cases. Bind `inhibit-read-only' to t instead.
2014-09-10 10:50:05 +02:00
Achim Gratz 3f67b185cc mk/targets.mk: consider only release_* tags for constructing version strings
Cherry-picked from d1692902f1, which was dropped by force-pushing 79873390ed.
2014-07-29 22:11:28 +02:00
Achim Gratz bd8bad281a Merge branch 'maint' 2014-07-02 20:33:04 +02:00
Achim Gratz d1692902f1 mk/targets.mk: consider only release_* tags for constructing version strings 2014-07-02 20:32:24 +02:00
Achim Gratz 45f840a6f1 Merge branch 'maint' 2014-06-02 20:10:48 +02:00
Achim Gratz 045fd4ed62 mk/server.mk: add testing/ directory to distribution tarball
* mk/server.mk (ORGFULL): Add testing/ directory to distribution
  tarball.
2014-06-02 20:09:50 +02:00
Bastien Guerry f8e1745440 Merge branch 'maint'
Conflicts:
	contrib/lisp/org-favtable.el
2014-01-07 14:19:03 +01:00
Bastien Guerry 7d9a883b50 Update copyright years again.
Hint: copyright years are all updated in Emacs.
2014-01-07 14:18:17 +01:00
Bastien Guerry c41f5075ac Merge branch 'maint'
Conflicts:
	contrib/lisp/org-favtable.el
2014-01-05 06:36:11 +01:00
Bastien Guerry 0beda99171 Revert "Update copyright years."
This reverts commit 21105594fc.
2014-01-05 06:28:07 +01:00
Bastien Guerry 096ff7e078 Merge branch 'maint'
Conflicts:
	contrib/lisp/org-favtable.el
2014-01-04 18:58:12 +01:00
Bastien Guerry 21105594fc Update copyright years. 2014-01-04 18:56:11 +01:00
Bastien Guerry bb591bf0a3 Merge branch 'maint' 2014-01-04 18:16:02 +01:00
Bastien Guerry 8044cfed1c Revert "* server.mk (elpaplus-dirty elpaplus-up): Include htmlize.el."
This reverts commit fc5cf0d922.
2014-01-04 18:15:42 +01:00
Bastien Guerry 3b3e116376 Merge branch 'maint' 2013-12-22 09:42:02 +01:00
Bastien Guerry fc5cf0d922 * server.mk (elpaplus-dirty elpaplus-up): Include htmlize.el.
* server.mk (elpaplus-dirty elpaplus-up): Include htmlize.el
in org-plus-contrib ELPA package.

Thanks to Francesco Pizzolante for reporting this.
2013-12-22 09:41:50 +01:00
Achim Gratz 01b42f91de Makefile: optionally switch to a specific git branch
* 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.
2013-12-14 10:35:13 +01:00
Achim Gratz 49c128c300 Makefile: some refactoring for "make vanilla"
* 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´.
2013-12-14 10:27:31 +01:00
schulte.eric@gmail.com 04eb8d7d85 make vanilla: run Emacs -Q with *this* Org loaded
This change should make it easier to run interactive tests or to
  reproduce problems with the current Org-mode loaded and without any
  personal config.
2013-12-13 16:26:13 -07:00
Eric Schulte b319475a86 fix tests with the renamed ob-shell.el
Note, users may have to edit their local.mk files to change the
  value of BTEST_OB_LANGUAGES to remove sh and include shell.
2013-12-13 10:03:05 -07:00
Achim Gratz 61e8f03364 mk/default.mk, testing/org-test.el: set org-startup-folded to nil
* mk/default.mk (BATCH), testing/org-test.el: Set `org-startup-folded´
  to nil to avoid lots of "OVERVIEW" messages cluttering the output.
2013-11-30 17:02:46 +01:00
Achim Gratz 1b0fb1a484 testing: allow to select tests
* 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.
2013-11-23 19:29:34 +01:00
Achim Gratz 9b6cff94aa Revert "added Makefile targets to check single tests"
This reverts commit 2c5251f0da.
2013-11-23 19:29:34 +01:00
Bastien Guerry 2829fdad0b Merge branch 'maint' 2013-10-08 08:08:11 +02:00
Bastien Guerry 0eb0e5778b Use bzg@gnu.org instead of bzg AT gnu DOT org 2013-10-08 08:07:21 +02:00
Eric Schulte 2c5251f0da added Makefile targets to check single tests
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.
2013-10-01 06:19:26 -06:00
Carsten Dominik 4f77594dca Add --expand option to texi2pdf
This improves macro expansion, because TeX does cause problems with
whitespace when a macro expansion inserts an item.
2013-09-30 08:36:16 +02:00
Achim Gratz 6e6b1044dc Makefile: add perl to babel languages for testing
* mk/default.mk (BTEST_OB_LANGUAGES): Add perl to Babel languages that
  should be tested by default.
2013-05-19 21:08:04 +02:00
Achim Gratz 6de09e2d3e mk/server.mk: add babel and exporter files in contrib to elpaplus
* mk/server.mk (elpaplus-dirty elpaplus-up): Add babel and exporter
  files in contrib by extending ORG_ADD_CONTRIB with their
  prefix-globs.
2013-05-06 21:06:05 +02:00
Bastien Guerry e784a6e8f4 mk/server.mk: Don't use non-existent file AUTHORS 2013-04-18 18:08:13 +02:00
Bastien Guerry fa9a9ac7a7 mk/server.mk: Fix doc-up
Also upload org.pdf and orgguide.pdf
2013-03-25 05:41:58 +01:00
Achim Gratz 65cde867c6 prevent double quoting for $(datadir)
* mk/default.mk (MAKE_ORG_VERSION): Keep $(datadir) outside quotes,
  should already be shell-quoted.

Reported by Bernd Haug.
2013-03-18 08:14:25 +01:00
Achim Gratz 798a7de9b8 disable VC for batch evaluation
* mk/default.mk: Disable VC during batch evaluation.

This speeds up file handling, especially on Windows where Git can be
very slow.
2013-03-18 08:11:46 +01:00
Bastien Guerry c4a69a3b4c mk/server.mk: Add the AUTHORS file to ORGFULL
We do not add this file to the ELPA-with-contrib distribution
since the list of AUTHORS includes authors of contributed files.
2013-02-26 11:31:06 +01:00
Bastien Guerry 3d28682874 default.mk: Fix reference to org-e-*. 2013-02-22 14:33:41 +01:00
Achim Gratz 237e841c52 Merge branch 'maint' 2013-02-09 08:32:12 +01:00
Achim Gratz ac8522a1ad Remove additions from contrib/ before moving HEAD
* 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.
2013-02-09 08:31:44 +01:00
Nicolas Goaziou 8dd2bfc291 Move new export framework files into core
* contrib/README: Remove references to new export framework.
* contrib/lisp/org-e-ascii.el: Removed file.
* contrib/lisp/org-e-beamer.el: Removed file.
* contrib/lisp/org-e-confluence.el: Removed file.
* contrib/lisp/org-e-groff.el: Removed file.
* contrib/lisp/org-e-html.el: Removed file.
* contrib/lisp/org-e-icalendar.el: Removed file.
* contrib/lisp/org-e-latex.el: Removed file.
* contrib/lisp/org-e-man.el: Removed file.
* contrib/lisp/org-e-odt.el: Removed file.
* contrib/lisp/org-e-publish.el: Removed file.
* contrib/lisp/org-e-texinfo.el: Removed file.
* contrib/lisp/org-export.el: Removed file.
* contrib/lisp/org-koma-letter.el: Removed file.
* contrib/lisp/org-md.el: Removed file.
* contrib/lisp/ox-confluence.el: New file.
* contrib/lisp/ox-groff.el: New file.
* contrib/lisp/ox-koma-letter.el: New file.
* lisp/ox-ascii.el: New file.
* lisp/ox-beamer.el: New file.
* lisp/ox-html.el: New file.
* lisp/ox-icalendar.el: New file.
* lisp/ox-jsinfo.el: New file.
* lisp/ox-latex.el: New file.
* lisp/ox-man.el: New file.
* lisp/ox-md.el: New file.
* lisp/ox-odt.el: New file.
* lisp/ox-publish.el: New file.
* lisp/ox-texinfo.el: New file.
* lisp/ox.el: New file.
* mk/org-fixup.el (org-make-org-loaddefs): Install new export
  framework and back-end files.
* testing/lisp/test-org-export.el: Removed file.
* testing/lisp/test-ox.el: New file.
2013-02-06 23:06:30 +01:00
Bastien Guerry 60b23bdeac Merge branch 'maint'
Conflicts:
	contrib/lisp/htmlize.el
	etc/schema/od-manifest-schema-v1.2-os.rnc
	etc/schema/od-schema-v1.2-os.rnc
	lisp/org-exp-blocks.el
2013-01-01 16:06:17 +01:00
Bastien Guerry 98cd4687a2 Update copyright years.
Happy new year!
2013-01-01 16:04:24 +01:00
Bastien Guerry b8662049e7 Merge branch 'maint' 2012-12-14 00:02:30 +01:00
Bastien Guerry c4bf1eeed4 Remove gplmanual.pl as we are not allowed to dual-license the Org manual. 2012-12-14 00:02:19 +01:00
Bastien Guerry 2e94271bd1 Merge branch 'maint' 2012-10-03 12:15:35 +02:00
Bastien Guerry 21478e1733 Revert "org-odt.el (and org-e-odt.el): Simplify the way style/schema files are found"
This reverts commit d042e3add1.
2012-10-03 12:13:47 +02:00
Bastien Guerry 5c9006de49 Revert "Fix previous commit."
This reverts commit 5f9177ad3a.
2012-10-03 12:13:33 +02:00
Bastien Guerry 7dd847c685 Revert "mk/default.mk: Restore datadir."
This reverts commit ded873cb8f.
2012-10-03 12:12:59 +02:00
Bastien Guerry 34681fb135 Merge branch 'maint' 2012-10-03 12:05:03 +02:00