From patchwork Thu Feb 23 21:00:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Pursel X-Patchwork-Id: 47362 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4824316BBF; Sun, 26 Feb 2023 00:34:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A07E01685F for ; Sun, 26 Feb 2023 00:34:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW4zM-00009U-Ln; Sat, 25 Feb 2023 19:34:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW4zK-000094-Qq for guix-patches@gnu.org; Sat, 25 Feb 2023 19:34:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW4zK-0008Rz-Hy for guix-patches@gnu.org; Sat, 25 Feb 2023 19:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW4zK-0006wP-Dz for guix-patches@gnu.org; Sat, 25 Feb 2023 19:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60976] [PATCH v3 4/4] java-jericho-html: Using bzr-fetch and complete testing. Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Feb 2023 00:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60976 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60976@debbugs.gnu.org Received: via spool by 60976-submit@debbugs.gnu.org id=B60976.167737160926639 (code B ref 60976); Sun, 26 Feb 2023 00:34:02 +0000 Received: (at 60976) by debbugs.gnu.org; 26 Feb 2023 00:33:29 +0000 Received: from localhost ([127.0.0.1]:41860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW4ym-0006va-N2 for submit@debbugs.gnu.org; Sat, 25 Feb 2023 19:33:29 -0500 Received: from mail-pj1-f47.google.com ([209.85.216.47]:33400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW4yk-0006vN-Tf for 60976@debbugs.gnu.org; Sat, 25 Feb 2023 19:33:27 -0500 Received: by mail-pj1-f47.google.com with SMTP id m3-20020a17090ade0300b00229eec90a7fso9165382pjv.0 for <60976@debbugs.gnu.org>; Sat, 25 Feb 2023 16:33:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:references:date:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=8glh1Qxand1Gnoc5VNCHXhXfMkVHGSvfoeljwvosL7M=; b=dCxuoykiB57WSZUtEiVkLhfBoHTzPatIYPhdCmkiq0gwWL7r8RaLhapQ87anJSVVCK 5GJlaq7K2YckG8wfE1rVjCWB77VCYAQMhpfjRSJE3flOyemftTIyPslqDm9kNw7HPBp4 T8mTtRg4Q2InaHK+Um8SuPcXrxlD8hmjQ9unrk7PS2A6HtJ9fdS3RHzx66z2EONOFGTu m06E2AMKpyP3aXbhqIiu8IfmNfLWXbqWgXJ4iAZvr0rlXoF2EZbpbslr5XO4Xyngkflt wAJ/4nfHQRRIj8NdnQqw6fw1Czs6a190f2OEMk5U8Y1Lo4M8pNjQLhlGowS7zswu0Z0L 9mtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:references:date:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8glh1Qxand1Gnoc5VNCHXhXfMkVHGSvfoeljwvosL7M=; b=JZpkyb5LB1tYM8DW/9T5ZYFzqQyEKyHaRJzFyeBTGWY/G5rElzj8S1EofcGpj5Oz76 QTaAJ4bZlTG03bdri4Fn+j2mhzBX/QWI4ER/i+tXwpSu3IdCNAFn6zukO+DCZljuG8jM VsZn2ep6eZ2CmnnJTKOoYG9//RyGIrSDqyJodj8ItsIOfWGXvno++fwjhJUvhYcntngt 1PcLHbjNz3+gX2RbyCKeEH/OgSDYscmKTKMs/M6GE9VB0aO/S3O1rO0iZTn3eRRNwjOM SuinsLadfqHSq4xucN5QdIDh/PGuFa+7474zANt21E+HYoO7i1TnVUGGJ9I+CN3Pjn+C lsiQ== X-Gm-Message-State: AO0yUKVi2SXdTWkqjE6sm+cPsyTbl058o0sK/6xAFaXqezXzfB9g5wFk 7RSCt3u1tyhZiflelL0CH+bv+RN9o5o= X-Google-Smtp-Source: AK7set/Eqsp36RFpTyepFlexg8LUXo0bO86JPK+4rngZO7Ewfn2/hy/xXDQ+fOGBG39Q9B794rQPYQ== X-Received: by 2002:a17:903:124f:b0:19c:be03:d1a3 with SMTP id u15-20020a170903124f00b0019cbe03d1a3mr11182615plh.40.1677371600542; Sat, 25 Feb 2023 16:33:20 -0800 (PST) Received: from Ginko ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id g12-20020a170902fe0c00b0019a7f493151sm1770837plj.212.2023.02.25.16.33.19 for <60976@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 16:33:19 -0800 (PST) From: Frank Pursel In-Reply-To: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> Date: Thu, 23 Feb 2023 13:00:27 -0800 References: <1351eea169a28d30040826b14079fb49de3c98b8.1677369969.git.frank.pursel@gmail.com> Message-Id: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/java-xml.scm | 118 +++++++++++++++----------------------- 1 file changed, 46 insertions(+), 72 deletions(-) diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm index 9cf256549b..739b525fa0 100644 --- a/gnu/packages/java-xml.scm +++ b/gnu/packages/java-xml.scm @@ -30,6 +30,7 @@ (define-module (gnu packages java-xml) #:use-module (gnu packages compression) #:use-module (gnu packages gtk) #:use-module (gnu packages java) + #:use-module (guix bzr-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix gexp) #:use-module (guix packages) @@ -39,82 +40,55 @@ (define-module (gnu packages java-xml) #:use-module (guix utils)) (define-public java-jericho-html - (let ((ver "3.4") - (hash "1i7z3b8yamgkm7p3pv9qzv8l2kw15ccxy1aj9mpbf66kzkkds51i") - (internal-name "jericho-html")) - (package - (name "java-jericho-html") - (version ver) - (source (origin - (method url-fetch/zipbomb) - (uri (string-append - "https://sourceforge.net/projects/jerichohtml" - "/files/jericho-html/3.4/jericho-html-3.4.zip/download")) - (sha256 - (base32 - hash)) - (modules '((guix build utils))) - (snippet '(begin - (format #t "~%~a~%" "Removing sourced jar files.") - (for-each (lambda (jarf) - (delete-file jarf) - (format #t "Deleted: ~a~%" jarf)) - (find-files "." "\\.jar$")))))) - (build-system ant-build-system) - (arguments - `(#:jar-name (string-append ,name ".jar") - #:source-dir (string-append ,internal-name "-" - ,ver "/src/") - #:test-dir (string-append ,internal-name "-" - ,ver "/test/") - #:test-exclude (list "**/StAXTest.java" - "**/NodeIteratorTest.java" - "**/ScriptTest.java" - "**/SegmentGetStyleURISegmentsTest.java" - "**/SegmentTest.java" - "**/StreamedSourceTest.java" - "**/HTMLSanitiserTest.java") - #:phases (modify-phases %standard-phases - (add-before 'build 'add-ant-env-options - (lambda* _ - (setenv "ANT_OPTS" "-Dfile.encoding=iso-8859-1") #t)) - (add-after 'build 'check-prep - (lambda* (#:key source #:allow-other-keys) - (let* ((cwd (getcwd)) - (jericho-test (string-append cwd "/" ,internal-name - "-" ,ver "/test")) - (test (string-append jericho-test "/test")) - (test-data (string-append jericho-test "/data")) - (test-src (string-append jericho-test "/src")) - (test-src-data (string-append test-src "/data"))) - (format #t "~%Check Prep dir: ~s\n" cwd) - (substitute* "build.xml" - (("\\$\\{test\\.home\\}/java") - "${test.home}/src")) - (mkdir-p (string-append cwd "/build/test-classes")) - (copy-recursively (string-append cwd - "/" - ,internal-name - "-" - ,ver - "/samples/console/classes") - (string-append cwd - "/build/test-classes/")) - (mkdir-p test-src-data) - (copy-recursively test-data - test-src-data)) - #t))))) - (native-inputs (list java-junit java-slf4j-api java-log4j-api - java-commons-logging-minimal)) - (home-page "http://jericho.htmlparser.net/docs/index.html") - (description - "A java library allowing analysis and manipulation of + (package + (name "java-jericho-html") + (version "3.4") + (source (origin + (method bzr-fetch) + (uri + (bzr-reference + (url + "http://jerichohtml.bzr.sourceforge.net/bzr/jerichohtml") + (revision (string-append "tag:" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1zsf4i33jn05pma4y1658d6avhw7x4c12ggs96szhc06b7bxs8j0")) + (modules '((guix build utils))) + (snippet '(begin + (format #t "~%~a~%" "Removing sourced jar files.") + (for-each (lambda (jarf) + (delete-file jarf) + (format #t "Deleted: ~a~%" jarf)) + (find-files "." "\\.jar$")))))) + (build-system ant-build-system) + (arguments + `(#:jar-name (string-append ,name ".jar") + #:phases (modify-phases %standard-phases + (add-before 'build 'add-ant-env-options + (lambda* _ + (setenv "ANT_OPTS" "-Dfile.encoding=iso-8859-1") + (let ((match-str + (string-append "jerichohtml-" ,version))) + (substitute* "build.xml" + ((match-str) + ""))) + #t)) + (add-after 'build 'check-prep + (lambda* (#:key source #:allow-other-keys) + (mkdir-p "src/test/java") + #t))))) + (native-inputs (list java-junit java-slf4j-api java-log4j-api + java-commons-logging-minimal)) + (home-page "http://jericho.htmlparser.net/docs/index.html") + (description + "A java library allowing analysis and manipulation of parts of an HTML document, including server-side tags, while reproducing verbatim any unrecognised or invalid HTML. It also provides high-level HTML form manipulation functions. ") - (synopsis "Java HTML Parser library") - (license (list license:lgpl2.1+ license:asl2.0 license:epl1.0))))) + (synopsis "Java HTML Parser library") + (license (list license:lgpl2.1+ license:asl2.0 license:epl1.0)))) (define-public java-simple-xml (package