cor/ebuild-autogen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix submodule update.

Browse source 
Optimize rust cargo integration.
This commit is contained in:
Cor Legemaat 2026-03-30 14:10:45 +02:00
commit 366ef4119f
4 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ebuild/cli.scm
View file

@ -143,6 +143,7 @@ git repository.")
(option-ref options 'ebuild-clean)
(option-ref options 'cache-clean))
(begin (display "Warning, ignoring min-interval to clean files!")
(newline)
(current-time))
(subtract-duration
(current-time)

30
ebuild/gen.scm
View file

@ -348,8 +348,14 @@
'()))
'()))))
(define-public ebuild-default-post-ebuild
(lambda (ebuild parms)
(system* "ebuild" ebuild "manifest")
'()))
(define-public ebuild-default-post
(lambda (ebuilds parms)
(lambda* (ebuilds parms
#:key (ebuild-callback ebuild-default-post-ebuild))
;; (display "parms:") (newline)
;; (pretty-print parms)
;; (display "ebuild-created:") (newline)
@ -366,13 +372,23 @@
(out-file ebuild)
"\" does not exists!!!")))
(if (string-suffix? ".ebuild" (out-file ebuild))
(system* "ebuild" (out-file ebuild) "manifest")))))
(ebuild-callback (out-file ebuild) parms)
'()))))
(cond ((null? ebuilds) '())
((assoc-ref ebuilds 'pkg-files)
(map run-post (assoc-ref ebuilds 'pkgfiles)))
(assoc-set! ebuilds
'distfiles
(append (append-map run-post
(assoc-ref ebuilds 'pkgfiles))
(assoc-ref ebuilds 'distfiles))))
((assoc-ref (car ebuilds) 'pkgfiles)
(map run-post (assoc-ref (car ebuilds) 'pkgfiles))))
ebuilds)))
(cons (assoc-set! (car ebuilds)
'distfiles
(append (append-map run-post
(assoc-ref (car ebuilds)
'pkgfiles))
(assoc-ref (car ebuilds) 'distfiles)))
(cdr ebuilds)))))))
;;Procedure to generate the required ebuild from the given releases.
(define-public ebuild-gen
@ -385,6 +401,7 @@
(template #f)
(gen-ebuild-hook ebuild-from-tmpl)
(post-hook ebuild-default-post)
(post-ebuild-hook ebuild-default-post-ebuild)
ignore-autogen-diff)
""
(if (>= (assoc-ref parms 'verbosity) verbosity-notice)
@ -418,6 +435,7 @@
#:tmpl template
#:ignore-diff ignore-autogen-diff)
ebuild-man)))
(post-hook ebuild-created vars)))
(post-hook ebuild-created vars
#:ebuild-callback post-ebuild-hook)))
version-list)))
ebuilds)))

2
ebuild/gen/nodejs.scm
View file

@ -358,6 +358,7 @@
(template #f)
(gen-ebuild-hook gen-nodejs-ebuild)
(post-hook ebuild-default-post)
(post-ebuild-hook ebuild-default-post-ebuild)
ignore-autogen-diff)
""
((@ (ebuild gen) ebuild-gen)
@ -368,4 +369,5 @@
#:template template
#:gen-ebuild-hook gen-ebuild-hook
#:post-hook post-hook
#:post-ebuild-hook post-ebuild-hook
#:ignore-autogen-diff ignore-autogen-diff)))

11
ebuild/repo.scm
View file

@ -86,14 +86,9 @@
(define-public repo-update-src
(lambda (path)
""
(let ((repo (submodule-lookup (repository-open path)
"autogen"))
(old-cwd (getcwd)))
;;Not working for updates only init?
;;(submodule-update repo)
(chdir (string-join (list path "autogen")
file-name-separator-string))
(system* "/usr/bin/git" "pull")
(let ((old-cwd (getcwd)))
(chdir path)
(system* "/usr/bin/git" "submodule" "update" "--remote" "--merge")
(chdir old-cwd))))
;; TODO guile-git method...