Stefan Monnier <monn...@iro.umontreal.ca> writes: >> After trying several more approaches, > > [ Side note: did you keep notes about the various approaches you tried > and their respective downsides? E.g. I'm curious what were the > problems linked to my proposal of using a `require-with-check` like > the one below my sig. ]
My attempt to use shadowcheck idea you proposed failed with some very strange errors and I gave up. See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62762#311 Although, part of the problem was https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65286 which does not seem to be reproducible by others. >> I now came up with yet another idea. Instead of fiddling with load >> internals, compilation, or load-path, what about making sure that Org >> libraries include version info directly? > > That should work. It implies a fair bit more churn in the code, tho, > but I guess you plan to automate it via some scripts? Yeah. It will require search-and-replace across Org between releases. But, at least, it is the most reliable way I can see without falling into subtle details of Emacs load system. I did some automation in a form of =make test= barking when `provide' do not match Org version:
>From 9caf9ca7207ecebed3499432828833187436940d Mon Sep 17 00:00:00 2001 Message-ID: <9caf9ca7207ecebed3499432828833187436940d.1692189593.git.yanta...@posteo.net> From: Ihor Radchenko <yanta...@posteo.net> Date: Wed, 16 Aug 2023 13:59:49 +0300 Subject: [PATCH] * testing/lisp/test-org-version.el: New test library (test-org-version/provide): Test for all the versioned features to be provided according to current Org version. --- testing/lisp/test-org-version.el | 54 ++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 testing/lisp/test-org-version.el diff --git a/testing/lisp/test-org-version.el b/testing/lisp/test-org-version.el new file mode 100644 index 000000000..3c12c8d46 --- /dev/null +++ b/testing/lisp/test-org-version.el @@ -0,0 +1,54 @@ +;;; test-org-version.el --- Test Org version consistency -*- lexical-binding: t; -*- + +;; Copyright (C) 2023 Ihor Radchenko + +;; Author: Ihor Radchenko <yanta...@posteo.net> +;; Keywords: internal + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see <https://www.gnu.org/licenses/>. + +;;; Commentary: + +;; This file implements internal checks for Org versioning. + +;;; Code: + +(require 'org-version) + +(ert-deftest test-org-version/provide () + "Test versioned `provide' calls in Org libraries." + (let* (org-library) + (dolist (org-library-file + (directory-files + (expand-file-name + (concat org-test-dir "../lisp")) + t "\\.el$")) + (setq org-library + (file-name-nondirectory + (file-name-sans-extension org-library-file))) + (unless (member org-library '("org-loaddefs" "org-version")) + (with-temp-buffer + (insert-file-contents org-library-file) + (goto-char (point-max)) + (should (re-search-backward + (rx-to-string + `(seq + bol (0+ space) + "(provide" (0+ space) + "'" ,(concat org-library "-" (org-release)) + (0+ space) ")")) + nil t))))))) + +(provide 'test-org-version) +;;; test-org-version.el ends here -- 2.41.0
-- Ihor Radchenko // yantar92, Org mode contributor, Learn more about Org mode at <https://orgmode.org/>. Support Org development at <https://liberapay.com/org-mode>, or support my work at <https://liberapay.com/yantar92>
