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.
This commit is contained in:
Ricardo Wurmus 2023-01-09 00:38:15 +01:00
parent 649ea550e7
commit 3b62c2804c
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -2247,20 +2247,19 @@ (define-public java-ecj-3
(license license:epl1.0)))
(define-public java-ecj
(package (inherit java-ecj-3)
(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"))
(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"
@ -2270,20 +2269,17 @@ (define-public java-ecj
(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))
<include name=\"**/*.props\"/>"))))
(add-before 'build 'chdir
(lambda _
(chdir "src")
#t))
(replace 'install (install-jars ".")))))))
(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)