Commit Graph

148 Commits

Author SHA1 Message Date
Bastien 4779a0df5d mk/server.mk: Resurrect a simplified version 2021-09-29 14:54:30 +02:00
Bastien 8db21e6cb3 Remove and update Makefiles as contrib/ has been moved out 2021-09-29 10:08:20 +02:00
Bastien 20c3b0e436 mk/server.mk: Also copy orgguide.html
* mk/server.mk (doc-up): Also copy orgguide.html.
2021-09-27 21:59:23 +02:00
Bastien 98fd6d5fd5 Remove references to deleted packages
* testing/lisp/test-ob-vala.el: Delete file.

* mk/default.mk (BTEST_OB_LANGUAGES):
* lisp/ox-man.el (org-man-source-highlight-langs):
* lisp/org.el (org-babel-load-languages): Remove references to
deleted packages.
2021-09-26 14:13:28 +02:00
Bastien 2311677880 mk/server.mk: Use a new path
This prepares the migration out of the current orgmode.org server.
2021-09-25 10:57:05 +02:00
Nicholas Vollmer 9a4a24a949 mk/targets.mk: Fix ORGVERSION in tag-less repos
* mk/targets.mk (ORGVERSION, GITVERSION): trim "-dev" suffix from ORGVERSION.

61336f80 uses org.el's Version metadata to generate ORGVERSION when
the source repository has no tags.
This can result in an org-version of "Major.Minor-dev".
The "-dev" suffix is not recognized by `version-to-list' as a valid
version syntax because it is not part of `version-regexp-alist'.
2021-09-23 21:40:50 -04:00
Greg Minshall 69a5591ad3 Build process: Do not attempt to clean =contrib/=
mk/targets.mk: Remove "contrib" from 'CLEANDIRS'.
2021-06-26 19:13:58 +02:00
Bastien 3c241ab5fd Merge branch 'maint' 2021-05-19 14:27:24 +02:00
Bastien 6524301288 mk/server.mk: Complete and fix 9802877fb 2021-05-19 14:26:26 +02:00
Bastien Guerry 064a681303 mk/*pl: Remove type="text/javascript" as it is unnecessary
* mk/mansplit.pl: Remove type="text/javascript" as it is
unnecessary.

* mk/guidesplit.pl: Ditto.

Reported-by: TEC <tecosaur@gmail.com>
Link: https://orgmode.org/list/874kkkxqma.fsf@gmail.com/
2021-04-30 10:17:06 +02:00
Bastien c5538d58c4 mk/default.mk: Use Emacs manual css for Org online manual
Thanks to TEC <tecosaur@gmail.com> who suggested this.
2021-03-24 09:06:09 +01:00
Stefan Kangas 8cc992f7b2 Prefer HTTPS to HTTP for links to gnu.org 2021-03-21 14:29:13 -04:00
Kyle Meyer 61336f80dc mk/targets.mk: Add version fallback for tag-less repos
* mk/targets.mk (ORGVERSION, GITVERSION): Get version from lisp/org.el
header if it can't be retrieved from git-describe.

As of elpa.git's ee03829f90 (Finalize the new master branch,
2020-12-14), org-release and org-git-version are empty strings in
https://elpa.gnu.org/packages/org-*.tar files.  This is because the
new setup executes `make autoloads info' in an elpa.git worktree with
an Org branch checked out, but elpa.git of course doesn't have Org's
release tags.

Maintaining the org.el version header has been a point of contention
in the past [1], but the header has been there for a while now.  Use
it to avoid the above elpa.git issue.  In the case of the master
branch, the org-release value generated in a tag-less repo will have a
different version than the one from a regular repo because org.el's
version header has a "-dev" suffix, but that's still better than an
empty version.

[1] For example: https://orgmode.org/list/87zj1uhix6.fsf@gmx.us/

Reported-by: Pierre Langlois <pierre.langlois@gmx.com>
Ref: https://orgmode.org/list/87y2hi9qev.fsf@gmx.com
2021-02-05 01:20:09 -05:00
Stefan Kangas a50a42ceae Use lexical-binding cookie in some trivial files
* mk/org-fixup.el (org-make-org-version): Add lexical-binding cookie
to autogenerated files.
* lisp/org-install.el: Use lexical-binding.
2021-01-24 22:36:30 -05:00
Jonas Bernoulli 71604cbc2d Fix typos 2020-05-13 23:27:49 -04:00
Bastien fcf018a2c4 Delete mk/eldo.el
This has been moved to worg.
2020-02-19 18:32:23 +01:00
Bastien 6381fc96cf Delete obsolete utilities
mk/fake_change_log.pl
mk/git-changelog
mk/make_emacs_changelog
mk/set-version.pl
2020-02-18 23:46:22 +01:00
Bastien 45f6844cdf mk/org-fixup.el: Create autoloads from ol*.el files too
* mk/org-fixup.el (org-make-org-loaddefs): Create autoloads from
ol*.el files too.
2020-02-18 23:46:10 +01:00
Bastien 273a7775cd Various minor fixes
* mk/eldo.el: Update copyright year and fix formatting.

* lisp/ox-man.el: Don't set generated-autoload-file as a
buffer local variable.

* lisp/org-refile.el: Place ;;;###autoload correctly.

* lisp/ob-lilypond.el (org-babel-lilypond-switch-extension):
Formatting fix.
2020-02-18 23:24:09 +01:00
Kyle Meyer 06d9583be0 server.mk: Add orgguide to ELPA package
* mk/server.mk (ORGELPA): Include orgguide.

Reported-by: David Masterson <dsmasterson@outlook.com>
2019-12-15 22:38:25 -05:00
Jonas Bernoulli 5117d8a159 Fix typos 2019-11-16 17:17:36 -05:00
Nicolas Goaziou afd566e633 Add org-guide.org to the build process 2019-03-19 02:25:18 +01:00
Nicolas Goaziou 944c62a794 Include "ol"-prefixed files in the build system
* mk/default.mk (BTEST):
* mk/server.mk (elpaplus-dirty elpaplus-up): Include "ol"-prefixed
  files in the build system.
2019-03-10 18:00:36 +01:00
Nicolas Goaziou de54bbd759 reproducibility: Remove absolute file names in ox-odt.elc
* lisp/ox-odt.el (org-odt-schema-dir-list):
(org-odt-styles-dir-list): Remove `eval-when-compile'.
* mk/org-fixup.el (org-make-org-version): Change signature. Do not
  hard-code ODT style directory at build time.

Fixes: bug#34323
2019-02-09 12:31:37 +01:00
Bastien f584d37a67 Update copyright year 2019-01-01 11:50:56 +01:00
Nicolas Goaziou c87d70439b "make doc" generate "org.texi"
* doc/Makefile (org.texi): New rule.
* mk/org-fixup.el (org-make-manuals): New function.
2018-05-09 02:23:10 +02:00
Tim Landscheidt 38bf7561d0 Remove obsolete mk/list-hooks.pl
* mk/list-hooks.pl: Remove.

The functionality of mk/list-hooks.pl has been implemented by mk/eldo.el.
2018-02-05 15:36:09 +01:00
Tim Landscheidt db6da387ae Remove obsolete mk/pw
* mk/pw: Remove.
2018-02-05 15:33:06 +01:00
Tim Landscheidt b289a65be7 Use https for links to orgmode.org
TINYCHANGE
2018-01-19 18:14:58 +01:00
Nicolas Goaziou af58a6dbf7 Change Org-mode into Org mode
* lisp/ob-core.el (org-babel-result-to-file):
* lisp/ob-picolisp.el:
* lisp/org-agenda.el (org-check-for-org-mode):
(org-search-view):
(org-tags-view):
(org-agenda-cleanup-fancy-diary):
(org-agenda-get-day-entries):
* lisp/org-table.el (orgtbl-mode):
* lisp/org-w3m.el (org-w3m-copy-for-org-mode):
* lisp/org.el (org-modules):
(org-startup-options):
(org-fontify-meta-lines-and-blocks):
* mk/default.mk:
* mk/manfull.pl:
* mk/org-fixup.el (org-make-org-version):
(org-make-org-loaddefs):
* mk/orgcard2txt.pl (rep_esc):
* mk/targets.mk ($(info):
* testing/README:
(Example):
* testing/examples/no-heading.org:
* testing/examples/normal.org: Change Org-mode into Org mode
2017-12-31 15:48:09 +01:00
Nicolas Goaziou 8c1c549376 Add Vala to automated tests
* mk/default.mk (BTEST_OB_LANGUAGES): Add vala.
2017-08-07 11:51:43 +02:00
Bastien 6961a2013f mk/eldo.el: Fix links
* mk/eldo.el (eldo-git-raw-file, eldo-git-search-string): Fix links.
2017-07-03 08:36:19 +02:00
Kyle Meyer a8d007db15 doc/Makefile: Auto-generate org-version.tex for orgcard
* doc/Makefile: Add rule to generate org-version.tex.
* doc/orgcard.tex: Include org-version.tex rather than explicitly
setting version and year.

This removes the only instance in the repo where the Org version is
hardcoded.
2017-06-28 00:54:32 -04:00
Nicolas Goaziou 3961822ee3 server.mk: Properly use local variables in "pkg" files
Also remove reference to deleted file.

Reported-by: Thierry Volpiatto <thierry.volpiatto@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/109833>
2016-10-19 00:29:11 +02:00
Nicolas Goaziou de24694f05 Turn org-mode into Org or Org mode
Use Org or Org mode instead of org-mode or Org-mode according to
"Documentation standards".
2016-08-23 22:13:56 +02:00
Bastien ca842068bb Merge branch 'maint' 2016-02-19 08:39:28 +01:00
Bastien 9259de15ec Fix links in the table of contents of the HTML manual and guide.
* mk/mansplit.pl, mk/guidesplit.pl: Don't prepend "toc_" to TOC links in
the manual and the guide.

Thanks to Yasushi SHOJI for reporting this.
2016-02-19 08:38:15 +01:00
Achim Gratz bb3dca06a5 Makefile: provide CHMOD customization, use it for cleantest
* mk/default.mk (CHMOD): Addtional customization variable for
  chmod (change file permissions).  Explain why we need it for
  git-annex.

* mk/targets.mk (cleantest): If the plain $(RMR) fails, try to make
  directories writable recursively and retry the $(RMR).
  (cleanall, $(CLEANDIRS:%=clean%)): Use "+" instead of ";" to reduce
  the number of execs.
2016-02-14 12:44:56 +01:00
Erik Hetzner 5040718945 org-attach.el: Get attachments from git annex
* org-attach.el (org-attach-use-annex): New function to check if git
  annex should be used.
  (org-attach-annex-get-maybe): New function to get a file from git
  annex if necessary.
  (org-attach-annex-auto-get): New defcustom to determine behavior
  of org-attach-annex-get-maybe.
  (org-attach-open): Automatically get attached files from git annex when
  opening if necessary.
* testing/lisp/test-org-annex.el: New file for testing org-attach. Only
  contains code for testing org-attach with git annex at the moment.
* mk/targets.mk: Fix cleantest target so it can delete git annex repos.
2016-02-06 13:17:33 +01:00
Bastien 102def89d8 mk/server.mk: Add etc/ORG-NEWS to the ELPA package 2015-08-16 15:34:32 +02:00
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