From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3Ush-0000ON-Lx for guix-patches@gnu.org; Sat, 14 Oct 2017 18:26:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3Usd-0007uO-G6 for guix-patches@gnu.org; Sat, 14 Oct 2017 18:26:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60203) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e3Usd-0007u8-By for guix-patches@gnu.org; Sat, 14 Oct 2017 18:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e3Usd-00061M-6p for guix-patches@gnu.org; Sat, 14 Oct 2017 18:26:03 -0400 Subject: [bug#28841] [PATCH 03/24] gnu: Add java-eclipse-jetty-test-helper. Resent-Message-ID: From: julien@lepiller.eu Date: Sun, 15 Oct 2017 00:23:28 +0200 Message-Id: <20171014222349.12902-3-julien@lepiller.eu> In-Reply-To: <20171014222349.12902-1-julien@lepiller.eu> References: <20171014233216.49c852f7@lepiller.eu> <20171014222349.12902-1-julien@lepiller.eu> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28841@debbugs.gnu.org From: Julien Lepiller * gnu/packages/java.scm (java-eclipse-jetty-test-helper): New variable. --- gnu/packages/java.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4561b92d8..d8920a097 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6101,3 +6101,51 @@ Servlet, JavaServer Pages, Java Expression Language and Java WebSocket technologies. The Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket specifications are developed under the Java Community Process.") (license license:asl2.0))) + +(define-public java-eclipse-jetty-test-helper + (package + (name "java-eclipse-jetty-test-helper") + (version "4.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/eclipse/jetty.toolchain/" + "archive/jetty-test-helper-" version ".tar.gz")) + (sha256 + (base32 + "1jd6r9wc26fa11si4rn2gvy8ml8q4zw1nr6v04mjp8wvwpgvzwx5")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "eclipse-jetty-test-helper.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:jdk ,icedtea-8 + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + (chdir "jetty-test-helper"))) + (add-before 'build 'fix-build-path + (lambda _ + ;; FIXME: + ;; This file assumes that the build directory is named "target" + ;; but it is not the case with our ant-build-system. Once we have + ;; maven though, we will have to rebuild this package because this + ;; assumption is correct with maven-build-system. + (substitute* + "src/main/java/org/eclipse/jetty/toolchain/test/MavenTestingUtils.java" + (("\"target\"") "\"build\"") + (("\"tests\"") "\"test-classes\"")))) + (add-before 'check 'fix-paths + (lambda _ + (with-directory-excursion "src/test/java/org/eclipse/jetty/toolchain/test" + (substitute* '("FSTest.java" "OSTest.java" "TestingDirTest.java" + "MavenTestingUtilsTest.java") + (("target/tests") "build/test-classes") + (("\"target") "\"build")))))))) + (inputs + `(("junit" ,java-junit) + ("hamcrest" ,java-hamcrest-all))) + (home-page "https://www.eclipse.org/jetty/") + (synopsis "Helper classes for jetty tests") + (description "This packages contains helper classes for testing jetty.") + (license (list license:epl1.0 license:asl2.0)))) -- 2.14.2