Commit Graph

178 Commits

Author SHA1 Message Date
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
Bastien Guerry ded873cb8f mk/default.mk: Restore datadir. 2012-10-03 12:04:51 +02:00
Bastien Guerry 30235e6773 Merge branch 'maint' 2012-10-02 17:38:56 +02:00
Bastien Guerry 5f9177ad3a Fix previous commit. 2012-10-02 17:38:41 +02:00
Bastien Guerry 410c5cb9e4 Merge branch 'maint' 2012-10-02 14:48:13 +02:00
Bastien Guerry d042e3add1 org-odt.el (and org-e-odt.el): Simplify the way style/schema files are found
* org-odt.el (org-odt-lib-dir, org-odt-data-dir)
(org-odt-schema-dir-list, org-odt-styles-dir-list): Delete.
(org-export-odt-schema-dir, org-odt-styles-dir): Infer the
correct directories without requiring other variables.

* org-fixup.el (org-make-org-version, org-make-autoloads):
Don't define `org-odt-data-dir' in org-version.el.

* contrib/lisp/org-e-odt.el (org-e-odt-lib-dir, org-e-odt-data-dir)
(org-e-odt-schema-dir-list, org-e-odt-styles-dir-list): Delete.
(org-e-odt-schema-dir, org-e-odt-styles-dir): Infer the
correct directories without requiring other variables.
2012-10-02 14:47:04 +02:00
Bastien Guerry 4f0b3bfe0c Merge branch 'maint' 2012-10-02 13:07:09 +02:00
Bastien Guerry 5dcca72011 Use org-loaddefs.el instead of org-install.el. 2012-10-02 11:30:24 +02:00
Bastien Guerry e4c31cf98b Use generated-autoload-file: "org-loaddefs.el" as a local variable. 2012-10-02 08:50:46 +02:00
Bastien Guerry 7f74da3f22 Merge branch 'maint' 2012-10-01 07:53:01 +02:00
Bastien Guerry 1df9907b50 org-fixup.el: Use defvar instead of defconst to define the `org-odt-data-dir' autoload
* 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.
2012-10-01 07:52:50 +02:00
Achim Gratz 281595849b Merge branch 'maint' 2012-09-29 11:50:27 +02:00
Achim Gratz ba9606e6e1 Makefile: do not attempt to show Org version from Emacs' perspective
* 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).
2012-09-29 11:49:58 +02:00
Bastien Guerry 4962980938 Merge branch 'maint' 2012-09-29 11:10:18 +02:00
Achim Gratz e6228c448e Makefile: implement target config-version
* 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´.
2012-09-29 10:47:40 +02:00
Bastien Guerry 16441f6f40 Merge branch 'maint' 2012-09-28 16:51:34 +02:00
Bastien Guerry b56acb69ff org-fixup.el (org-make-local-mk): Fix typo in comment
* org-fixup.el (org-make-local-mk): Fix typo in comment.
2012-09-28 16:40:00 +02:00
Bastien Guerry 2bd95b6bfc Merge branch 'maint' 2012-09-28 10:05:20 +02:00
Bastien Guerry c173b19b05 mk/server.mk: Use /elpa/ instead of /pkg/daily/ 2012-09-28 10:05:10 +02:00
Achim Gratz 4fb4494e18 Merge branch 'maint' 2012-09-27 20:36:50 +02:00
Achim Gratz 418ec0f5e7 mk/server.mk: (hopefully) correct generation of the package description vector
* 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.
2012-09-27 20:36:08 +02:00
Bastien Guerry 0992544864 Merge branch 'maint' 2012-09-26 23:44:31 +02:00
Bastien Guerry fdc795bb09 mk/server.mk: Fix echo usage for the orgmode.org server 2012-09-26 23:44:25 +02:00
Bastien Guerry 4fd173a187 Merge branch 'maint' 2012-09-26 18:27:45 +02:00
Bastien Guerry a1e645b2be mk/server.mk: Let's use /pkg/daily/ for now 2012-09-26 18:27:27 +02:00
Bastien Guerry 5dc2f6ab37 Merge branch 'maint' 2012-09-26 17:50:36 +02:00
Bastien Guerry 0955505324 mk/server.mk: Add an "archive-contents" target
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.)
2012-09-26 17:50:20 +02:00
Bastien Guerry 6781b196aa Merge branch 'maint' 2012-09-25 03:45:27 +02:00
Bastien Guerry eacf3126b7 mk/server.mk: Add COPYING to ELPA archives 2012-09-25 03:45:21 +02:00
Bastien Guerry bf072bd647 Merge branch 'maint' 2012-09-24 19:15:59 +02:00
Bastien Guerry 9aff6ffe8a Add COPYING and fix other related issues.
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).
2012-09-24 19:15:42 +02:00
Bastien Guerry 8c36e4d00a Merge branch 'maint' 2012-09-22 10:33:27 +02:00
Bastien Guerry 51955a248d Small fixes to the README files and to mk/server.mk 2012-09-22 10:33:12 +02:00
Bastien Guerry ae57da7d80 Reorder the README files.
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.
2012-09-22 10:33:08 +02:00
Achim Gratz f14f829652 Merge branch 'maint' 2012-09-20 22:37:27 +02:00
Achim Gratz 27527b670e Makefile: add contrib files while generating autoloads
* 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.
2012-09-20 22:35:35 +02:00
Achim Gratz 2e14421acb Merge branch 'maint' 2012-09-20 20:56:15 +02:00
Achim Gratz ac9ed2a95d mk/server.mk: rename orgplus to org-plus-contrib
* mk/server.mk: Rename EPLA package from orgplus to org-plus-contrib.
2012-09-20 20:55:47 +02:00
Achim Gratz 18069f578d Merge branch 'maint' 2012-09-18 21:37:07 +02:00
Achim Gratz 23531cce62 do not use an explicit nil argument for package requirements
* mk/server.mk: Do not use an explicit nil argument for package
  requirements.

Marmalade chokes on this, thanks to E. Schulte for the report.
2012-09-18 21:36:44 +02:00
Achim Gratz 6f2b04f6da Revert "remove explicit nil requirements from elpa packages"
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.
2012-09-18 21:28:27 +02:00
Eric Schulte ef125abe61 remove explicit nil requirements from elpa packages
Some ELPA servers choke on the explicit nil.

* mk/server.mk (elpa-dirty): Remove explicit nil requirements from elpa
  packages.
2012-09-15 14:01:54 -06:00
Achim Gratz 4357cd0fcd Merge branch 'maint' 2012-09-15 20:07:12 +02:00
Achim Gratz f1f1fc8d48 mk/server.mk: fix previous commit 2012-09-15 20:06:53 +02:00
Achim Gratz 950789d26a mk/server.mk: orgplus must be the package name for package manager to recognize it
* 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.
2012-09-15 19:52:18 +02:00
Achim Gratz 5a122cf7aa Merge branch 'maint' 2012-09-15 19:20:56 +02:00
Achim Gratz f6f9d3a5cd mk/server.mk: implement ELPA archive including all contrib files - "orgplus"
* 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.
2012-09-15 18:54:32 +02:00
Achim Gratz 400bb88f9c Makefile: add contrib already for autoloads so that uncompiled can have contrib/, too
* 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.
2012-09-15 18:54:29 +02:00
Bastien Guerry f7f0445cc1 eldo.el: Minor tweaks 2012-09-10 09:21:14 +02:00
Bastien Guerry 069b5bab38 mk/eldo.el: Small fix 2012-09-03 13:00:13 +02:00
Bastien Guerry 432c6ee7c9 mk/make_emacs_changelog: Small fix 2012-09-03 12:47:02 +02:00
Achim Gratz e20cb6f92b Makefile: show ORG_MAKE_DOC in `config´
* mk/targets.mk: Show ORG_MAKE_DOC in `config´.

* .gitignore: Add doc/org-version.inc.
2012-08-27 19:19:42 +02:00
Achim Gratz 7fbb387f34 server.mk: shrink ELPA archive, correct documentation dependencies
* 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.
2012-08-27 19:19:42 +02:00
Achim Gratz fb2af507f0 server.mk: do not prevent proper customization
* mk/server.mk: Do not prevent proper customization, so do not
  overwrite existing variables.
2012-08-26 20:44:24 +02:00
Bastien Guerry 4de217ab2f server.mk (elpa): Do not make PDF and card documentation for the ELPA archive
Info is enough.
2012-08-26 20:29:06 +02:00
Bastien Guerry effa8d07b1 mk/server.mk: More compact help. 2012-08-26 20:23:11 +02:00
Bastien Guerry 72a2df1aee mk/server.mk: Set SERVROOT and SERVERMK and add more help 2012-08-26 20:20:34 +02:00
Achim Gratz fe599cfe88 Makefile: fix location of default.mk in org-fixup.el
* mk/org-fixup.el: Fix location of default.mk, now in mk/default.mk.
2012-08-26 19:29:45 +02:00
Achim Gratz bf352eceda Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout
* 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.
2012-08-26 15:27:19 +02:00