forked from mirrors/org-mode
Use org-loaddefs.el instead of org-install.el.
This commit is contained in:
parent
5fc07bce0a
commit
5dcca72011
|
@ -56,7 +56,7 @@ BTEST = $(BATCH) \
|
|||
--eval '(add-to-list '"'"'load-path "./lisp")' \
|
||||
--eval '(add-to-list '"'"'load-path "./testing")' \
|
||||
$(BTEST_POST) \
|
||||
-l org-install.el \
|
||||
-l org-loaddefs.el \
|
||||
-l testing/org-test.el \
|
||||
$(foreach ob-lang,$(BTEST_OB_LANGUAGES),$(req-ob-lang)) \
|
||||
$(foreach req,$(BTEST_EXTRA),$(req-extra)) \
|
||||
|
@ -81,11 +81,11 @@ MAKE_LOCAL_MK = $(BATCHO) \
|
|||
BATCHL = $(BATCH) \
|
||||
--eval '(add-to-list '"'"'load-path ".")'
|
||||
|
||||
# How to generate org-install.el
|
||||
# How to generate org-loaddefs.el
|
||||
MAKE_ORG_INSTALL = $(BATCHL) \
|
||||
--eval '(load "org-compat.el")' \
|
||||
--eval '(load "../mk/org-fixup.el")' \
|
||||
--eval '(org-make-org-install)'
|
||||
--eval '(org-make-org-loaddefs)'
|
||||
|
||||
# How to generate org-version.el
|
||||
MAKE_ORG_VERSION = $(BATCHL) \
|
||||
|
|
|
@ -61,8 +61,8 @@ the Git work tree)."
|
|||
(toggle-read-only 0)
|
||||
(write-file "org-version.el")))
|
||||
|
||||
(defun org-make-org-install ()
|
||||
"Make the file org-install.el in the current directory.
|
||||
(defun org-make-org-loaddefs ()
|
||||
"Make the file org-loaddefs.el in the current directory.
|
||||
This function is internally used by the build system and should
|
||||
be used by foreign build systems or installers to produce this
|
||||
file in the installation directory of org-mode. Org will not
|
||||
|
@ -75,12 +75,12 @@ work correctly if this file is not up-to-date."
|
|||
(insert "\f\n(provide 'org-loaddefs)\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")
|
||||
(insert ";; coding: utf-8\n;; End:\n;;; org-loaddefs.el ends here\n")
|
||||
(toggle-read-only 0)
|
||||
(save-buffer)))
|
||||
|
||||
(defun org-make-autoloads (&optional compile force)
|
||||
"Make the files org-install and org-version.el in the install directory.
|
||||
"Make the files org-loaddefs.el and org-version.el in the install directory.
|
||||
Finds the install directory by looking for library \"org\".
|
||||
Optionally byte-compile lisp files in the install directory or
|
||||
force re-compilation. This function is provided for easier
|
||||
|
@ -96,7 +96,7 @@ manual install when the build system can't be used."
|
|||
(cd dirlisp)
|
||||
(org-fixup)
|
||||
(org-make-org-version (org-release) (org-git-version) dirodt)
|
||||
(org-make-org-install)
|
||||
(org-make-org-loaddefs)
|
||||
(when compile (byte-recompile-directory dirlisp 0 force)))
|
||||
(cd origin))))
|
||||
|
||||
|
|
Loading…
Reference in a new issue