[PATCH 2/4] build: Produce 'guix-config' instead of using compile-time tricks.

[Mathieu Lirzin <mthl@openmailbox.org>]

[-- Attachment #1: Type: text/plain, Size: 898 bytes --]


* emacs/guix-config.el.in: New file.
* emacs/guix-{init,profiles}.el.in: Rename to ...
* emacs/guix-{init,profiles}.el: ... these.  New files.
  Use 'guix-config'.
* .gitignore, configure.ac: Adjust accordingly.
---
 .gitignore                |  3 +--
 configure.ac              | 19 +++++++-------
 emacs/guix-config.el.in   | 33 ++++++++++++++++++++++++
 emacs/guix-init.el        | 20 +++++++++++++++
 emacs/guix-init.el.in     | 19 --------------
 emacs/guix-profiles.el    | 65 +++++++++++++++++++++++++++++++++++++++++++++++
 emacs/guix-profiles.el.in | 62 --------------------------------------------
 7 files changed, 128 insertions(+), 93 deletions(-)
 create mode 100644 emacs/guix-config.el.in
 create mode 100644 emacs/guix-init.el
 delete mode 100644 emacs/guix-init.el.in
 create mode 100644 emacs/guix-profiles.el
 delete mode 100644 emacs/guix-profiles.el.in


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-build-Produce-guix-config-instead-of-using-compile-t.patch --]
[-- Type: text/x-patch; name="0002-build-Produce-guix-config-instead-of-using-compile-t.patch", Size: 9021 bytes --]

diff --git a/.gitignore b/.gitignore
index a3bd340..db7ddb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,8 +119,7 @@ GTAGS
 /emacs/Makefile.in
 /emacs/Makefile
 /emacs/guix-autoloads.el
-/emacs/guix-init.el
-/emacs/guix-profiles.el
+/emacs/guix-config.el
 /doc/os-config-bare-bones.texi
 /doc/os-config-desktop.texi
 /doc/*.1
diff --git a/configure.ac b/configure.ac
index c873ef3..3f625ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,22 +185,21 @@ AM_MISSING_PROG([DOT], [dot])
 dnl Manual pages.
 AM_MISSING_PROG([HELP2MAN], [help2man])
 
+dnl Emacs interface.
+AM_PATH_LISPDIR
+AM_CONDITIONAL([HAVE_EMACS], [test "x$EMACS" != xno])
+
+emacsuidir="${guilemoduledir}/guix/emacs"
+AC_SUBST([emacsuidir])
+
 AC_CONFIG_FILES([Makefile
                  po/guix/Makefile.in
                  po/packages/Makefile.in
-		 guix/config.scm])
+                 guix/config.scm
+                 emacs/guix-config.el])
 
 AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix])
 AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
 AC_CONFIG_FILES([test-env],     [chmod +x test-env])
 
-dnl Emacs interface.
-AM_PATH_LISPDIR
-AM_CONDITIONAL([HAVE_EMACS], [test "x$EMACS" != "xno"])
-
-emacsuidir="${guilemoduledir}/guix/emacs"
-AC_SUBST([emacsuidir])
-AC_CONFIG_FILES([emacs/guix-init.el
-                 emacs/guix-profiles.el])
-
 AC_OUTPUT
diff --git a/emacs/guix-config.el.in b/emacs/guix-config.el.in
new file mode 100644
index 0000000..542de15
--- /dev/null
+++ b/emacs/guix-config.el.in
@@ -0,0 +1,33 @@
+;;; guix-config.el --- Compile-time configuration of Guix.
+
+;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
+
+;; This file is part of GNU Guix.
+
+;; GNU Guix 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.
+
+;; GNU Guix 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 <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(defconst guix-prefix
+  "@prefix@")
+
+(defconst guix-emacs-ui-dir
+  "@emacsuidir@")
+
+(defconst guix-local-state-dir
+  "@guix_localstatedir@"oo)
+
+(provide 'guix-config)
+
+;;; guix-config.el ends here
diff --git a/emacs/guix-init.el b/emacs/guix-init.el
new file mode 100644
index 0000000..353bb27
--- /dev/null
+++ b/emacs/guix-init.el
@@ -0,0 +1,20 @@
+(require 'guix-config)
+(require 'guix-autoloads)
+
+(defvar guix-load-path
+  (replace-regexp-in-string "${prefix}" guix-prefix guix-emacs-ui-dir)
+  "Directory with scheme files for \"guix.el\" package.")
+
+(defcustom guix-package-enable-at-startup t
+  "If non-nil, activate Emacs packages installed in a user profile.
+Set this variable to nil before requiring `guix-init' file to
+avoid loading autoloads of Emacs packages installed in
+`guix-user-profile'."
+  :type 'boolean
+  :group 'guix)
+
+(when guix-package-enable-at-startup
+  (require 'guix-emacs)
+  (guix-emacs-load-autoloads 'all))
+
+(provide 'guix-init)
diff --git a/emacs/guix-init.el.in b/emacs/guix-init.el.in
deleted file mode 100644
index 728bc37..0000000
--- a/emacs/guix-init.el.in
+++ /dev/null
@@ -1,19 +0,0 @@
-(require 'guix-autoloads)
-
-(defvar guix-load-path
-  (replace-regexp-in-string "${prefix}" "@prefix@" "@emacsuidir@")
-  "Directory with scheme files for \"guix.el\" package.")
-
-(defcustom guix-package-enable-at-startup t
-  "If non-nil, activate Emacs packages installed in a user profile.
-Set this variable to nil before requiring `guix-init' file to
-avoid loading autoloads of Emacs packages installed in
-`guix-user-profile'."
-  :type 'boolean
-  :group 'guix)
-
-(when guix-package-enable-at-startup
-  (require 'guix-emacs)
-  (guix-emacs-load-autoloads 'all))
-
-(provide 'guix-init)
diff --git a/emacs/guix-profiles.el b/emacs/guix-profiles.el
new file mode 100644
index 0000000..80d5d17
--- /dev/null
+++ b/emacs/guix-profiles.el
@@ -0,0 +1,65 @@
+;;; guix-profiles.el --- Guix profiles
+
+;; Copyright © 2014 Alex Kost <alezost@gmail.com>
+
+;; This file is part of GNU Guix.
+
+;; GNU Guix 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.
+
+;; GNU Guix 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 <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'guix-config)
+
+(defvar guix-user-profile
+  (expand-file-name "~/.guix-profile")
+  "User profile.")
+
+(defvar guix-default-profile
+  (concat (or (getenv "NIX_STATE_DIR")
+              (concat guix-local-state-dir "/guix"))
+          "/profiles/per-user/"
+          (getenv "USER")
+          "/guix-profile")
+  "Default Guix profile.")
+
+(defvar guix-current-profile guix-default-profile
+  "Current profile.")
+
+(defun guix-profile-prompt (&optional default)
+  "Prompt for profile and return it.
+Use DEFAULT as a start directory.  If it is nil, use
+`guix-current-profile'."
+  (let* ((path (read-file-name "Profile: "
+                               (file-name-directory
+                                (or default guix-current-profile))))
+         (path (directory-file-name (expand-file-name path))))
+    (if (string= path guix-user-profile)
+        guix-default-profile
+      path)))
+
+(defun guix-set-current-profile (path)
+  "Set `guix-current-profile' to PATH.
+Interactively, prompt for PATH.  With prefix, use
+`guix-default-profile'."
+  (interactive
+   (list (if current-prefix-arg
+             guix-default-profile
+           (guix-profile-prompt))))
+  (setq guix-current-profile path)
+  (message "Current profile has been set to '%s'."
+           guix-current-profile))
+
+(provide 'guix-profiles)
+
+;;; guix-profiles.el ends here
diff --git a/emacs/guix-profiles.el.in b/emacs/guix-profiles.el.in
deleted file mode 100644
index 1e43707..0000000
--- a/emacs/guix-profiles.el.in
+++ /dev/null
@@ -1,62 +0,0 @@
-;;; guix-profiles.el --- Guix profiles
-
-;; Copyright © 2014 Alex Kost <alezost@gmail.com>
-
-;; This file is part of GNU Guix.
-
-;; GNU Guix 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.
-
-;; GNU Guix 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 <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(defvar guix-user-profile
-  (expand-file-name "~/.guix-profile")
-  "User profile.")
-
-(defvar guix-default-profile
-  (concat (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix")
-          "/profiles/per-user/"
-          (getenv "USER")
-          "/guix-profile")
-  "Default Guix profile.")
-
-(defvar guix-current-profile guix-default-profile
-  "Current profile.")
-
-(defun guix-profile-prompt (&optional default)
-  "Prompt for profile and return it.
-Use DEFAULT as a start directory.  If it is nil, use
-`guix-current-profile'."
-  (let* ((path (read-file-name "Profile: "
-                               (file-name-directory
-                                (or default guix-current-profile))))
-         (path (directory-file-name (expand-file-name path))))
-    (if (string= path guix-user-profile)
-        guix-default-profile
-      path)))
-
-(defun guix-set-current-profile (path)
-  "Set `guix-current-profile' to PATH.
-Interactively, prompt for PATH.  With prefix, use
-`guix-default-profile'."
-  (interactive
-   (list (if current-prefix-arg
-             guix-default-profile
-           (guix-profile-prompt))))
-  (setq guix-current-profile path)
-  (message "Current profile has been set to '%s'."
-           guix-current-profile))
-
-(provide 'guix-profiles)
-
-;;; guix-profiles.el ends here