~ruther/guix-local

a6343af22161b21ddbc4143a2b6a60d1ee860eb0 — Marius Bakke 3 years ago fa9ad4b
build-system/ant: Avoid usage of (guix build syscalls).

* guix/build/ant-build-system.scm (strip-jar-timestamps): Use MKDTEMP from
Guile core rather than MKDTEMP!.
* guix/build/java-utils.scm (install-jar-file-with-pom): Likewise.
2 files changed, 2 insertions(+), 4 deletions(-)

M guix/build/ant-build-system.scm
M guix/build/java-utils.scm
M guix/build/ant-build-system.scm => guix/build/ant-build-system.scm +1 -2
@@ 19,7 19,6 @@

(define-module (guix build ant-build-system)
  #:use-module ((guix build gnu-build-system) #:prefix gnu:)
  #:use-module (guix build syscalls)
  #:use-module (guix build utils)
  #:use-module (sxml simple)
  #:use-module (ice-9 match)


@@ 201,7 200,7 @@ dependencies of this jar file."
repack them.  This is necessary to ensure that archives are reproducible."
  (define (repack-archive jar)
    (format #t "repacking ~a\n" jar)
    (let* ((dir (mkdtemp! "jar-contents.XXXXXX"))
    (let* ((dir (mkdtemp "jar-contents.XXXXXX"))
           (manifest (string-append dir "/META-INF/MANIFEST.MF")))
      (with-directory-excursion dir
        (invoke "jar" "xf" jar))

M guix/build/java-utils.scm => guix/build/java-utils.scm +1 -2
@@ 21,7 21,6 @@

(define-module (guix build java-utils)
  #:use-module (guix build utils)
  #:use-module (guix build syscalls)
  #:use-module (guix build maven pom)
  #:use-module (guix build maven plugin)
  #:use-module (ice-9 match)


@@ 83,7 82,7 @@ fetched."
  "Unpack the jar archive, add the pom file, and repack it.  This is necessary
to ensure that maven can find dependencies."
  (format #t "adding ~a to ~a\n" pom-file jar)
  (let* ((dir (mkdtemp! "jar-contents.XXXXXX"))
  (let* ((dir (mkdtemp "jar-contents.XXXXXX"))
         (manifest (string-append dir "/META-INF/MANIFEST.MF"))
         (pom (get-pom pom-file))
         (artifact (pom-artifactid pom))