org-mode/UTILITIES/org-fixup.el

130 lines
4.4 KiB
EmacsLisp
Raw Normal View History

;;; org-fixup.el - to make life easier for folks without GNU make
;;
;; Author: Achim Gratz
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;;
;; This file is not yet part of GNU Emacs.
;;
;; GNU Emacs 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, or (at your option)
;; any later version.
;; GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
;; Boston, MA 02110-1301, USA.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;;; Commentary:
(require 'org-compat)
(require 'autoload)
(defun org-make-org-version (org-release org-git-version odt-dir)
(with-temp-buffer
(insert "\
ensure that M-x org-version always delivers something useful * UTILITIES/org-fixup.el (org-make-org-version): change defconst to defun for org-release and org-git-version and close over those variables (do not make them global anymore). * UTILITIES/org-fixup.el (org-fixup): check for org-version.el or try to use git to get the version from the worktree (code uses parts of the former implementation from org.el). * lisp/org.el (org-version): use functions instead of global variables to get the version strings and remove the defvaralias to org-version. Warn when encountering a mixed installation (org and org-install.el should be found in the same directory). Supported use-cases: 1) Org uninstalled (and possibly uncompiled) from Git or tarball. 1a) No org-version.el or org-install.el exists in worktree. Partially supported configuration, org version is determined from git if possible via UTILITIES/org-fixup.el. However, Emacs versions delivered with orgmode will provide autoloads that may or may not work with that version of org (mixed installation). If such a situation is encountered, warn the user. It can work if the autoloads from the installation match the ones that would be generated for the worktree, which generelly is only the case if there is a relatively recent installation in site-lisp. 1b) Autoload file org-install.el exists in worktree. Fully supported configuration, org version is determined from git if possible via UTILITIES/org-fixup.el. 1c) Both org-version.el or org-install.el exist in worktree. Recommended configuration for 1), org version is taken from org-version.el (git never gets invoked). 2) Org installed. Both org-version.el and org-install.el must exist in install directory. Only supported configuration for 2), org version is taken from org-version.el (git never gets invoked since UTILITIES/org-fixup.el is not available). Any unsupported configuration should still yield a version string, but it will contain "N/A" to alert the user about a botched org installation.
2012-05-07 15:21:28 -04:00
;;; org-version.el --- autogenerated file, do not edit
;;
;;; Code:
;;;\#\#\#autoload
\(defun org-release ()
\"The release version of org-mode.
Inserted by installing org-mode or when a release is made.\"
(let ((org-release \"" org-release "\"))
org-release))
;;;\#\#\#autoload
\(defun org-git-version ()
\"The Git version of org-mode.
Inserted by installing org-mode or when a release is made.\"
(let ((org-git-version \"" org-git-version "\"))
org-git-version))
;;;\#\#\#autoload
\(defconst org-odt-data-dir \"" odt-dir "\"
\"The location of ODT styles.\")
\f\n;; Local Variables:\n;; version-control: never
;; no-byte-compile: t
;; coding: utf-8\n;; End:\n;;; org-version.el ends here\n")
(toggle-read-only 0)
(write-file "org-version.el")))
(defun org-make-org-install ()
(with-temp-buffer
(set-visited-file-name "org-install.el")
(insert ";;; org-install.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
(let ((files (directory-files default-directory nil "^\\(org\\|ob\\)\\(-.*\\)?\\.el$")))
(mapc (lambda (f) (generate-file-autoloads f)) files))
(insert "\f\n(provide 'org-install)\n")
(insert "\f\n;; Local Variables:\n;; version-control: never\n")
(insert ";; no-byte-compile: t\n;; no-update-autoloads: t\n")
(insert ";; coding: utf-8\n;; End:\n;;; org-install.el ends here\n")
(toggle-read-only 0)
(save-buffer)))
(defun org-make-autoloads ()
(let* ((origin default-directory)
(dirlisp (org-find-library-dir "org"))
(dirorg (concat dirlisp "../" ))
(dirodt (if (boundp 'org-odt-data-dir)
org-odt-data-dir
(concat dirorg "etc/"))))
(unwind-protect
(progn
(cd dirlisp)
(org-fixup)
(org-make-org-version (org-release) (org-git-version) dirodt)
(org-make-org-install))
(cd origin))))
(defun org-make-autoloads-compile (&rest force)
(let* ((origin default-directory)
(dirlisp (org-find-library-dir "org")))
(unwind-protect
(progn
(cd dirlisp)
(org-make-autoloads)
(byte-recompile-directory dirlisp 0 force))
(cd origin))))
ensure that M-x org-version always delivers something useful * UTILITIES/org-fixup.el (org-make-org-version): change defconst to defun for org-release and org-git-version and close over those variables (do not make them global anymore). * UTILITIES/org-fixup.el (org-fixup): check for org-version.el or try to use git to get the version from the worktree (code uses parts of the former implementation from org.el). * lisp/org.el (org-version): use functions instead of global variables to get the version strings and remove the defvaralias to org-version. Warn when encountering a mixed installation (org and org-install.el should be found in the same directory). Supported use-cases: 1) Org uninstalled (and possibly uncompiled) from Git or tarball. 1a) No org-version.el or org-install.el exists in worktree. Partially supported configuration, org version is determined from git if possible via UTILITIES/org-fixup.el. However, Emacs versions delivered with orgmode will provide autoloads that may or may not work with that version of org (mixed installation). If such a situation is encountered, warn the user. It can work if the autoloads from the installation match the ones that would be generated for the worktree, which generelly is only the case if there is a relatively recent installation in site-lisp. 1b) Autoload file org-install.el exists in worktree. Fully supported configuration, org version is determined from git if possible via UTILITIES/org-fixup.el. 1c) Both org-version.el or org-install.el exist in worktree. Recommended configuration for 1), org version is taken from org-version.el (git never gets invoked). 2) Org installed. Both org-version.el and org-install.el must exist in install directory. Only supported configuration for 2), org version is taken from org-version.el (git never gets invoked since UTILITIES/org-fixup.el is not available). Any unsupported configuration should still yield a version string, but it will contain "N/A" to alert the user about a botched org installation.
2012-05-07 15:21:28 -04:00
(defmacro org-fixup ()
(let* ((origin default-directory)
(dirlisp (org-find-library-dir "org"))
ensure that M-x org-version always delivers something useful * UTILITIES/org-fixup.el (org-make-org-version): change defconst to defun for org-release and org-git-version and close over those variables (do not make them global anymore). * UTILITIES/org-fixup.el (org-fixup): check for org-version.el or try to use git to get the version from the worktree (code uses parts of the former implementation from org.el). * lisp/org.el (org-version): use functions instead of global variables to get the version strings and remove the defvaralias to org-version. Warn when encountering a mixed installation (org and org-install.el should be found in the same directory). Supported use-cases: 1) Org uninstalled (and possibly uncompiled) from Git or tarball. 1a) No org-version.el or org-install.el exists in worktree. Partially supported configuration, org version is determined from git if possible via UTILITIES/org-fixup.el. However, Emacs versions delivered with orgmode will provide autoloads that may or may not work with that version of org (mixed installation). If such a situation is encountered, warn the user. It can work if the autoloads from the installation match the ones that would be generated for the worktree, which generelly is only the case if there is a relatively recent installation in site-lisp. 1b) Autoload file org-install.el exists in worktree. Fully supported configuration, org version is determined from git if possible via UTILITIES/org-fixup.el. 1c) Both org-version.el or org-install.el exist in worktree. Recommended configuration for 1), org version is taken from org-version.el (git never gets invoked). 2) Org installed. Both org-version.el and org-install.el must exist in install directory. Only supported configuration for 2), org version is taken from org-version.el (git never gets invoked since UTILITIES/org-fixup.el is not available). Any unsupported configuration should still yield a version string, but it will contain "N/A" to alert the user about a botched org installation.
2012-05-07 15:21:28 -04:00
(dirorg (concat dirlisp "../" ))
(dirgit (concat dirorg ".git/" ))
(org-version "N/A-fixup")
(org-git-version "N/A-fixup !!check installation!!"))
(if (load (concat dirlisp "org-version.el") 'noerror 'nomessage 'nosuffix)
ensure that M-x org-version always delivers something useful * UTILITIES/org-fixup.el (org-make-org-version): change defconst to defun for org-release and org-git-version and close over those variables (do not make them global anymore). * UTILITIES/org-fixup.el (org-fixup): check for org-version.el or try to use git to get the version from the worktree (code uses parts of the former implementation from org.el). * lisp/org.el (org-version): use functions instead of global variables to get the version strings and remove the defvaralias to org-version. Warn when encountering a mixed installation (org and org-install.el should be found in the same directory). Supported use-cases: 1) Org uninstalled (and possibly uncompiled) from Git or tarball. 1a) No org-version.el or org-install.el exists in worktree. Partially supported configuration, org version is determined from git if possible via UTILITIES/org-fixup.el. However, Emacs versions delivered with orgmode will provide autoloads that may or may not work with that version of org (mixed installation). If such a situation is encountered, warn the user. It can work if the autoloads from the installation match the ones that would be generated for the worktree, which generelly is only the case if there is a relatively recent installation in site-lisp. 1b) Autoload file org-install.el exists in worktree. Fully supported configuration, org version is determined from git if possible via UTILITIES/org-fixup.el. 1c) Both org-version.el or org-install.el exist in worktree. Recommended configuration for 1), org version is taken from org-version.el (git never gets invoked). 2) Org installed. Both org-version.el and org-install.el must exist in install directory. Only supported configuration for 2), org version is taken from org-version.el (git never gets invoked since UTILITIES/org-fixup.el is not available). Any unsupported configuration should still yield a version string, but it will contain "N/A" to alert the user about a botched org installation.
2012-05-07 15:21:28 -04:00
(setq org-version (org-release)
org-git-version (org-git-version))
(when (and (file-exists-p dirgit)
(executable-find "git"))
(unwind-protect
(progn
(cd dirorg)
(let ((git6 (substring (shell-command-to-string "git describe --abbrev=6 HEAD") 0 -1))
(git0 (substring (shell-command-to-string "git describe --abbrev=0 HEAD") 0 -1))
(gitd (string-match "\\S-" (shell-command-to-string "git status -uno --porcelain"))))
(setq org-git-version (concat git6 (when gitd ".dirty")))
(if (string-match "^release_" git0)
(setq org-version (substring git0 8))
(setq org-version git0))))
(cd origin))))
ensure that M-x org-version always delivers something useful * UTILITIES/org-fixup.el (org-make-org-version): change defconst to defun for org-release and org-git-version and close over those variables (do not make them global anymore). * UTILITIES/org-fixup.el (org-fixup): check for org-version.el or try to use git to get the version from the worktree (code uses parts of the former implementation from org.el). * lisp/org.el (org-version): use functions instead of global variables to get the version strings and remove the defvaralias to org-version. Warn when encountering a mixed installation (org and org-install.el should be found in the same directory). Supported use-cases: 1) Org uninstalled (and possibly uncompiled) from Git or tarball. 1a) No org-version.el or org-install.el exists in worktree. Partially supported configuration, org version is determined from git if possible via UTILITIES/org-fixup.el. However, Emacs versions delivered with orgmode will provide autoloads that may or may not work with that version of org (mixed installation). If such a situation is encountered, warn the user. It can work if the autoloads from the installation match the ones that would be generated for the worktree, which generelly is only the case if there is a relatively recent installation in site-lisp. 1b) Autoload file org-install.el exists in worktree. Fully supported configuration, org version is determined from git if possible via UTILITIES/org-fixup.el. 1c) Both org-version.el or org-install.el exist in worktree. Recommended configuration for 1), org version is taken from org-version.el (git never gets invoked). 2) Org installed. Both org-version.el and org-install.el must exist in install directory. Only supported configuration for 2), org version is taken from org-version.el (git never gets invoked since UTILITIES/org-fixup.el is not available). Any unsupported configuration should still yield a version string, but it will contain "N/A" to alert the user about a botched org installation.
2012-05-07 15:21:28 -04:00
`(progn
(defun org-release () ,org-version)
(defun org-git-version () ,org-git-version)
"org-fixup.el: redefined org version.")))
(provide 'org-fixup)
;; Local Variables:
;; no-byte-compile: t
;; coding: utf-8
;; End:
;;; org-fixup.el ends here