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

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

[Oleg Pykhalov]

* 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

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

[Maxim Cournoyer]

On May 18, 2018 12:27:16 PM UTC, Oleg Pykhalov <go.wigust@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,

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

[Oleg Pykhalov]

[-- Attachment #1.1: Type: text/plain, Size: 582 bytes --]

Hello Maxim,

Thank you for review.

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

> On May 18, 2018 12:27:16 PM UTC, Oleg Pykhalov <go.wigust@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?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: gnu: cmake: Delete Emacs library. --]
[-- Type: text/x-patch, Size: 1201 bytes --]

From 46cb6d48c7fd7712fca1d5619d02eba992b9182a Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@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\\)") ""))))
          (add-before 'configure 'patch-bin-sh
            (lambda _
              ;; Replace "/bin/sh" by the right path in... a lot of
-- 
2.17.0


[-- Attachment #1.3: Type: text/plain, Size: 18 bytes --]


[…]

Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Maxim Cournoyer]

Hi Oleg,

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

> Hello Maxim,
>
> Thank you for review.
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>
>> On May 18, 2018 12:27:16 PM UTC, Oleg Pykhalov <go.wigust@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@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

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

[Oleg Pykhalov]

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

Maxim Cournoyer <maxim.cournoyer@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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Oleg Pykhalov]

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

Oleg Pykhalov <go.wigust@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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Marius Bakke]

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

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

> Maxim Cournoyer <maxim.cournoyer@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!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]