From 84b226c27ee4f3292182b0a8580b2fa5f102f255 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 4 Mar 2019 21:57:05 +0100 Subject: gnu: java-eclipse-jdt-core: Include resources. * gnu/packages/java.scm (java-eclipse-jdt-core)[arguments]: Add build phases "copy-resources" and "move-sources". --- gnu/packages/java.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 43ba9d2d17..8dce255f5d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2017 Carlo Zancanaro @@ -5948,7 +5948,24 @@ and contributes the Eclipse default text editor.") (build-system ant-build-system) (arguments `(#:tests? #f ; no tests included - #:jar-name "eclipse-jdt-core.jar")) + #:jar-name "eclipse-jdt-core.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'move-sources + (lambda _ + (with-directory-excursion "src/jdtCompilerAdaptersrc/" + (for-each (lambda (file) + (install-file file (string-append "../" (dirname file)))) + (find-files "." ".*"))) + (delete-file-recursively "src/jdtCompilerAdaptersrc/") + #t)) + (add-before 'build 'copy-resources + (lambda _ + (with-directory-excursion "src" + (for-each (lambda (file) + (install-file file (string-append "../build/classes/" (dirname file)))) + (find-files "." ".*.(props|properties|rsc)"))) + #t))))) (inputs `(("java-eclipse-core-contenttype" ,java-eclipse-core-contenttype) ("java-eclipse-core-filesystem" ,java-eclipse-core-filesystem) -- cgit 1.4.1 From e40e3792e6151d45ff4e187a6c6a7bba7820eff7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 5 Mar 2019 09:35:00 +0100 Subject: gnu: java-eclipse-equinox-common: Update to 3.10.200. * gnu/packages/java.scm (java-eclipse-equinox-common): Update to 3.10.200. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8dce255f5d..985f5f79ff 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5452,7 +5452,7 @@ specification.") (define-public java-eclipse-equinox-common (package (name "java-eclipse-equinox-common") - (version "3.8.0") + (version "3.10.200") (source (origin (method url-fetch) (uri (string-append "https://repo1.maven.org/maven2/" @@ -5461,7 +5461,7 @@ specification.") version "-sources.jar")) (sha256 (base32 - "12aazpkgw46r1qj0pr421jzwhbmsizd97r37krd7njnbrdgfzksc")))) + "1yn8ij6xsljlf35sr2l7wvyvc0ss4n1rv0ry5zkgb49dj4hyrqrj")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests included -- cgit 1.4.1 From 4fa9b6e657d0300499dd3cbfb5f1a62b5842100c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 5 Mar 2019 09:36:33 +0100 Subject: gnu: java-eclipse-core-runtime: Update to 3.15.100. * gnu/packages/java.scm (java-eclipse-core-runtime): Update to 3.15.100. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 985f5f79ff..e59540cd35 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5611,7 +5611,7 @@ the module @code{org.eclipse.equinox.preferences}.") (define-public java-eclipse-core-runtime (package (name "java-eclipse-core-runtime") - (version "3.12.0") + (version "3.15.100") (source (origin (method url-fetch) (uri (string-append "https://repo1.maven.org/maven2/" @@ -5620,7 +5620,7 @@ the module @code{org.eclipse.equinox.preferences}.") version "-sources.jar")) (sha256 (base32 - "16mkf8jgj35pgzms7w1gyfq0gfm4ixw6c5xbbxzdj1la56c758ya")))) + "0l8xayacsbjvz5hypx2fv47vpw2n4dspamcfb3hx30x9hj8vmg7r")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests included -- cgit 1.4.1 From c8427a5e91c519ab6bad7a30ae84e06d3daef1d5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 5 Mar 2019 09:36:49 +0100 Subject: gnu: java-eclipse-core-resources: Update to 3.13.200. * gnu/packages/java.scm (java-eclipse-core-resources): Update to 3.13.200. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e59540cd35..627879061f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5759,7 +5759,7 @@ the module @code{org.eclipse.ant.core}.") (define-public java-eclipse-core-resources (package (name "java-eclipse-core-resources") - (version "3.11.1") + (version "3.13.200") (source (origin (method url-fetch) (uri (string-append "https://repo1.maven.org/maven2/" @@ -5768,7 +5768,7 @@ the module @code{org.eclipse.ant.core}.") version "-sources.jar")) (sha256 (base32 - "1hrfxrll6cpcagfksk2na1ypvkcnsp0fk6n3vcsrn97qayf9mx9l")))) + "1sn3b6ky72hkvxcgf9b2jkpbdh3y8lbhi9xxwv1dsiddpkkq91hs")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests included -- cgit 1.4.1 From 43d6776ba42e8542358a48bc80749d50b9d34bb7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 5 Mar 2019 09:37:08 +0100 Subject: gnu: java-eclipse-jdt-core: Update to 3.16.0. * gnu/packages/java.scm (java-eclipse-jdt-core): Update to 3.16.0. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 627879061f..89f2a8f5e2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5935,7 +5935,7 @@ and contributes the Eclipse default text editor.") (define-public java-eclipse-jdt-core (package (name "java-eclipse-jdt-core") - (version "3.12.3") + (version "3.16.0") (source (origin (method url-fetch) (uri (string-append "https://repo1.maven.org/maven2/" @@ -5944,7 +5944,7 @@ and contributes the Eclipse default text editor.") version "-sources.jar")) (sha256 (base32 - "191xw4lc7mjjkprh4ji5vnpjvr5r4zvbpwkriy4bvsjqrz35vh1j")))) + "1g560yr9v2kzv34gc2m3ifpgnj7krcdd6h4gd4z83pwqacwkfz0k")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests included -- cgit 1.4.1 From 74c2339fffcbbbc866c9c8f9a75a1aa8bb0a91dd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Mar 2019 23:18:56 +0100 Subject: gnu: Add java-eclipse-jdt-compiler-apt. * gnu/packages/java.scm (java-eclipse-jdt-compiler-apt): New variable. --- gnu/packages/java.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 89f2a8f5e2..47dc89d373 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5984,6 +5984,33 @@ and contributes the Eclipse default text editor.") development tools.") (license license:epl1.0))) +(define-public java-eclipse-jdt-compiler-apt + (package + (name "java-eclipse-jdt-compiler-apt") + (version "1.3.400") + (source (origin + (method url-fetch) + (uri (string-append "https://repo1.maven.org/maven2/" + "org/eclipse/jdt/org.eclipse.jdt.compiler.apt/" + version "/org.eclipse.jdt.compiler.apt-" + version "-sources.jar")) + (sha256 + (base32 + "1s285k9p2ixdqrknb40jbbvw682n9a7l5lqpn583a8pvlzg2l6r8")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f ; no tests included + #:jar-name "eclipse-jdt-compiler-apt.jar" + #:jdk ,openjdk11)) + (inputs + `(("java-eclipse-jdt-core" ,java-eclipse-jdt-core))) + (home-page "https://www.eclipse.org/jdt/apt/") + (synopsis "Annotation processing tool") + (description "APT stands for Annotation Processing Tool. APT provides a +means for generating files and compiling new Java classes based on annotations +found in your source code.") + (license license:epl2.0))) + (define-public java-javax-mail (package (name "java-javax-mail") -- cgit 1.4.1