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
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
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
3d28682874
default.mk: Fix reference to org-e-*.
2013-02-22 14:33:41 +01:00
237e841c52
Merge branch 'maint'
2013-02-09 08:32:12 +01:00
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
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
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
98cd4687a2
Update copyright years.
...
Happy new year!
2013-01-01 16:04:24 +01:00
b8662049e7
Merge branch 'maint'
2012-12-14 00:02:30 +01:00
c4bf1eeed4
Remove gplmanual.pl as we are not allowed to dual-license the Org manual.
2012-12-14 00:02:19 +01:00
2e94271bd1
Merge branch 'maint'
2012-10-03 12:15:35 +02:00
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
5c9006de49
Revert "Fix previous commit."
...
This reverts commit 5f9177ad3a
2012-10-03 12:13:33 +02:00
7dd847c685
Revert "mk/default.mk: Restore datadir."
...
This reverts commit ded873cb8f
2012-10-03 12:12:59 +02:00
34681fb135
Merge branch 'maint'
2012-10-03 12:05:03 +02:00
ded873cb8f
mk/default.mk: Restore datadir.
2012-10-03 12:04:51 +02:00
30235e6773
Merge branch 'maint'
2012-10-02 17:38:56 +02:00
5f9177ad3a
Fix previous commit.
2012-10-02 17:38:41 +02:00
410c5cb9e4
Merge branch 'maint'
2012-10-02 14:48:13 +02:00
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
4f0b3bfe0c
Merge branch 'maint'
2012-10-02 13:07:09 +02:00
5dcca72011
Use org-loaddefs.el instead of org-install.el.
2012-10-02 11:30:24 +02:00
e4c31cf98b
Use generated-autoload-file: "org-loaddefs.el" as a local variable.
2012-10-02 08:50:46 +02:00
7f74da3f22
Merge branch 'maint'
2012-10-01 07:53:01 +02:00
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
281595849b
Merge branch 'maint'
2012-09-29 11:50:27 +02:00
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
4962980938
Merge branch 'maint'
2012-09-29 11:10:18 +02:00
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
16441f6f40
Merge branch 'maint'
2012-09-28 16:51:34 +02:00
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
2bd95b6bfc
Merge branch 'maint'
2012-09-28 10:05:20 +02:00
c173b19b05
mk/server.mk: Use /elpa/ instead of /pkg/daily/
2012-09-28 10:05:10 +02:00
4fb4494e18
Merge branch 'maint'
2012-09-27 20:36:50 +02:00
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
0992544864
Merge branch 'maint'
2012-09-26 23:44:31 +02:00
fdc795bb09
mk/server.mk: Fix echo usage for the orgmode.org server
2012-09-26 23:44:25 +02:00
4fd173a187
Merge branch 'maint'
2012-09-26 18:27:45 +02:00
a1e645b2be
mk/server.mk: Let's use /pkg/daily/ for now
2012-09-26 18:27:27 +02:00
5dc2f6ab37
Merge branch 'maint'
2012-09-26 17:50:36 +02:00
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
6781b196aa
Merge branch 'maint'
2012-09-25 03:45:27 +02:00
eacf3126b7
mk/server.mk: Add COPYING to ELPA archives
2012-09-25 03:45:21 +02:00
bf072bd647
Merge branch 'maint'
2012-09-24 19:15:59 +02:00
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
8c36e4d00a
Merge branch 'maint'
2012-09-22 10:33:27 +02:00
51955a248d
Small fixes to the README files and to mk/server.mk
2012-09-22 10:33:12 +02:00
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
f14f829652
Merge branch 'maint'
2012-09-20 22:37:27 +02:00
Achim Gratz
Bastien Guerry
Nicolas Goaziou