amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: java-ecj: Do not inherit from java-ecj-3.

Browse source 
* 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
1 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/java.scm
View file

@ -2247,20 +2247,19 @@ Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n"
(license license:epl1.0))) (license license:epl1.0)))
(define-public java-ecj (define-public java-ecj
(package (inherit java-ecj-3) (package
(name "java-ecj")
(version "4.6.3") (version "4.6.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "http://archive.eclipse.org/eclipse/"
"http://archive.eclipse.org/eclipse/downloads/drops4/R-" "downloads/drops4/R-" version "-201703010400/"
version "ecjsrc-" version ".jar"))
"-201703010400/ecjsrc-"
version
".jar"))
(sha256 (sha256
(base32 (base32
"11cfgsdgznja1pvlxkjbqykxd7pcd5655vkm7s44xmahmap15gpl")))) "11cfgsdgznja1pvlxkjbqykxd7pcd5655vkm7s44xmahmap15gpl"))))
(build-system ant-build-system)
(arguments (arguments
`(#:tests? #f ; none included `(#:tests? #f ; none included
#:build-target "build" #:build-target "build"
@ -2270,20 +2269,17 @@ Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n"
(lambda _ (lambda _
(substitute* "src/build.xml" (substitute* "src/build.xml"
(("^.*MANIFEST.*$") (("^.*MANIFEST.*$")
"")) "")
#t))
(add-after 'unpack 'fix-prop
(lambda _
(substitute* "src/build.xml"
(("^.*properties.*$") (("^.*properties.*$")
"<include name=\"**/*.properties\"/> "<include name=\"**/*.properties\"/>
<include name=\"**/*.props\"/>")) <include name=\"**/*.props\"/>"))))
#t))
(add-before 'build 'chdir (add-before 'build 'chdir
(lambda _ (lambda _ (chdir "src")))
(chdir "src") (replace 'install (install-jars ".")))))
#t)) (home-page "https://eclipse.org")
(replace 'install (install-jars "."))))))) (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 (define-public java-cisd-base
(let ((revision 38938) (let ((revision 38938)