[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: PATCH in need for discussion: vim-build-system
From: |
ng0 |
Subject: |
Re: PATCH in need for discussion: vim-build-system |
Date: |
Sun, 2 Jul 2017 19:19:51 +0000 |
Efraim Flashner transcribed 18K bytes:
> On Sun, Jul 02, 2017 at 04:19:26PM +0000, ng0 wrote:
> > The appended two patches fail, for a reason which is not apparent
> > to me (and no reason I could capture).
> >
> > This is mostly based on the font-build-system with some additions,
> > it's more or less the same except for the unpack and install phases.
> > --
> > ng0
> > GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
> > GnuPG: https://n0is.noblogs.org/my-keys
> > https://www.infotropique.org https://krosos.org
>
> > From 9490336916ce4517c64875cc470ccadfad4a27ba Mon Sep 17 00:00:00 2001
> > From: ng0 <address@hidden>
> > Date: Sun, 2 Jul 2017 16:07:48 +0000
> > Subject: [PATCH 1/2] build-system: Add 'vim-build-system'.
> >
> > * Makefile.am (MODULES): Add 'guix/build-system/vim.scm' and
> > 'guix/build/vim-build-system.scm'.
> > * guix/build-system/vim.scm: New file.
> > * guix/build/vim-build-system.scm: New file.
>
> I couldn't get it to build, but here's the changes I made
>
>
> --
> Efraim Flashner <address@hidden> אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted
> diff --git a/guix/build-system/vim.scm b/guix/build-system/vim.scm
> index 6c074fd60..adc0a9fdd 100644
> --- a/guix/build-system/vim.scm
> +++ b/guix/build-system/vim.scm
> @@ -35,7 +35,7 @@
> ;; Code:
>
> (define %vim-build-system-modules
> - ;; Build-side moduels imported by default.
> + ;; Build-side modules imported by default.
> `((guix build vim-build-system)
> ,@%gnu-build-system-modules))
>
> diff --git a/guix/build/vim-build-system.scm b/guix/build/vim-build-system.scm
> index 5c55f1256..d97d44cf9 100644
> --- a/guix/build/vim-build-system.scm
> +++ b/guix/build/vim-build-system.scm
> @@ -49,33 +49,37 @@ archive, a directory or a '.vim' file."
> (let* ((out (assoc-ref outputs "out"))
> (source (getcwd))
> (vimfiles (string-append out "/share/vim/vimfiles")))
> - (when (file-exists? "autoload")
> - (copy-recursively "autoload"
> - (string-append vimfiles "/autoload")))
> - (when (file-exists? "afer")
> - (copy-recursively "after"
> - (string-append vimfiles "/after")))
> - (when (file-exists? "doc")
> - (copy-recursively "doc"
> - (string-append vimfiles "/doc")))
> - (when (file-exists? "ftdetect")
> - (copy-recursively "ftdetect"
> - (string-append vimfiles "/ftdetect")))
> - (when (file-exists? "ftplugin")
> - (copy-recursively "ftplugin"
> - (string-append vimfiles "/ftplugin")))
> - (when (file-exists? "indent")
> - (copy-recursively "indent"
> - (string-append vimfiles "/indent")))
> - (when (file-exists? "plugin")
> - (copy-recursively "plugin"
> - (string-append vimfiles "/plugin")))
> - (when (file-exists? "rplugin")
> - (copy-recursively "rplugin"
> - (string-append vimfiles "/rplugin")))
> - (when (file-exists? "syntax")
> - (copy-recursively "syntax"
> - (string-append vimfiles "/syntax")))
> + (lambda (dir)
> + (when (file-exists? dir)
> + (copy-recursively dir (string-append vimfiles "/" dir))))
> + (list "autoload" "after" "doc" "ftdetect" "ftplugin" "indent" "plugin"
> "rplugin" "syntax")
> + ;(when (file-exists? "autoload")
> + ; (copy-recursively "autoload"
> + ; (string-append vimfiles "/autoload")))
> + ;(when (file-exists? "after")
> + ; (copy-recursively "after"
> + ; (string-append vimfiles "/after")))
> + ;(when (file-exists? "doc")
> + ; (copy-recursively "doc"
> + ; (string-append vimfiles "/doc")))
> + ;(when (file-exists? "ftdetect")
> + ; (copy-recursively "ftdetect"
> + ; (string-append vimfiles "/ftdetect")))
> + ;(when (file-exists? "ftplugin")
> + ; (copy-recursively "ftplugin"
> + ; (string-append vimfiles "/ftplugin")))
> + ;(when (file-exists? "indent")
> + ; (copy-recursively "indent"
> + ; (string-append vimfiles "/indent")))
> + ;(when (file-exists? "plugin")
> + ; (copy-recursively "plugin"
> + ; (string-append vimfiles "/plugin")))
> + ;(when (file-exists? "rplugin")
> + ; (copy-recursively "rplugin"
> + ; (string-append vimfiles "/rplugin")))
> + ;(when (file-exists? "syntax")
> + ; (copy-recursively "syntax"
> + ; (string-append vimfiles "/syntax")))
> #t))
>
> (define %standard-phases
I think I will merge this into my patch, it's much a much
more compact way to express what I wanted.
Ideally we could define an "excludes" list and copy everything
else over to the output, as that's how vim packages work.
--
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org
signature.asc
Description: PGP signature