From 006728966a7bb4c6fd0d8d4b05b71fea47645765 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 6 Nov 2016 10:42:57 +0100 Subject: gnu: java-hamcrest-core: Update upstream location. The checksum changed since the new location's archive contains no jar-files (except those of external libraries) and line endings are different. * gnu/packages/java.scm (java-hamcrest-core)[source]: Update source uri and checksum. [snippet]: Remove directory "lib" completely. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 36c10d0fd0..f6960dab0a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1180,16 +1180,17 @@ an Ant task that extends the built-in @code{jar} task.") (version "1.3") (source (origin (method url-fetch) - (uri (string-append "https://hamcrest.googlecode.com/files/" - "hamcrest-" version ".tgz")) + (uri (string-append "https://github.com/hamcrest/JavaHamcrest/" + "archive/hamcrest-java-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1hi0jv0zrgsf4l25aizxrgvxpsrmdklsmvw0jzwz7zv9s108whn6")) + "11g0s105fmwzijbv08lx8jlb521yravjmxnpgdx08fvg1kjivhva")) (modules '((guix build utils))) (snippet '(begin - ;; Delete bundled jar archives. - (for-each delete-file (find-files "." "\\.jar$")) + ;; Delete bundled thirds-party jar archives. + (delete-file-recursively "lib") #t)))) (build-system ant-build-system) (arguments -- cgit v1.2.3 From e5213cd63b1cdda7fa900c7f44eaf990330c6d55 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 6 Nov 2016 10:55:08 +0100 Subject: gnu: java-hamcrest-core: Remove wrong source file-name. The sources file-name was set to "java-hamcrest-core", while it contains not only the "core" but all of hamcrest. Further the source archive already has the correct name. * gnu/packages/java.scm (java-hamcrest-core)[source]: Remove file-name. --- gnu/packages/java.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f6960dab0a..612a2c2d8a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1182,7 +1182,6 @@ an Ant task that extends the built-in @code{jar} task.") (method url-fetch) (uri (string-append "https://github.com/hamcrest/JavaHamcrest/" "archive/hamcrest-java-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "11g0s105fmwzijbv08lx8jlb521yravjmxnpgdx08fvg1kjivhva")) -- cgit v1.2.3 From fab959d30811b0c6cf0a47d2ab514a8883a8f115 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 6 Nov 2016 11:49:12 +0100 Subject: gnu: java-hamcrest-core: Fix build. Since we now remove the directory "lib" from the source, we need to create a directory where build.xml searches for .jar-files. * gnu/packages/java.scm (java-hamcrest-core)[pahases]: New phase create-dummy-directories. --- gnu/packages/java.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 612a2c2d8a..df8a970e0c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1237,6 +1237,12 @@ private Method[] allMethods = getSortedMethods();"))))) (string-append (assoc-ref inputs "java-qdox-1.12") "/share/java/qdox.jar"))) #t)) + ;; build.xml searches for .jar files in this directoy, which + ;; we remove from the source archive. + (add-before 'build 'create-dummy-directories + (lambda _ + (mkdir-p "lib/integration") + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (install-file (string-append "build/hamcrest-core-" -- cgit v1.2.3