2012-07-14 14:13:25 -04:00
|
|
|
|
;;; org-fixup.el --- make life easier for folks without GNU make
|
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition
* UTILITIES/org-fixup.el: new file, has functions to create
org-version.el and org-install.el, now use by the build system.
* lisp/Makefile: delete said definitions, now sourced from toplevel
make. "clean" and "cleanall" should do the same thing here, make
them aliases, ditto for "all" and "compile". Both autoload files
must be .PHONY and depend only on each other for correct ordering.
Make "compile-dirty" actually do that again (i.e. no implied
"clean", but "cleanauto"). Remove autoload files directly after
install, so that they will only be present when explicitly requested
by "autoloads". Create "org-version.el" before compilation as it is
mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION),
source from default.mk/local.mk.
* default.mk: move definitions for $(ORG_MAKE_INSTALL) and
$(ORG_MAKE_VERSION) here so that they can be more easily configured.
Remove definition of "org-release" from $(BATCH) and $(BTEST), now
sourced from "org-version.el".
* targets.mk: target reorganization, introduce "stop" targets to
prevent cleaning of org-version.el. Use new targets for "oldorg" to
make it more robust in case of errors. New target "cleanutils" to
remove any "*.elc" files that may have been produced there and add
this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
|
|
|
|
;;
|
|
|
|
|
;; Author: Achim Gratz
|
2012-07-14 14:13:25 -04:00
|
|
|
|
;; Keywords: orgmode
|
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition
* UTILITIES/org-fixup.el: new file, has functions to create
org-version.el and org-install.el, now use by the build system.
* lisp/Makefile: delete said definitions, now sourced from toplevel
make. "clean" and "cleanall" should do the same thing here, make
them aliases, ditto for "all" and "compile". Both autoload files
must be .PHONY and depend only on each other for correct ordering.
Make "compile-dirty" actually do that again (i.e. no implied
"clean", but "cleanauto"). Remove autoload files directly after
install, so that they will only be present when explicitly requested
by "autoloads". Create "org-version.el" before compilation as it is
mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION),
source from default.mk/local.mk.
* default.mk: move definitions for $(ORG_MAKE_INSTALL) and
$(ORG_MAKE_VERSION) here so that they can be more easily configured.
Remove definition of "org-release" from $(BATCH) and $(BTEST), now
sourced from "org-version.el".
* targets.mk: target reorganization, introduce "stop" targets to
prevent cleaning of org-version.el. Use new targets for "oldorg" to
make it more robust in case of errors. New target "cleanutils" to
remove any "*.elc" files that may have been produced there and add
this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
|
;;
|
2012-05-26 16:32:21 -04:00
|
|
|
|
;; This file is not part of GNU Emacs.
|
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition
* UTILITIES/org-fixup.el: new file, has functions to create
org-version.el and org-install.el, now use by the build system.
* lisp/Makefile: delete said definitions, now sourced from toplevel
make. "clean" and "cleanall" should do the same thing here, make
them aliases, ditto for "all" and "compile". Both autoload files
must be .PHONY and depend only on each other for correct ordering.
Make "compile-dirty" actually do that again (i.e. no implied
"clean", but "cleanauto"). Remove autoload files directly after
install, so that they will only be present when explicitly requested
by "autoloads". Create "org-version.el" before compilation as it is
mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION),
source from default.mk/local.mk.
* default.mk: move definitions for $(ORG_MAKE_INSTALL) and
$(ORG_MAKE_VERSION) here so that they can be more easily configured.
Remove definition of "org-release" from $(BATCH) and $(BTEST), now
sourced from "org-version.el".
* targets.mk: target reorganization, introduce "stop" targets to
prevent cleaning of org-version.el. Use new targets for "oldorg" to
make it more robust in case of errors. New target "cleanutils" to
remove any "*.elc" files that may have been produced there and add
this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
|
|
|
|
;;
|
|
|
|
|
;; 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:
|
|
|
|
|
|
2012-07-14 14:13:25 -04:00
|
|
|
|
(require 'autoload)
|
|
|
|
|
(require 'org-compat "org-compat.el")
|
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition
* UTILITIES/org-fixup.el: new file, has functions to create
org-version.el and org-install.el, now use by the build system.
* lisp/Makefile: delete said definitions, now sourced from toplevel
make. "clean" and "cleanall" should do the same thing here, make
them aliases, ditto for "all" and "compile". Both autoload files
must be .PHONY and depend only on each other for correct ordering.
Make "compile-dirty" actually do that again (i.e. no implied
"clean", but "cleanauto"). Remove autoload files directly after
install, so that they will only be present when explicitly requested
by "autoloads". Create "org-version.el" before compilation as it is
mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION),
source from default.mk/local.mk.
* default.mk: move definitions for $(ORG_MAKE_INSTALL) and
$(ORG_MAKE_VERSION) here so that they can be more easily configured.
Remove definition of "org-release" from $(BATCH) and $(BTEST), now
sourced from "org-version.el".
* targets.mk: target reorganization, introduce "stop" targets to
prevent cleaning of org-version.el. Use new targets for "oldorg" to
make it more robust in case of errors. New target "cleanutils" to
remove any "*.elc" files that may have been produced there and add
this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
|
|
|
|
|
|
|
|
|
(defun org-make-org-version (org-release org-git-version odt-dir)
|
2012-07-14 14:13:25 -04:00
|
|
|
|
"Make the file org-version.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
|
|
|
|
|
work correctly if this file is not present (except directly from
|
|
|
|
|
the Git work tree)."
|
2012-05-19 13:54:00 -04:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(insert "\
|
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.\")
|
2012-07-15 04:41:27 -04:00
|
|
|
|
\f\n\(provide 'org-version\)
|
2012-05-07 15:21:28 -04:00
|
|
|
|
\f\n;; Local Variables:\n;; version-control: never
|
|
|
|
|
;; no-byte-compile: t
|
|
|
|
|
;; coding: utf-8\n;; End:\n;;; org-version.el ends here\n")
|
2012-05-19 13:54:00 -04:00
|
|
|
|
(toggle-read-only 0)
|
|
|
|
|
(write-file "org-version.el")))
|
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition
* UTILITIES/org-fixup.el: new file, has functions to create
org-version.el and org-install.el, now use by the build system.
* lisp/Makefile: delete said definitions, now sourced from toplevel
make. "clean" and "cleanall" should do the same thing here, make
them aliases, ditto for "all" and "compile". Both autoload files
must be .PHONY and depend only on each other for correct ordering.
Make "compile-dirty" actually do that again (i.e. no implied
"clean", but "cleanauto"). Remove autoload files directly after
install, so that they will only be present when explicitly requested
by "autoloads". Create "org-version.el" before compilation as it is
mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION),
source from default.mk/local.mk.
* default.mk: move definitions for $(ORG_MAKE_INSTALL) and
$(ORG_MAKE_VERSION) here so that they can be more easily configured.
Remove definition of "org-release" from $(BATCH) and $(BTEST), now
sourced from "org-version.el".
* targets.mk: target reorganization, introduce "stop" targets to
prevent cleaning of org-version.el. Use new targets for "oldorg" to
make it more robust in case of errors. New target "cleanutils" to
remove any "*.elc" files that may have been produced there and add
this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
|
|
|
|
|
2012-05-19 16:08:06 -04:00
|
|
|
|
(defun org-make-org-install ()
|
2012-07-14 14:13:25 -04:00
|
|
|
|
"Make the file org-install.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
|
|
|
|
|
work correctly if this file is not up-to-date."
|
2012-05-19 13:54:00 -04:00
|
|
|
|
(with-temp-buffer
|
2012-05-19 16:08:06 -04:00
|
|
|
|
(set-visited-file-name "org-install.el")
|
2012-05-19 13:54:00 -04:00
|
|
|
|
(insert ";;; org-install.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
|
2012-05-19 16:08:06 -04:00
|
|
|
|
(let ((files (directory-files default-directory nil "^\\(org\\|ob\\)\\(-.*\\)?\\.el$")))
|
2012-05-19 13:54:00 -04:00
|
|
|
|
(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)
|
2012-05-19 16:08:06 -04:00
|
|
|
|
(save-buffer)))
|
2012-05-19 13:54:00 -04:00
|
|
|
|
|
2012-07-14 14:13:25 -04:00
|
|
|
|
(defun org-make-autoloads (&optional compile force)
|
|
|
|
|
"Make the files org-install 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
|
|
|
|
|
manual install when the build system can't be used."
|
2012-05-19 13:54:00 -04:00
|
|
|
|
(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)
|
2012-07-14 14:13:25 -04:00
|
|
|
|
(org-make-org-install)
|
|
|
|
|
(when compile (byte-recompile-directory dirlisp 0 force)))
|
2012-05-19 13:54:00 -04:00
|
|
|
|
(cd origin))))
|
|
|
|
|
|
2012-07-14 14:13:25 -04:00
|
|
|
|
(defun org-make-autoloads-compile ()
|
|
|
|
|
"Call org-make-autoloads with compile argument.
|
|
|
|
|
Convenience function for easier invocation from command line."
|
|
|
|
|
(org-make-autoloads 'compile nil))
|
|
|
|
|
|
|
|
|
|
(defun org-make-autoloads-compile-force ()
|
|
|
|
|
"Call org-make-autoloads with compile force arguments.
|
|
|
|
|
Convenience function for easier invocation from command line."
|
|
|
|
|
(org-make-autoloads 'compile 'force))
|
|
|
|
|
|
|
|
|
|
;; Internal functions
|
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition
* UTILITIES/org-fixup.el: new file, has functions to create
org-version.el and org-install.el, now use by the build system.
* lisp/Makefile: delete said definitions, now sourced from toplevel
make. "clean" and "cleanall" should do the same thing here, make
them aliases, ditto for "all" and "compile". Both autoload files
must be .PHONY and depend only on each other for correct ordering.
Make "compile-dirty" actually do that again (i.e. no implied
"clean", but "cleanauto"). Remove autoload files directly after
install, so that they will only be present when explicitly requested
by "autoloads". Create "org-version.el" before compilation as it is
mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION),
source from default.mk/local.mk.
* default.mk: move definitions for $(ORG_MAKE_INSTALL) and
$(ORG_MAKE_VERSION) here so that they can be more easily configured.
Remove definition of "org-release" from $(BATCH) and $(BTEST), now
sourced from "org-version.el".
* targets.mk: target reorganization, introduce "stop" targets to
prevent cleaning of org-version.el. Use new targets for "oldorg" to
make it more robust in case of errors. New target "cleanutils" to
remove any "*.elc" files that may have been produced there and add
this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
|
|
|
|
|
2012-05-26 16:32:21 -04:00
|
|
|
|
(defun org-make-local-mk ()
|
2012-07-14 14:13:25 -04:00
|
|
|
|
"Internal function for the build system."
|
2012-05-26 16:32:21 -04:00
|
|
|
|
(let ((default "default.mk")
|
|
|
|
|
(local "local.mk"))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(insert-file-contents default)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(when (search-forward "-8<-" nil t)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(delete-region (point-min) (point)))
|
|
|
|
|
(when (search-forward "->8-" nil t)
|
|
|
|
|
(forward-line 0)
|
|
|
|
|
(delete-region (point) (point-max)))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(insert "
|
|
|
|
|
# Remove \"oldorg:\" to switch to \"all\" as the default target.
|
|
|
|
|
# Change \"oldorg:\" to an existing target to make that target the default,
|
|
|
|
|
# or define your own target here to become the default target.
|
|
|
|
|
oldorg: # do what the old Makfile did by default
|
|
|
|
|
|
|
|
|
|
##----------------------------------------------------------------------
|
|
|
|
|
")
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(insert "\
|
|
|
|
|
# See default.mk for further configuration options.
|
|
|
|
|
")
|
|
|
|
|
(toggle-read-only 0)
|
|
|
|
|
(write-file local))
|
|
|
|
|
nil)))
|
|
|
|
|
|
|
|
|
|
(defun org-make-letterformat (a4name lettername)
|
2012-07-14 14:13:25 -04:00
|
|
|
|
"Internal function for the build system."
|
2012-05-26 16:32:21 -04:00
|
|
|
|
(unwind-protect
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(insert-file-contents a4name)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (search-forward "\\pdflayout=(0l)" nil t)
|
|
|
|
|
(replace-match "\\pdflayout=(1l)" nil t))
|
|
|
|
|
(toggle-read-only 0)
|
|
|
|
|
(write-file lettername))
|
|
|
|
|
nil))
|
|
|
|
|
|
2012-07-14 14:13:25 -04:00
|
|
|
|
;; redefine version functions
|
|
|
|
|
|
2012-05-07 15:21:28 -04:00
|
|
|
|
(defmacro org-fixup ()
|
|
|
|
|
(let* ((origin default-directory)
|
2012-05-07 16:37:31 -04:00
|
|
|
|
(dirlisp (org-find-library-dir "org"))
|
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!!"))
|
2012-07-11 13:32:33 -04:00
|
|
|
|
(if (and (boundp 'org-fake-release) (stringp org-fake-release)
|
|
|
|
|
(boundp 'org-fake-git-version) (stringp org-fake-git-version))
|
|
|
|
|
(setq org-version org-fake-release
|
|
|
|
|
org-git-version org-fake-git-version)
|
|
|
|
|
(if (load (concat dirlisp "org-version.el") 'noerror 'nomessage 'nosuffix)
|
|
|
|
|
(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"))))
|
2012-07-14 14:13:25 -04:00
|
|
|
|
(setq org-git-version (concat git6 (when gitd ".dirty") "-git"))
|
2012-07-11 13:32:33 -04:00
|
|
|
|
(if (string-match "^release_" git0)
|
|
|
|
|
(setq org-version (substring git0 8))
|
|
|
|
|
(setq org-version git0))))
|
2012-07-14 14:13:25 -04:00
|
|
|
|
(cd origin)))))
|
|
|
|
|
(message "org-fixup.el: redefined org version.")
|
2012-05-07 15:21:28 -04:00
|
|
|
|
`(progn
|
|
|
|
|
(defun org-release () ,org-version)
|
2012-07-14 14:13:25 -04:00
|
|
|
|
(defun org-git-version () ,org-git-version))))
|
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition
* UTILITIES/org-fixup.el: new file, has functions to create
org-version.el and org-install.el, now use by the build system.
* lisp/Makefile: delete said definitions, now sourced from toplevel
make. "clean" and "cleanall" should do the same thing here, make
them aliases, ditto for "all" and "compile". Both autoload files
must be .PHONY and depend only on each other for correct ordering.
Make "compile-dirty" actually do that again (i.e. no implied
"clean", but "cleanauto"). Remove autoload files directly after
install, so that they will only be present when explicitly requested
by "autoloads". Create "org-version.el" before compilation as it is
mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION),
source from default.mk/local.mk.
* default.mk: move definitions for $(ORG_MAKE_INSTALL) and
$(ORG_MAKE_VERSION) here so that they can be more easily configured.
Remove definition of "org-release" from $(BATCH) and $(BTEST), now
sourced from "org-version.el".
* targets.mk: target reorganization, introduce "stop" targets to
prevent cleaning of org-version.el. Use new targets for "oldorg" to
make it more robust in case of errors. New target "cleanutils" to
remove any "*.elc" files that may have been produced there and add
this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
|
|
|
|
|
|
|
|
|
(provide 'org-fixup)
|
|
|
|
|
|
|
|
|
|
;; Local Variables:
|
|
|
|
|
;; no-byte-compile: t
|
|
|
|
|
;; coding: utf-8
|
|
|
|
|
;; End:
|
|
|
|
|
;;; org-fixup.el ends here
|