[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/87: gnu: java-ecj: Do not inherit from java-ecj-3.
From: |
guix-commits |
Subject: |
09/87: gnu: java-ecj: Do not inherit from java-ecj-3. |
Date: |
Mon, 9 Jan 2023 18:27:28 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 3b62c2804c5ca8c02de00802619766fa8fdf6948
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon Jan 9 00:38:15 2023 +0100
gnu: java-ecj: Do not inherit from java-ecj-3.
* gnu/packages/java.scm (java-ecj): Do not inherit fields from java-ecj-3.
[arguments]: Merge build phases 'fix-build.xml and 'fix-prop; remove
trailing #T.
---
gnu/packages/java.scm | 70 ++++++++++++++++++++++++---------------------------
1 file changed, 33 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 2fad09750a..7c35f146a7 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2247,43 +2247,39 @@ Main-Class:
org.eclipse.jdt.internal.compiler.batch.Main\n"
(license license:epl1.0)))
(define-public java-ecj
- (package (inherit java-ecj-3)
- (version "4.6.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "http://archive.eclipse.org/eclipse/downloads/drops4/R-"
- version
- "-201703010400/ecjsrc-"
- version
- ".jar"))
- (sha256
- (base32
- "11cfgsdgznja1pvlxkjbqykxd7pcd5655vkm7s44xmahmap15gpl"))))
- (arguments
- `(#:tests? #f ; none included
- #:build-target "build"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-build.xml
- (lambda _
- (substitute* "src/build.xml"
- (("^.*MANIFEST.*$")
- ""))
- #t))
- (add-after 'unpack 'fix-prop
- (lambda _
- (substitute* "src/build.xml"
- (("^.*properties.*$")
- "<include name=\"**/*.properties\"/>
- <include name=\"**/*.props\"/>"))
- #t))
- (add-before 'build 'chdir
- (lambda _
- (chdir "src")
- #t))
- (replace 'install (install-jars ".")))))))
+ (package
+ (name "java-ecj")
+ (version "4.6.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://archive.eclipse.org/eclipse/"
+ "downloads/drops4/R-" version "-201703010400/"
+ "ecjsrc-" version ".jar"))
+ (sha256
+ (base32
+ "11cfgsdgznja1pvlxkjbqykxd7pcd5655vkm7s44xmahmap15gpl"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:tests? #f ; none included
+ #:build-target "build"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-build.xml
+ (lambda _
+ (substitute* "src/build.xml"
+ (("^.*MANIFEST.*$")
+ "")
+ (("^.*properties.*$")
+ "<include name=\"**/*.properties\"/>
+ <include name=\"**/*.props\"/>"))))
+ (add-before 'build 'chdir
+ (lambda _ (chdir "src")))
+ (replace 'install (install-jars ".")))))
+ (home-page "https://eclipse.org")
+ (synopsis "Eclipse Java development tools core batch compiler")
+ (description "This package provides the Eclipse Java core batch compiler.")
+ (license license:epl1.0)))
(define-public java-cisd-base
(let ((revision 38938)
- branch staging updated (0d65f7daae -> d9bcd1a8d6), guix-commits, 2023/01/09
- 01/87: gnu: Move Java XML packages to new module., guix-commits, 2023/01/09
- 03/87: gnu: java-jgit-4.2: Do not build with icedtea-7., guix-commits, 2023/01/09
- 02/87: gnu: Move Java bootstrap packages to separate module., guix-commits, 2023/01/09
- 06/87: gnu: java-cisd-args4j: Use later version of ECJ., guix-commits, 2023/01/09
- 07/87: gnu: java-cisd-args4j: Do not build with icedtea-7., guix-commits, 2023/01/09
- 09/87: gnu: java-ecj: Do not inherit from java-ecj-3.,
guix-commits <=
- 12/87: gnu: ant-apache-bcel: Fix inheritance by using gexp., guix-commits, 2023/01/09
- 13/87: gnu: ant-junit: Fix inheritance by using gexp., guix-commits, 2023/01/09
- 16/87: gnu: ikiwiki: Add missing inputs., guix-commits, 2023/01/09
- 17/87: gnu: ikiwiki: Remove input labels., guix-commits, 2023/01/09
- 18/87: home: environment-variables: Return support for file-likes and gexps., guix-commits, 2023/01/09
- 19/87: home: environment-variables: Fix escaping., guix-commits, 2023/01/09
- 20/87: gnu: Add r-gg3d., guix-commits, 2023/01/09
- 27/87: gnu: Add minetest-wielded-light., guix-commits, 2023/01/09
- 04/87: gnu: java-jgit-4.2: Remove trailing #T from build phase., guix-commits, 2023/01/09
- 05/87: gnu: java-cisd-args4j: Remove trailing #T from build phase., guix-commits, 2023/01/09