* [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the source directory.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 02/12] guix: ant-build-system: use abs path as basedir Hartmut Goebel
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* guix/build-system/ant.scm (ant-build) Add parameter src-dir.
* guix/build/ant-build-system.scm (default-build.xml): New parameter src-dir.
(configure): pass src-dir on to default-build.xml.
* doc/guix.texi (Build Systems): Add description.
---
doc/guix.texi | 3 ++-
guix/build-system/ant.scm | 2 ++
guix/build/ant-build-system.scm | 8 ++++----
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index b6ca34a..19c70ad 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2956,7 +2956,8 @@ parameters, respectively.
When the original package does not provide a suitable Ant build file,
the parameter @code{#:jar-name} can be used to generate a minimal Ant
build file @file{build.xml} with tasks to build the specified jar
-archive.
+archive. In this case the parameter @code{#:src-dir} can be used to
+specify the source sub-directory, defaulting to ``src''.
The parameter @code{#:build-target} can be used to specify the Ant task
that should be run during the @code{build} phase. By default the
diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm
index 550f92b..cd544ad 100644
--- a/guix/build-system/ant.scm
+++ b/guix/build-system/ant.scm
@@ -98,6 +98,7 @@
(make-flags ''())
(build-target "jar")
(jar-name #f)
+ (src-dir "src")
(phases '(@ (guix build ant-build-system)
%standard-phases))
(outputs '("out"))
@@ -126,6 +127,7 @@
#:test-target ,test-target
#:build-target ,build-target
#:jar-name ,jar-name
+ #:src-dir ,src-dir
#:phases ,phases
#:outputs %outputs
#:search-paths ',(map search-path-specification->sexp
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
index 2cc6bb9..651150d 100644
--- a/guix/build/ant-build-system.scm
+++ b/guix/build/ant-build-system.scm
@@ -35,7 +35,7 @@
;;
;; Code:
-(define (default-build.xml jar-name prefix)
+(define (default-build.xml src-dir jar-name prefix)
"Create a simple build.xml with standard targets for Ant."
(call-with-output-file "build.xml"
(lambda (port)
@@ -59,7 +59,7 @@
(target (@ (name "compile"))
(mkdir (@ (dir "${classes.dir}")))
(javac (@ (includeantruntime "false")
- (srcdir "src")
+ (srcdir ,src-dir)
(destdir "${classes.dir}")
(classpath (@ (refid "classpath"))))))
@@ -100,9 +100,9 @@ to the default GNU unpack strategy."
((assq-ref gnu:%standard-phases 'unpack) #:source source)))
(define* (configure #:key inputs outputs (jar-name #f)
- #:allow-other-keys)
+ (src-dir "src") #:allow-other-keys)
(when jar-name
- (default-build.xml jar-name
+ (default-build.xml src-dir jar-name
(string-append (assoc-ref outputs "out")
"/share/java")))
(setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 02/12] guix: ant-build-system: use abs path as basedir
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
2016-09-09 14:51 ` [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the source directory Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 03/12] guix: Add java-utils Hartmut Goebel
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
This allows to chdir into some sub-project prior to building.
* guix/build/ant-build-system.scm (default-build.xml): Add parameter.
(configure): Pass current directory as base-dir to default-build.xml.
---
guix/build/ant-build-system.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
index 651150d..f28182a 100644
--- a/guix/build/ant-build-system.scm
+++ b/guix/build/ant-build-system.scm
@@ -35,12 +35,12 @@
;;
;; Code:
-(define (default-build.xml src-dir jar-name prefix)
+(define (default-build.xml base-dir src-dir jar-name prefix)
"Create a simple build.xml with standard targets for Ant."
(call-with-output-file "build.xml"
(lambda (port)
(sxml->xml
- `(project (@ (basedir ".")
+ `(project (@ (basedir ,base-dir)
(name ,jar-name))
(property (@ (name "classes.dir")
(value "${basedir}/build/classes")))
@@ -102,7 +102,7 @@ to the default GNU unpack strategy."
(define* (configure #:key inputs outputs (jar-name #f)
(src-dir "src") #:allow-other-keys)
(when jar-name
- (default-build.xml src-dir jar-name
+ (default-build.xml (getcwd) src-dir jar-name
(string-append (assoc-ref outputs "out")
"/share/java")))
(setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 03/12] guix: Add java-utils.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
2016-09-09 14:51 ` [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the source directory Hartmut Goebel
2016-09-09 14:51 ` [PATCH 02/12] guix: ant-build-system: use abs path as basedir Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 04/12] gnu: Add java-plexus-utils Hartmut Goebel
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* guix/build/java-utils.scm: New file.
* guix/build-system/ant.scm: Use it.
* Makefile.am (MODULES): Add it.
---
Makefile.am | 1 +
guix/build-system/ant.scm | 2 ++
guix/build/java-utils.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+)
create mode 100644 guix/build/java-utils.scm
diff --git a/Makefile.am b/Makefile.am
index 1a34e0d..c711e48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,6 +86,7 @@ MODULES = \
guix/build/emacs-build-system.scm \
guix/build/git.scm \
guix/build/hg.scm \
+ guix/build/java-utils.scm \
guix/build/glib-or-gtk-build-system.scm \
guix/build/gnu-build-system.scm \
guix/build/gnu-dist.scm \
diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm
index cd544ad..b98a651 100644
--- a/guix/build-system/ant.scm
+++ b/guix/build-system/ant.scm
@@ -39,6 +39,7 @@
(define %ant-build-system-modules
;; Build-side modules imported by default.
`((guix build ant-build-system)
+ (guix build java-utils)
(guix build syscalls)
,@%gnu-build-system-modules))
@@ -107,6 +108,7 @@
(guile #f)
(imported-modules %ant-build-system-modules)
(modules '((guix build ant-build-system)
+ (guix build java-utils)
(guix build utils))))
"Build SOURCE with INPUTS."
(define builder
diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm
new file mode 100644
index 0000000..1ca5b3d
--- /dev/null
+++ b/guix/build/java-utils.scm
@@ -0,0 +1,52 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+
+(define-module (guix build java-utils)
+ #:use-module (guix build utils)
+ #:export (ant-build-javadoc
+ install-jars
+ install-javadoc))
+
+(define (package-name-version store-dir)
+ ; copied from haskell-build-system.scm - seeking for a more general solution
+ "Given a store directory STORE-DIR return 'name-version' of the package."
+ (let* ((base (basename store-dir)))
+ (string-drop base
+ (+ 1 (string-index base #\-)))))
+
+(define* (ant-build-javadoc #:key (target "javadoc") (make-flags '())
+ #:allow-other-keys)
+ (zero? (apply system* `("ant" ,target ,@make-flags))))
+
+(define* (install-jars jars-dir)
+ "Helper for the case the build.xml does not include an install target."
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((share (string-append (assoc-ref outputs "out")
+ "/share/java")))
+ (for-each (lambda (f) (install-file f share))
+ (find-files jars-dir "\\.jar$")))))
+
+(define* (install-javadoc apidocs-dir)
+ "Helper to install the javadocs."
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (docs (string-append (assoc-ref outputs "doc")
+ "/share/doc/" (package-name-version out) "/")))
+ (mkdir-p docs)
+ (copy-recursively apidocs-dir docs))))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 04/12] gnu: Add java-plexus-utils.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
` (2 preceding siblings ...)
2016-09-09 14:51 ` [PATCH 03/12] guix: Add java-utils Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 05/12] gnu: Add java-plexus-interpolation Hartmut Goebel
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/java.scm (codehaus-plexus-url): New function.
(java-plexus-utils): New variable.
---
gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e8d09dd..0dfd9fa 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1256,3 +1256,35 @@ testing frameworks, mocking libraries and UI validation rules.")
JUnit provides assertions for testing expected results, test fixtures for
sharing common test data, and test runners for running tests.")
(license license:epl1.0)))
+
+;
+; codehaus plexus
+;
+
+(define* (codehaus-plexus-url projname version)
+ (let ((projname (string-append "plexus-" projname)))
+ (string-append "https://github.com/codehaus-plexus/" projname
+ "/archive/" projname "-" version ".tar.gz")))
+
+(define-public java-plexus-utils
+ (package
+ (name "java-plexus-utils")
+ (version "3.0.24")
+ (source (origin
+ (method url-fetch)
+ (uri (codehaus-plexus-url "utils" version))
+ (sha256
+ (base32 "1mlwpc6fms24slygv5yvi6fi9hcha2fh0v73p5znpi78bg36i2js"))))
+ (build-system ant-build-system)
+ ; todo: javadoc
+ (arguments
+ `(#:tests? #f ; todo: tests
+ #:jar-name (string-append "plexus-utils-" ,version ".jar")
+ #:src-dir "src/main"))
+ (native-inputs
+ `(("java-junit" ,java-junit)))
+ (home-page "http://codehaus-plexus.github.io/plexus-utils/")
+ (synopsis "Common utilities for the Plexus framework")
+ (description "Various Java utility classes to ease working with strings,
+files, command lines, XML and more.")
+ (license license:asl2.0)))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 05/12] gnu: Add java-plexus-interpolation.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
` (3 preceding siblings ...)
2016-09-09 14:51 ` [PATCH 04/12] gnu: Add java-plexus-utils Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 06/12] gnu: Add java-commons-cli Hartmut Goebel
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/java.scm (java-plexus-interplation): New variable.
---
gnu/packages/java.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0dfd9fa..3687c7e 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1288,3 +1288,31 @@ sharing common test data, and test runners for running tests.")
(description "Various Java utility classes to ease working with strings,
files, command lines, XML and more.")
(license license:asl2.0)))
+
+(define-public java-plexus-interpolation
+ (package
+ (name "java-plexus-interpolation")
+ (version "1.23")
+ (source (origin
+ (method url-fetch)
+ (uri (codehaus-plexus-url "interpolation" version))
+ (sha256 (base32 "1w79ljwk42ymrgy8kqxq4l82pgdj6287gabpfnpkyzbrnclsnfrp"))))
+ (build-system ant-build-system)
+ ; todo: javadoc
+ (arguments
+ `(#:tests? #f ; todo: tests
+ #:jar-name (string-append "plexus-interpolation-" ,version ".jar")
+ #:src-dir "src/main"))
+ (native-inputs
+ `(("java-junit" ,java-junit)))
+ (home-page "http://codehaus-plexus.github.io/plexus-interpolation/")
+ (synopsis "Java components for interpolating ${} strings and the like")
+ (description "Plexus interpolator is the outgrowth of multiple iterations
+of development focused on providing a more modular, flexible interpolation
+framework for the expression language style commonly seen in Maven, Plexus,
+and other related projects.
+
+It has its foundation in the org.codehaus.plexus.utils.interpolation package
+within plexus-utils, but has been separated in order to allow these two
+libraries to vary independently of one another.")
+ (license license:asl2.0)))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 06/12] gnu: Add java-commons-cli.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
` (4 preceding siblings ...)
2016-09-09 14:51 ` [PATCH 05/12] gnu: Add java-plexus-interpolation Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 07/12] gnu: Add java-commons-codec Hartmut Goebel
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/java.scm (appache-commons-url): New function.
(java-commons-cli): New variable.
---
gnu/packages/java.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 3687c7e..a83423d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1316,3 +1316,51 @@ It has its foundation in the org.codehaus.plexus.utils.interpolation package
within plexus-utils, but has been separated in order to allow these two
libraries to vary independently of one another.")
(license license:asl2.0)))
+
+;
+; apache commons
+;
+
+(define* (apache-commons-url projname version
+ #:optional (basename
+ (string-append "commons-" projname)))
+ (string-append "mirror://apache/commons/" projname "/source/"
+ basename "-" version "-src.tar.gz"))
+
+(define-public java-commons-cli
+ (package
+ (name "java-commons-cli")
+ (version "1.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (apache-commons-url "cli" version))
+ (sha256 (base32 "1fkjn552i12vp3xxk21ws4p70fi0lyjm004vzxsdaz7gdpgyxxyl"))))
+ (build-system ant-build-system)
+ ; todo: javadoc
+ (arguments
+ ; commons-cli does not provida a proper build.xml but seems to require
+ ; maven for building
+ `(#:jar-name (string-append "commons-cli-" ,version ".jar")
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'check))))
+ (native-inputs
+ `(("java-junit" ,java-junit)))
+ (home-page "http://commons.apache.org/cli/")
+ (synopsis "Command line arguments and options parsing library")
+ (description "The Apache Commons CLI library provides an API for parsing
+command line options passed to programs. It's also able to print help messages
+detailing the options available for a command line tool.
+
+Commons CLI supports different types of options:
+
+@itemize
+@item POSIX like options (ie. tar -zxvf foo.tar.gz)
+@item GNU like long options (ie. du --human-readable --max-depth=1)
+@item Java like properties (ie. java -Djava.awt.headless=true Foo)
+@item Short options with value attached (ie. gcc -O2 foo.c)
+@item long options with single hyphen (ie. ant -projecthelp)
+@end itemize
+
+This is a part of the Apache Commons Project.")
+ (license license:asl2.0)))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 07/12] gnu: Add java-commons-codec.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
` (5 preceding siblings ...)
2016-09-09 14:51 ` [PATCH 06/12] gnu: Add java-commons-cli Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 08/12] gnu: Add java-commons-daemon Hartmut Goebel
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/java.scm (java-commons-codec): New variable.
---
gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a83423d..a5d3a25 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1364,3 +1364,35 @@ Commons CLI supports different types of options:
This is a part of the Apache Commons Project.")
(license license:asl2.0)))
+
+(define-public java-commons-codec
+ (package
+ (name "java-commons-codec")
+ (version "1.10")
+ (source (origin
+ (method url-fetch)
+ (uri (apache-commons-url "codec" version))
+ (sha256 (base32 "1w9qg30y4s0x8gnmr2fgj4lyplfn788jqxbcz27lf5kbr6n8xr65"))))
+ (build-system ant-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ ; commons-cli does not provida a proper build.xml but seems to require
+ ; maven for building
+ `(#:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'check) ; todo: need to pass junit to classpath
+ (add-after 'build 'build-javadoc ant-build-javadoc)
+ (replace 'install (install-jars "dist"))
+ (add-after 'install 'install-doc (install-javadoc "dist/docs/api")))))
+ (native-inputs
+ `(("java-junit" ,java-junit)))
+ (home-page "http://commons.apache.org/codec/")
+ (synopsis "Common encoders and decoders such as Base64, Hex, Phonetic and URLs")
+ (description "The codec package contains simple encoder and decoders for
+various formats such as Base64 and Hexadecimal. In addition to these widely
+used encoders and decoders, the codec package also maintains a collection of
+phonetic encoding utilities.
+
+This is a part of the Apache Commons Project.")
+ (license license:asl2.0)))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 08/12] gnu: Add java-commons-daemon.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
` (6 preceding siblings ...)
2016-09-09 14:51 ` [PATCH 07/12] gnu: Add java-commons-codec Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 09/12] gnu: Add java-commons-io Hartmut Goebel
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/java.scm (java-commons-daemon): New variable.
---
gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a5d3a25..e200296 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1396,3 +1396,35 @@ phonetic encoding utilities.
This is a part of the Apache Commons Project.")
(license license:asl2.0)))
+
+(define-public java-commons-daemon ; build, todo: verify results
+ (package (name "java-commons-daemon")
+ (version "1.0.15")
+ (source (origin
+ (method url-fetch)
+ (uri (apache-commons-url "daemon" version))
+ (sha256
+ (base32 "0ci46kq8jpz084ccwq0mmkahcgsmh20ziclp2jf5i0djqv95gvhi"))))
+ (build-system ant-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'build 'build-javadoc ant-build-javadoc)
+ (replace 'install (install-jars "dist"))
+ (add-after 'install 'install-doc (install-javadoc "dist/docs/api")))))
+ (native-inputs
+ `(("java-junit" ,java-junit)))
+ (home-page "http://commons.apache.org/daemon/")
+ (synopsis "Library to launch Java applications as daemons")
+ (description "The Daemon package from Apache Commons can be used to
+implement Java applications which can be launched as daemons. For example the
+program will be notified about a shutdown so that it can perform cleanup tasks
+before its process of execution is destroyed by the operation system.
+
+This package contains the java library. You will also need the actual binary
+for your architecture which is provided by the jsvc package.
+
+This is a part of the Apache Commons Project.")
+ (license license:asl2.0)))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 09/12] gnu: Add java-commons-io.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
` (7 preceding siblings ...)
2016-09-09 14:51 ` [PATCH 08/12] gnu: Add java-commons-daemon Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 10/12] gnu: Add java-commons-lang Hartmut Goebel
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/java.scm (java-commons-io): New variable.
---
gnu/packages/java.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e200296..3af8cd0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1428,3 +1428,45 @@ for your architecture which is provided by the jsvc package.
This is a part of the Apache Commons Project.")
(license license:asl2.0)))
+
+(define-public java-commons-io
+ (package
+ (name "java-commons-io")
+ (version "2.5")
+ (source (origin
+ (method url-fetch)
+ (uri (apache-commons-url "io" version))
+ (sha256 (base32 "0q5y41jrcjvx9hzs47x5kdhnasdy6rm4bzqd2jxl02w717m7a7v3"))))
+ (build-system ant-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'symlink-junit.jar
+ (lambda* (#:key source #:allow-other-keys)
+ ; the existance of this file is taken as indicator whether test
+ ; dependencis will to be downloaded.
+ (let ((junit (assoc-ref inputs "java-junit"))
+ (junit-version "4.12")) ; from build.xml
+ (mkdir-p "lib")
+ (symlink (string-append junit "/share/java/junit.jar")
+ (string-append "lib/junit-" junit-version ".jar")))))
+ (add-after 'build 'build-javadoc ant-build-javadoc)
+ (add-after 'configure 'patch-build.xml
+ (lambda* _
+ (substitute* "build.xml"
+ ; set current year to a fixed value, you may want to update
+ ; this when updating the package version
+ (("<format property=\"current.year\"[^>]+>")
+ "<format property=\"current.year\" pattern=\"2016\"/>"))))
+ (replace 'install (install-jars "target"))
+ (add-after 'install 'install-doc (install-javadoc "target/apidocs")))))
+ (native-inputs
+ `(("java-junit" ,java-junit)
+ ("java-hamcrest-core" ,java-hamcrest-core)))
+ (home-page "http://commons.apache.org/io/")
+ (synopsis "Common useful IO related classes")
+ (description "Commons-IO contains utility classes, stream implementations,
+file filters and endian classes.")
+ (license license:asl2.0)))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 10/12] gnu: Add java-commons-lang.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
` (8 preceding siblings ...)
2016-09-09 14:51 ` [PATCH 09/12] gnu: Add java-commons-io Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 11/12] gnu: Add java-commons-lang3 Hartmut Goebel
2016-09-09 14:51 ` [PATCH 12/12] gnu: Add java-commons-bcel Hartmut Goebel
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/java.scm (java-commons-lang): New variables.
---
gnu/packages/java.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 3af8cd0..5a90d05 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1470,3 +1470,51 @@ This is a part of the Apache Commons Project.")
(description "Commons-IO contains utility classes, stream implementations,
file filters and endian classes.")
(license license:asl2.0)))
+
+(define-public java-commons-lang
+ (package
+ (name "java-commons-lang")
+ (version "2.6")
+ (source (origin
+ (method url-fetch)
+ (uri (apache-commons-url "lang" version))
+ (sha256 (base32 "1mxwagqadzx1b2al7i0z1v0r235aj2njdyijf02szq0vhmqrfiq5"))))
+ (build-system ant-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'build 'build-javadoc ant-build-javadoc)
+ (add-before 'check 'fix-test-framework
+ (lambda _
+ ;; disable a failing test
+ (substitute* "src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java"
+ (("public void testFormat\\(\\)")
+ "public void disabled_testFormat()"))
+ #t))
+ (replace 'install (install-jars "target"))
+ (add-after 'install 'install-doc (install-javadoc "target/apidocs")))))
+ (native-inputs
+ `(("java-junit" ,java-junit)))
+ (home-page "http://commons.apache.org/lang/")
+ (synopsis "Extension of the java.lang package")
+ (description "The Commons Lang components contains a set of Java classes
+that provide helper methods for standard Java classes, especially those found
+in the java.lang package in the Sun JDK. The following classes are included:
+
+ * StringUtils - Helper for java.lang.String.
+ * CharSetUtils - Methods for dealing with CharSets, which are sets of
+ characters such as [a-z] and [abcdez].
+ * RandomStringUtils - Helper for creating randomised Strings.
+ * NumberUtils - Helper for java.lang.Number and its subclasses.
+ * NumberRange - A range of numbers with an upper and lower bound.
+ * ObjectUtils - Helper for java.lang.Object.
+ * SerializationUtils - Helper for serializing Objects.
+ * SystemUtils - Utility class defining the Java system properties.
+ * NestedException package - A sub-package for the creation of nested
+ exceptions.
+ * Enum package - A sub-package for the creation of enumerated types.
+ * Builder package - A sub-package for the creation of equals, hashCode,
+ compareTo and toString methods.")
+ (license license:asl2.0)))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 11/12] gnu: Add java-commons-lang3.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
` (9 preceding siblings ...)
2016-09-09 14:51 ` [PATCH 10/12] gnu: Add java-commons-lang Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
2016-09-09 14:51 ` [PATCH 12/12] gnu: Add java-commons-bcel Hartmut Goebel
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/java.scm (java-commons-lang3): New variable.
---
gnu/packages/java.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 5a90d05..b7971a3 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1518,3 +1518,55 @@ in the java.lang package in the Sun JDK. The following classes are included:
* Builder package - A sub-package for the creation of equals, hashCode,
compareTo and toString methods.")
(license license:asl2.0)))
+
+(define-public java-commons-lang3
+ (package
+ (name "java-commons-lang3")
+ (version "3.4")
+ (source (origin
+ (method url-fetch)
+ (uri (apache-commons-url "lang" version "commons-lang3"))
+ (sha256
+ (base32 "0xpshb9spjhplq5a7mr0y1bgfw8190ik4xj8f569xidfcki1d6kg"))))
+ (build-system ant-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:tests? #f
+ #:test-target "test" ; requirements are missing, see below
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'build 'build-javadoc ant-build-javadoc)
+ (replace 'install (install-jars "target"))
+ (add-after 'install 'install-doc (install-javadoc "target/apidocs")))))
+ ;(native-inputs
+ ; `(("java-junit" ,java-junit)))
+ ; todo: tests. Requier hamcrest, commons-io, easymock. jar paths need to
+ ; be written into a properties files. See buld.xml in the source.
+ (home-page "http://commons.apache.org/lang/")
+ (synopsis "Extension of the java.lang package (for Java 5+)")
+ (description "The Commons Lang components contains a set of Java classes
+that provide helper methods for standard Java classes, especially those found
+in the java.lang package in the JDK 5+. The following classes are included:
+
+ * StringUtils - Helper for java.lang.String.
+ * CharSetUtils - Methods for dealing with CharSets, which are sets of
+ characters such as [a-z] and [abcdez].
+ * RandomStringUtils - Helper for creating randomised Strings.
+ * NumberUtils - Helper for java.lang.Number and its subclasses.
+ * NumberRange - A range of numbers with an upper and lower bound.
+ * ObjectUtils - Helper for java.lang.Object.
+ * SerializationUtils - Helper for serializing Objects.
+ * SystemUtils - Utility class defining the Java system properties.
+ * NestedException package - A sub-package for the creation of nested
+ exceptions.
+ * Enum package - A sub-package for the creation of enumerated types.
+ * Builder package - A sub-package for the creation of equals, hashCode,
+ compareTo and toString methods.
+
+Commons Lang 3.x use a different package (org.apache.commons.lang3) than the
+previous versions (Commonas Lang 1.x and 2.x, which use
+org.apache.commons.lang), allowing it to be used at the same time as an
+earlier version.
+
+Commons Lang 3.x is only compatible with JDK 1.5+ ")
+ (license license:asl2.0)))
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 12/12] gnu: Add java-commons-bcel.
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
` (10 preceding siblings ...)
2016-09-09 14:51 ` [PATCH 11/12] gnu: Add java-commons-lang3 Hartmut Goebel
@ 2016-09-09 14:51 ` Hartmut Goebel
11 siblings, 0 replies; 13+ messages in thread
From: Hartmut Goebel @ 2016-09-09 14:51 UTC (permalink / raw)
To: guix-devel
* gnu/packages/java.scm (java-commons-bcel): New variable.
---
gnu/packages/java.scm | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b7971a3..b1e1ecc 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1327,6 +1327,24 @@ libraries to vary independently of one another.")
(string-append "mirror://apache/commons/" projname "/source/"
basename "-" version "-src.tar.gz"))
+(define-public java-commons-bcel
+ (package
+ (name "java-commons-bcel")
+ (version "6.0")
+ (source (origin
+ (method url-fetch)
+ (uri (apache-commons-url "bcel" version "bcel"))
+ (sha256 (base32 "0n39601zcj7ymjihfv53r260mf3n8kj6bqhxv90dw5sgc7qbjqxr"))))
+ (build-system ant-build-system)
+ ; todo: tests, javadoc
+ (arguments
+ `(#:jar-name (string-append "commons-bcel-" ,version ".jar")
+ #:src-dir "src/main"))
+ (home-page "http://commons.apache.org/bcel/")
+ (synopsis "Apache Commons Bytecode Engineering Library")
+ (description "")
+ (license license:asl2.0)))
+
(define-public java-commons-cli
(package
(name "java-commons-cli")
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread