Commit Graph

186 Commits

Author SHA1 Message Date
Ihor Radchenko 7fa1694ec6
mk/targets.mk (.PHONY): Add missing non-file targets 2024-06-20 18:29:44 +02:00
Ihor Radchenko 4c5132b9f1
Fix parallel execution of Makefiles
* lisp/Makefile (.NOTPARALLEL):
* mk/targets.mk (.NOTPARALLEL): Do not fiddle with explicit
.NOTPARALLEL.  Given that we provide correct dependencies, parallel
execution should work, and it does work.
2024-06-20 18:27:04 +02:00
Ihor Radchenko 77403e376a
Revert "mk: Allow parallel execution"
This reverts commit 71fbe92c2e.

Parallel make still does not work.
2024-06-20 18:11:18 +02:00
Ihor Radchenko c37a17ac2a
make up1/up2/update/update2: Clean and generate autoloads before building docs/tests
We need to run clean to get rid of stale .elc files from before git
fetch, and we need to generate autoloads to make things run properly.

Reported-by: Rustom Mody <rustompmody@gmail.com>
Link: https://orgmode.org/list/CAJ+TeofCBfEo-WyGk-n0DATW3QNKjBRayQYbMXrTFAy-TX+ovA@mail.gmail.com
2024-06-18 17:22:53 +02:00
Ihor Radchenko 267c5dae32
mk/default.mk (REPRO): Ensure consistency with make vanilla 2024-06-18 17:00:42 +02:00
Stefan Monnier 3fa18371ee
mk/default.mk (BTEST): Remove `-l cl'
The CL library is deprecated and it's not needed here any more.
I suspect other `-l' could be removed here since `org-test' loads
those libraries anyway.
2024-06-15 16:27:04 +02:00
Ihor Radchenko 13fdbf73ff
mk: Prevent search local id: db when building manuals
* mk/org-fixup.el (org-make-manual):
(org-make-guide):
(org-make-manuals): Disable local ID db when building Org
documentation.  This makes sure that local IDs on the build machine
can never influence the build process.

Reported-by: Eli Zaretskii <eliz@gnu.org>
Link: https://yhetil.org/emacs-devel/868qzd9hjg.fsf@gnu.org/
2024-06-14 11:40:20 +02:00
Ihor Radchenko 04d56f757f
mk/targets.mk (GITVERSION): Fix version string for ELPA build
* mk/targets.mk (GITVERSION): Use previous convention for the Org
version string on ELPA, where Org release tags are not available.
Instead of the new release_N/A-N/A prefix, use the Org version from
org.el file headers, as we did in Org 9.6.

Reported-by: Sharon Kimble <boudiccas@skimble09.plus.com>
Link: https://orgmode.org/list/87ikynyggt.fsf@skimble09.plus.com
2024-06-05 16:51:28 +02:00
Visuwesh 89b0773c3f
ob-calc.el: Add support for tables in Calc source block :var
A table with MxN dimensions is converted to a MxN matrix when given in
:var to a Calc source block.  A table with a single row is converted
to a vector (i.e., row vector).

* lisp/ob-calc.el (org-babel-execute-src-block:calc): Construct the
right data structure to pass tables as matrices to Calc.
* testing/lisp/test-ob-calc.el: Add tests for ob-calc, and this new
feature.
* etc/ORG-NEWS: Announce the feature.
* mk/default.mk (BTEST_OB_LANGUAGES): Enable ob-calc tests by default.
2024-03-16 15:15:40 +03:00
Ihor Radchenko c76d498f44
mk/default.mk: Use make single by default
This is compatible with parallel execution and can also help to catch
native compilation errors (native compilation compiles .elc files
separately), like the one discussed in bug#68851.
2024-02-09 17:17:12 +01:00
Ihor Radchenko 71fbe92c2e
mk: Allow parallel execution
* lisp/Makefile (.NOTPARALLEL): Do not suppress parallel execution.
(all compile compile-dirty):
(compile-single):
(compile-native):
(compile-source):
(compile-slint1):
(compile-slint2): Explicitly declare prerequisites that must be run
sequentially.
* mk/targets.mk (.NOTPARALLEL): Do not suppress parallel execution.
(uncompiled):
(update update2):
(repro): Explicitly declare prerequisites that must be run
sequentially.
2024-02-09 17:15:53 +01:00
Ihor Radchenko adf841219d
mk: Use ` quotes instead of complex '"'"'
* mk/default.mk (req-ob-lang):
(req-extra):
(BTEST_LOAD):
(BATCHO):
(BATCHL):

Reported-by: Stefan Monnier <monnier@iro.umontreal.ca>
Link: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68851#50
2024-02-09 12:55:43 +01:00
Ihor Radchenko ee395b9b8e
Add new make target for native compilation
* lisp/Makefile (LISPN): New variable listing all the valid .eln
targets.
(_ORGCM_):
(compile-native):
(native): New compile target.
(%.eln): Rule how to compile .eln files from .el files.
* mk/default.mk (ELN): Command to perform native compilation of a
single .eln file.
* mk/targets.mk (.PHONY):
(CONF_CALL): List the new targets and variables.
(native): Add target.
2024-02-08 20:16:51 +01:00
Ihor Radchenko 051c929d65
* mk/default.mk: Enable ob-sqlite and ob-eshell tests by default
(BTEST_OB_LANGUAGES): Add more tests to be executed by default.
2023-08-12 11:20:48 +03:00
Ihor Radchenko 7151481313
org-manual: Automatically generate export option list
* mk/org-fixup.el (org-make-manual):
(org-make-guide):
(org-make-manuals): Allow code evaluation when exporting manuals.
* doc/org-manual.org (Generic properties):
(ASCII specific properties):
(Beamer specific properties):
(HTML specific properties):
(LaTeX specific properties):
(Markdown specific properties):
(ODT specific properties):
(Texinfo specific properties): Build property tables programatically,
from a code block.
2023-07-31 11:23:33 +03:00
Kyle Meyer fa058f6d97 mk/org-fixup.el: Adjust for Emacs 29 autoload.el deprecation
* mk/org-fixup.el (org-make-org-loaddefs): Generate org-loaddefs.el
with loaddefs-generate if available.

Link: https://list.orgmode.org/87lenabrcv.fsf@kyleam.com
2023-05-21 17:06:59 -04:00
Ihor Radchenko eb6cabdee5
mk: Expand shell commands once only
* mk/targets.mk (GITVERSION):
(GITSTATUS):
(DATE):
(YEAR): Only expand the variables once, not in every make sub-process.
Previous code ran pwd/date/git in every make sub-process, slowing
things down significantly and unnecessarily.
2023-04-30 11:38:23 +02:00
Ihor Radchenko 6d37d2a8e7
* mk/targets.mk(GITVERSION): Provide commit number for shallow clones
Fall back to using git describe --always when git describe fails in
Org repo.

See https://orgmode.org/list/87bkmve8qv.fsf@gmail.com
2023-02-10 16:18:51 +03:00
Bastien 0737112852 mk/orgcard2txt.pl: Escape { to remove deprecation warnings 2022-11-19 14:41:27 +01:00
Bastien ab3d49c8b0 Merge branch 'bugfix' 2022-11-19 14:27:52 +01:00
Bastien e43e92de12 mk/orgcard2txt.pl: Get version from org-version.tex
See https://list.orgmode.org/orgmode/20221018181338.74812f94@debian/

Reported-by: Norwid Behrnd <nbehrnd@yahoo.com>
Acked-by: Ihor Radchenko <yantar92@posteo.net>
2022-11-19 14:26:29 +01:00
Ihor Radchenko 5fa66c7ffc
org-latex-verse-block: Fix regression from 3f60acff7
* lisp/ox-latex.el (org-latex-verse-block): Fix logic replacing sole
paragraph breaks according to the new template.
* testing/lisp/test-ox-latex.el: New test file.
(org-test-with-exported-text): New macro for testing export.
(test-ox-latex/verse): New test.
* mk/default.mk (BTEST_RE): Select the new test by default.

Reported-by: Juan Manuel Macías <maciaschain@posteo.net>
Link: https://orgmode.org/list/875ygk6a8z.fsf@posteo.net
2022-10-16 11:17:03 +08:00
Bastien 4b010e8dc3 Merge branch 'bugfix' 2022-10-15 18:01:04 +02:00
Bastien dd3c1e1284 mk/server.mk: Include cards 2022-10-15 09:08:10 +02:00
Ihor Radchenko 96af4a8634
* mk/default.mk (BTEST_OB_LANGUAGES): Test ob-java by default 2022-10-09 12:30:01 +08:00
Ihor Radchenko c29d3e997d
* mk/targets.mk (ORGVERSION): Prefer lisp/org.el version header
Do not use the latest Git tag.  Prefer the Version header in org.el.

The Git tag on main branch is only available for the latest release.
Before this commit, development Org version was indistinguishable from
the release version.

See https://orgmode.org/list/8735cfn44v.fsf@gnu.org
2022-09-26 19:14:20 +08:00
Bastien 1a8490b031 Remove request-assign-future.txt
The preferred way to share request-assign-future.txt is by pointing
to https://orgmode.org/request-assign-future.txt.

To access the text file from a repository, you can find it in the
orgweb repository: https://git.sr.ht/~bzg/orgweb/
2022-09-25 09:33:33 +02:00
Ihor Radchenko bc875e5ccf
Fix feature regexp used to detect Org library names
* lisp/org.el (org-reload):
* mk/org-fixup.el (org-make-org-loaddefs): Distinguish ol-*.el and
oc-*.el libraries as parts of Org-related libraries.
2022-07-28 20:26:14 +08:00
Ihor Radchenko b713b9afa1
mk: Add make target "repro" for easy bug testing
* mk/default.mk (REPRO_DEBUG): New custom variable enabling extra
debugging facilities in Emacs instance open by make repro.
(REPRO_ARGS): Extra arguments passed to Emacs by make repro.
(REPRO_INIT):
(REPRO): Define Emacs cmd for testing.
* mk/targets.mk (.PHONY):
(repro): Add new target.
* doc/org-manual.org (Feedback): Describe the new make target.
2022-07-22 21:35:37 +08:00
Stefan Kangas 13d97ee18c
Prefer "website" to "homepage"
Emacs now advises using "website" (instead of "homepage") and
consequently to use the "URL" comment header instead of "Homepage".

* README:
* README_ELPA:
* doc/org-guide.org (Creating Footnotes):
* doc/org-manual.org (Creating Footnotes):
* etc/styles/README (URL): Prefer "website" to "homepage".

* lisp/*.el:
* mk/org-fixup.el: Replace the "Homepage" header comment with "URL".
2022-06-26 10:10:48 +08:00
Max Nikulin 2da1046435
make test: Make failure summary more verbose
* mk/default.mk: By default enable verbose failure summary for Emacs-28
or newer.

Set or unset EMACS_TEST_VERBOSE environment to control reporting of failure
reasons in summary since in Emacs-28 ERT switches to verbose mode even by
an empty string (fixed in Emacs-29).
2022-01-23 21:26:55 +08:00
Marco Wahl be03334a7e Merge branch 'bugfix' into main 2021-12-21 12:13:46 +01:00
Marco Wahl b6c5f028a0 Fix parallel make of docs
* doc/Makefile: Split multiple target "org.texi orgguide.texi".
* mk/org-fixup.el (org-make-manual, org-make-guide):  New functions.
  (org-make-manuals): Make obsolete.

Reported by Ulrich Müller.  https://list.orgmode.org/uee67gr96@gentoo.org/
2021-12-21 12:12:21 +01:00
Ihor Radchenko d574186448
Disable cache persistence during build
* mk/default.mk (BATCH): Set `org-element-cache-persistent' to nil
when running make.
2021-10-18 20:59:10 +08:00
Max Nikulin 47e0cddbe3 manfull.pl: Avoid silent failures
* mk/manfull.pl: Report failures of patching of single-page HTML
manuals.

It should prevent silent generating of manual pages inconsistent with
provided CSS files when output of makeinfo will change next time.
2021-10-02 19:12:46 +02:00
Max Nikulin ffdf727842 manfull.pl: Adjust pattern for current makeinfo
* mk/manfull.pl: During patching of single-page html manuals allow
current form of table of contents headers.

Older makeinfo did not add "contents-heading" class to "<h2>" element.
Helper script failed to properly modify HTML files generated by current
version of makeinfo.  With partially patched file, CSS stiles intended
for table of contents were applied to all unordered lists, so e.g. in
"Plain Lists" section items were bold and with missed markers.
2021-10-02 19:12:46 +02:00
Max Nikulin 439359bff1 manfull.pl: Avoid silent failures
* mk/manfull.pl: Report failures of patching of single-page HTML
manuals.

It should prevent silent generating of manual pages inconsistent with
provided CSS files when output of makeinfo will change next time.
2021-10-02 19:12:28 +02:00
Max Nikulin b7df8307ec manfull.pl: Adjust pattern for current makeinfo
* mk/manfull.pl: During patching of single-page html manuals allow
current form of table of contents headers.

Older makeinfo did not add "contents-heading" class to "<h2>" element.
Helper script failed to properly modify HTML files generated by current
version of makeinfo.  With partially patched file, CSS stiles intended
for table of contents were applied to all unordered lists, so e.g. in
"Plain Lists" section items were bold and with missed markers.
2021-10-02 19:12:28 +02:00
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