ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,850 Commits 2 Branches 439 Tags 111 MiB
Commit Graph

173 Commits

Author SHA1 Message Date
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