ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make functions in org-fixup.el more robust, add full build functionality 

* UTILITIES/org-fixup.el(org-make-org-version): Use temporary buffer.

* UTILITIES/org-fixup.el(org-make-org-install): Use temporary buffer.

* UTILITIES/org-fixup.el(org-make-autoloads): New function, generates
  autoload files using (org-make-org-version)
  and (org-make-org-install).  Uses (org-fixup) to determine version
  strings.

* UTILITIES/org-fixup.el(org-make-autoloads-compile): New function,
  generates autoload files using (org-make-autoloads) and
  byte-compiles files in lisp.  Optional argument forces
  re-compilation of all files.

* UTILITIES/org-fixup.el(org-fixup): Clean up whitespace and correct the
  unwind form.
This commit is contained in:
Achim Gratz 2012-05-19 19:54:00 +02:00 committed by Bastien Guerry
parent 40a789ecd1
commit 7b33d9f56b
1 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
UTILITIES/org-fixup.el
View File

@ -28,9 +28,8 @@
(require 'autoload) (require 'autoload)
(defun org-make-org-version (org-release org-git-version odt-dir) (defun org-make-org-version (org-release org-git-version odt-dir)
(find-file "org-version.el") (with-temp-buffer
(erase-buffer) (insert "\
(insert "\
;;; org-version.el --- autogenerated file, do not edit ;;; org-version.el --- autogenerated file, do not edit
;; ;;
;;; Code: ;;; Code:
@ -52,19 +51,46 @@
\f\n;; Local Variables:\n;; version-control: never \f\n;; Local Variables:\n;; version-control: never
;; no-byte-compile: t ;; no-byte-compile: t
;; coding: utf-8\n;; End:\n;;; org-version.el ends here\n") ;; coding: utf-8\n;; End:\n;;; org-version.el ends here\n")
(save-buffer)) (toggle-read-only 0)
(write-file "org-version.el")))
(defun org-make-org-install (absfile) (defun org-make-org-install (absfile)
(find-file absfile) (with-temp-buffer
(erase-buffer) (set-visited-file-name absfile)
(insert ";;; org-install.el --- autogenerated file, do not edit\n;;\n;;; Code:\n") (insert ";;; org-install.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
(let ((files (directory-files (file-name-directory absfile) 'full "^[^.#~]*\\.el$"))) (let ((files (directory-files (file-name-directory absfile) 'full "^[^.#~]*\\.el$")))
(mapc (lambda (f) (generate-file-autoloads f)) files)) (mapc (lambda (f) (generate-file-autoloads f)) files))
(insert "\f\n(provide 'org-install)\n") (insert "\f\n(provide 'org-install)\n")
(insert "\f\n;; Local Variables:\n;; version-control: never\n") (insert "\f\n;; Local Variables:\n;; version-control: never\n")
(insert ";; no-byte-compile: t\n;; no-update-autoloads: t\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") (insert ";; coding: utf-8\n;; End:\n;;; org-install.el ends here\n")
(save-buffer)) (toggle-read-only 0)
(write-file absfile)))
(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 (concat dirlisp "org-install.el")))
(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))))
(defmacro org-fixup () (defmacro org-fixup ()
(let* ((origin default-directory) (let* ((origin default-directory)
@ -81,14 +107,14 @@
(unwind-protect (unwind-protect
(progn (progn
(cd dirorg) (cd dirorg)
(let (( git6 (substring (shell-command-to-string "git describe --abbrev=6 HEAD") 0 -1)) (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)) (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")))) (gitd (string-match "\\S-" (shell-command-to-string "git status -uno --porcelain"))))
(setq org-git-version (concat git6 (when gitd ".dirty"))) (setq org-git-version (concat git6 (when gitd ".dirty")))
(if (string-match "^release_" git0) (if (string-match "^release_" git0)
(setq org-version (substring git0 8)) (setq org-version (substring git0 8))
(setq org-version git0))) (setq org-version git0))))
(cd origin))))) (cd origin))))
`(progn `(progn
(defun org-release () ,org-version) (defun org-release () ,org-version)
(defun org-git-version () ,org-git-version) (defun org-git-version () ,org-git-version)