GNU bug report logs - #31490
[PATCH] gnu: Add emacs-cmake-mode.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 31490 in the body.
You can then email your comments to 31490 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH] gnu: Add emacs-cmake-mode.
Date: Fri, 18 May 2018 15:27:16 +0300

* gnu/packages/cmake.scm (emacs-cmake-mode): New public variable.
---
 gnu/packages/cmake.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index e6c5c4e79..eba7a92c0 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -206,3 +206,20 @@ and workspaces that can be used in the compiler environment of your choice.")
     (inputs
      `(("rhash" ,rhash)
        ,@(package-inputs cmake)))))
+
+(define-public emacs-cmake-mode
+  (package
+    (inherit cmake)
+    (name "emacs-cmake-mode")
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-elisp
+           ;; Elisp directory is not in root of the source.
+           (lambda _
+             (chdir "Auxiliary"))))))
+    (synopsis "Emacs major mode for editing Cmake expressions")
+    (description "@code{cmakeos-mode} provides an Emacs major mode for editing
+Cmake files.  It supports syntax highlighting, indenting and refilling of
+comments.")))
-- 
2.17.0

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: guix-patches <at> gnu.org, Oleg Pykhalov <go.wigust <at> gmail.com>,
 31490 <at> debbugs.gnu.org
Subject: Re: [bug#31490] [PATCH] gnu: Add emacs-cmake-mode.
Date: Fri, 18 May 2018 13:07:07 +0000

On May 18, 2018 12:27:16 PM UTC, Oleg Pykhalov <go.wigust <at> gmail.com> wrote:
>* gnu/packages/cmake.scm (emacs-cmake-mode): New public variable.
>---
> gnu/packages/cmake.scm | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
>diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
>index e6c5c4e79..eba7a92c0 100644
>--- a/gnu/packages/cmake.scm
>+++ b/gnu/packages/cmake.scm
>@@ -206,3 +206,20 @@ and workspaces that can be used in the compiler
>environment of your choice.")
>     (inputs
>      `(("rhash" ,rhash)
>        ,@(package-inputs cmake)))))
>+
>+(define-public emacs-cmake-mode
>+  (package
>+    (inherit cmake)
>+    (name "emacs-cmake-mode")
>+    (build-system emacs-build-system)
>+    (arguments
>+     `(#:phases
>+       (modify-phases %standard-phases
>+         (add-after 'unpack 'chdir-elisp
>+           ;; Elisp directory is not in root of the source.
>+           (lambda _
>+             (chdir "Auxiliary"))))))
>+    (synopsis "Emacs major mode for editing Cmake expressions")
>+    (description "@code{cmakeos-mode} provides an Emacs major mode for
>editing
>+Cmake files.  It supports syntax highlighting, indenting and refilling
>of
>+comments.")))

Thanks for packaging it. Should we delete the Emacs mode files from our cmake package to not have duplication in the store when installing both CMake and emacs-cmake-mode?

I haven't tested it but it LGTM.

Maxim


Hi,

Message #14 received at 31490 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 31490 <at> debbugs.gnu.org
Subject: Re: [bug#31490] [PATCH] gnu: Add emacs-cmake-mode.
Date: Tue, 22 May 2018 08:43:41 +0300

[Message part 1 (text/plain, inline)]

Hello Maxim,

Thank you for review.

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> On May 18, 2018 12:27:16 PM UTC, Oleg Pykhalov <go.wigust <at> gmail.com> wrote:
>>* gnu/packages/cmake.scm (emacs-cmake-mode): New public variable.
>>---
>> gnu/packages/cmake.scm | 17 +++++++++++++++++
>> 1 file changed, 17 insertions(+)
>>

[…]

> Should we delete the Emacs mode files from our cmake package to not
> have duplication in the store when installing both CMake and
> emacs-cmake-mode?

Sure, we should.  Could I push the following patch to core-updates?

[0001-gnu-cmake-Delete-Emacs-library.patch (text/x-patch, attachment)]

[Message part 3 (text/plain, inline)]

[…]

Oleg.

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 31490 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Oleg Pykhalov <go.wigust <at> gmail.com>
Cc: 31490 <at> debbugs.gnu.org
Subject: Re: [bug#31490] [PATCH] gnu: Add emacs-cmake-mode.
Date: Tue, 22 May 2018 09:16:06 -0400

Hi Oleg,

Oleg Pykhalov <go.wigust <at> gmail.com> writes:

> Hello Maxim,
>
> Thank you for review.
>
> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>
>> On May 18, 2018 12:27:16 PM UTC, Oleg Pykhalov <go.wigust <at> gmail.com> wrote:
>>>* gnu/packages/cmake.scm (emacs-cmake-mode): New public variable.
>>>---
>>> gnu/packages/cmake.scm | 17 +++++++++++++++++
>>> 1 file changed, 17 insertions(+)
>>>
>
> […]
>
>> Should we delete the Emacs mode files from our cmake package to not
>> have duplication in the store when installing both CMake and
>> emacs-cmake-mode?
>
> Sure, we should.  Could I push the following patch to core-updates?
>
> From 46cb6d48c7fd7712fca1d5619d02eba992b9182a Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust <at> gmail.com>
> Date: Tue, 22 May 2018 07:41:45 +0300
> Subject: [PATCH] gnu: cmake: Delete Emacs library.
>
> * gnu/packages/finance.scm (cmake)[arguments]: Delete Emacs library.
> ---
>  gnu/packages/cmake.scm | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
> index e9fa86641..5f4a3c846 100644
> --- a/gnu/packages/cmake.scm
> +++ b/gnu/packages/cmake.scm
> @@ -85,6 +85,13 @@
>             " --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$")))
>         #:phases
>         (modify-phases %standard-phases
> +         (add-after 'unpack 'split-package
> +           ;; Remove files that have been packaged in other package recipes.
> +           (lambda _
> +             (delete-file "Auxiliary/cmake-mode.el")
> +             (substitute* "Auxiliary/CMakeLists.txt"
> +               (("install\\(FILES cmake-mode.el \
> +DESTINATION \\$\\{CMAKE_DATA_DIR\\}/editors/emacs\\)") ""))))

Nitpick: I'd use a regexp to match the text following cmake-mode.el on
the line to make it more resilient to any future changes. Otherwise this
LGTM :)

Maxim

Message #20 received at 31490 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 31490 <at> debbugs.gnu.org, 31490-done <at> debbugs.gnu.org
Subject: Re: [bug#31490] [PATCH] gnu: Add emacs-cmake-mode.
Date: Tue, 22 May 2018 17:25:43 +0300

[Message part 1 (text/plain, inline)]

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

[…]

>> +             (substitute* "Auxiliary/CMakeLists.txt"
>> +               (("install\\(FILES cmake-mode.el \
>> +DESTINATION \\$\\{CMAKE_DATA_DIR\\}/editors/emacs\\)") ""))))
>
> Nitpick: I'd use a regexp to match the text following cmake-mode.el on
> the line to make it more resilient to any future changes. Otherwise this
> LGTM :)

Agree, pushed as f037673c3133ae7453794f1f62eecebf9d06b092
and emacs-cmake-mode bbdf36666b82eae0a583d7124d8117801969570c

Oleg.

[signature.asc (application/pgp-signature, inline)]

Message #28 received at 31490 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 31490 <at> debbugs.gnu.org, 31490-done <at> debbugs.gnu.org
Subject: Re: [bug#31490] [PATCH] gnu: Add emacs-cmake-mode.
Date: Tue, 22 May 2018 17:40:59 +0300

[Message part 1 (text/plain, inline)]

Oleg Pykhalov <go.wigust <at> gmail.com> writes:

[…]

> Agree, pushed as f037673c3133ae7453794f1f62eecebf9d06b092
> and emacs-cmake-mode bbdf36666b82eae0a583d7124d8117801969570c

Ah, apologies for not running ‘make’ before.  I've got an error about
missing emacs-build-system variable.  Fixed in

aa4818c33b6b2fd8d602ee93a2f53005d9472f41

Oleg.

[signature.asc (application/pgp-signature, inline)]

Message #34 received at 31490 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Oleg Pykhalov <go.wigust <at> gmail.com>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 31490 <at> debbugs.gnu.org, 31490-done <at> debbugs.gnu.org
Subject: Re: bug#31490: [PATCH] gnu: Add emacs-cmake-mode.
Date: Tue, 22 May 2018 17:21:28 +0200

[Message part 1 (text/plain, inline)]

Oleg Pykhalov <go.wigust <at> gmail.com> writes:

> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>
> […]
>
>>> +             (substitute* "Auxiliary/CMakeLists.txt"
>>> +               (("install\\(FILES cmake-mode.el \
>>> +DESTINATION \\$\\{CMAKE_DATA_DIR\\}/editors/emacs\\)") ""))))
>>
>> Nitpick: I'd use a regexp to match the text following cmake-mode.el on
>> the line to make it more resilient to any future changes. Otherwise this
>> LGTM :)
>
> Agree, pushed as f037673c3133ae7453794f1f62eecebf9d06b092

'core-updates' is currently live on Hydra:

https://hydra.gnu.org/jobset/gnu/core-updates

Since we already have substitutes for CMake and many dependents, this
commit will have to wait until the next rebuild cycle.  Can you revert
it on 'core-updates' and resubmit the patch to 'core-updates-next'?

PS: Please also end the phase on #t ;-)

Thanks!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.