diff options
author | Björn Höfling <bjoern.hoefling@bjoernhoefling.de> | 2019-03-07 00:58:05 +0100 |
---|---|---|
committer | Björn Höfling <bjoern.hoefling@bjoernhoefling.de> | 2019-10-13 22:35:05 +0200 |
commit | 39775121c4ebfbbb00f6a9a209f0acf795e6604c (patch) | |
tree | c942f3425b7476ac4ad17632e784d9073ae2e219 /gnu/packages | |
parent | bc3497a573567c1936af26e10e634acf49808f6e (diff) | |
download | guix-patches-39775121c4ebfbbb00f6a9a209f0acf795e6604c.tar guix-patches-39775121c4ebfbbb00f6a9a209f0acf795e6604c.tar.gz |
gnu: java-tomcat: Build the full Tomcat package.
Currently java-tomcat uses the "package" build-target. In that way, it is
built like a library, with only the jar files. This commit will change the
build-target to "deploy" in order to build the full tomcat package.
* gnu/packages/web.scm (java-tomcat)[source]: Remove bat-files in snippet.
[inputs]: Remove java-eclipse-jdt-core, add java-commons-daemon, java-ecj.
[native-inputs]: Remove.
[arguments]: Use "deploy" build-target, add phases 'modify-deploy,
'symlink-commons-daemon, 'symlink-java-ecj, change 'install phase.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/web.scm | 41 |
1 files changed, 36 insertions, 5 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a1c5593ee8..726e56338d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5718,14 +5718,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (snippet '(begin (for-each delete-file (find-files "." "\\.jar$")) + (for-each delete-file (find-files "." "\\.bat$")) #t)))) (build-system ant-build-system) (inputs - `(("java-eclipse-jdt-core" ,java-eclipse-jdt-core))) - (native-inputs - `(("java-junit" ,java-junit))) + `(("java-commons-daemon" ,java-commons-daemon) + ("java-ecj" ,java-ecj))) (arguments - `(#:build-target "package" + `(#:build-target "deploy" #:tests? #f; requires downloading some files. #:phases (modify-phases %standard-phases @@ -5748,6 +5748,34 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (("<filter token=\"VERSION_BUILT\" value=.*") "<filter token=\"VERSION_BUILT\" value=\"Jan 1 1970 00:00:00 UTC\"/>")) #t)) + (add-after 'unpack 'modify-deploy + (lambda _ + ;; The Tomcat build downloads and copies these files to the + ;; bin and lib directory. + ;; We instead symlink to the input (see below). + (substitute* "build.xml" + (("<copy tofile=\"\\$\\{tomcat.build\\}/bin/commons-daemon.jar.*") "") + (("<copy file=\"\\$\\{jdt.jar\\}\" todir=\"\\$\\{tomcat.build\\}/lib\"/>") + "")) + #t)) + (add-after 'install 'symlink-commons-daemon + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((commons-daemon (assoc-ref inputs "java-commons-daemon")) + (files (find-files commons-daemon "commons-daemon-.*\\.jar")) + (daemon-jar (car files)) + (out-bin (string-append (assoc-ref outputs "out") "/bin")) + (target (string-append out-bin "/commons-daemon.jar"))) + (symlink daemon-jar target) + #t))) + (add-after 'install 'symlink-java-ecj + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((java-ecj (assoc-ref inputs "java-ecj")) + (files (find-files java-ecj "ecj.*\\.jar")) + (java-ecj-jar (car files)) + (out-lib (string-append (assoc-ref outputs "out") "/lib")) + (target (string-append out-lib "/java-ecj.jar"))) + (symlink java-ecj-jar target) + #t))) (add-after 'unpack 'generate-properties (lambda _ ;; This could have been passed to make-flags, but getcwd returns @@ -5758,7 +5786,10 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (string-append "base.path=" (getcwd) "/downloads\n")))) #t)) (replace 'install - (install-jars "output/build/lib"))))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "output/build" out)) + #t))))) (home-page "https://tomcat.apache.org") (synopsis "Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket") |