ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-16 07:58:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: java: Return #t from all phases and snippets.

Browse source 
* guix/build/java-utils.scm (ant-build-javadoc): Use invoke; return #t.
* guix/build/ant-build-system.scm (generate-jar-indices): Return #t and
remove vestigal plumbing.
* gnu/packages/java.scm (classpath-bootstrap, ant-bootstrap, classpath-devel)
(icedtea-6, icedtea-7, java-plexus-sec-dispatcher, ant/java8, clojure)
(java-classpathx-servletapi, java-swt, java-qdox-1.12, java-hamcrest-core)
(java-plexus-archiver, java-plexus-sec-dispatcher, java-modello-plugins-xml)
(java-asm, java-commons-collections, java-commons-bsf, java-slf4j-api)
(java-slf4j-api, java-slf4j-simple, java-stringtemplate-3)
(java-stringtemplate, antlr3, antlr3-3.3, antlr3-3.1, java-ops4j-base-lang)
(java-ops4j-pax-tinybundles, java-ops4j-pax-exam-core-spi)
(java-fasterxml-jackson-core, java-fasterxml-jackson-databind)
(java-fasterxml-jackson-modules-base-jaxb, java-ecj-3, java-ecj-3.5)
(java-fasterxml-jackson-dataformat-yaml, java-woodstox-core)
(java-fasterxml-jackson-dataformat-xml, java-testng, java-jnacl)
(java-bouncycastle, java-powermock-core, java-powermock-modules-junit4)
(java-jansi-native, java-jansi, java-commons-httpclient, java-commons-vfs)
(java-apache-ivy, java-janino, java-logback-core): Return #t from all phases
and snippets, use invoke where appropriate, and remove vestigial plumbing.
This commit is contained in:
Mark H Weaver 2018-06-28 03:52:08 -04:00
parent 0e6cce2e01
commit 2c8ac3641a
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
3 changed files with 202 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

359
gnu/packages/java.scm
View file

@ -718,34 +718,32 @@ (define-public icedtea-6
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'unpack (replace 'unpack
(lambda* (#:key source inputs #:allow-other-keys) (lambda* (#:key source inputs #:allow-other-keys)
(and (zero? (system* "tar" "xvf" source)) (invoke "tar" "xvf" source)
(begin (chdir (string-append "icedtea6-" ,version))
(chdir (string-append "icedtea6-" ,version)) (mkdir "openjdk")
(mkdir "openjdk") (copy-recursively (assoc-ref inputs "openjdk-src") "openjdk")
(copy-recursively (assoc-ref inputs "openjdk-src") "openjdk") ;; The convenient OpenJDK source bundle is no longer
;; The convenient OpenJDK source bundle is no longer ;; available for download, so we have to take the sources
;; available for download, so we have to take the sources ;; from the Mercurial repositories and change the Makefile
;; from the Mercurial repositories and change the Makefile ;; to avoid tests for the OpenJDK zip archive.
;; to avoid tests for the OpenJDK zip archive. (with-directory-excursion "openjdk"
(with-directory-excursion "openjdk" (for-each (lambda (part)
(for-each (lambda (part) (mkdir part)
(mkdir part) (copy-recursively
(copy-recursively (assoc-ref inputs
(assoc-ref inputs (string-append part "-src"))
(string-append part "-src")) part))
part)) '("jdk" "hotspot" "corba"
'("jdk" "hotspot" "corba" "langtools" "jaxp" "jaxws")))
"langtools" "jaxp" "jaxws"))) (substitute* "Makefile.in"
(substitute* "Makefile.in" (("echo \"ERROR: No up-to-date OpenJDK zip available\"; exit -1;")
(("echo \"ERROR: No up-to-date OpenJDK zip available\"; exit -1;") "echo \"trust me\";")
"echo \"trust me\";") ;; The contents of the bootstrap directory must be
;; The contents of the bootstrap directory must be ;; writeable but when copying from the store they are
;; writeable but when copying from the store they are ;; not.
;; not. (("mkdir -p lib/rt" line)
(("mkdir -p lib/rt" line) (string-append line "; chmod -R u+w $(BOOT_DIR)")))
(string-append line "; chmod -R u+w $(BOOT_DIR)"))) (invoke "chmod" "-R" "u+w" "openjdk")))
(zero? (system* "chmod" "-R" "u+w" "openjdk"))
#t))))
(add-after 'unpack 'use-classpath (add-after 'unpack 'use-classpath
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((jvmlib (assoc-ref inputs "classpath")) (let ((jvmlib (assoc-ref inputs "classpath"))
@ -1081,23 +1079,22 @@ (define-public icedtea-7
(let ((dir (or dir (let ((dir (or dir
(string-drop-right name 5)))) (string-drop-right name 5))))
(mkdir dir) (mkdir dir)
(zero? (system* "tar" "xvf" (invoke "tar" "xvf"
(assoc-ref inputs name) (assoc-ref inputs name)
"-C" dir "-C" dir
"--strip-components=1")))))) "--strip-components=1")))))
(mkdir target) (mkdir target)
(and (invoke "tar" "xvf" source
(zero? (system* "tar" "xvf" source "-C" target "--strip-components=1")
"-C" target "--strip-components=1")) (chdir target)
(chdir target) (unpack "openjdk-src" "openjdk.src")
(unpack "openjdk-src" "openjdk.src") (with-directory-excursion "openjdk.src"
(with-directory-excursion "openjdk.src" (for-each unpack
(for-each unpack (filter (cut string-suffix? "-drop" <>)
(filter (cut string-suffix? "-drop" <>) (map (match-lambda
(map (match-lambda ((name . _) name))
((name . _) name)) inputs))))
inputs)))) #t)))
#t))))
(add-after 'unpack 'fix-x11-extension-include-path (add-after 'unpack 'fix-x11-extension-include-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "openjdk.src/jdk/make/sun/awt/mawt.gmk" (substitute* "openjdk.src/jdk/make/sun/awt/mawt.gmk"
@ -1322,17 +1319,18 @@ (define-public icedtea-7
(let ((line (read-line port))) (let ((line (read-line port)))
(cond (cond
((eof-object? line) #t) ((eof-object? line) #t)
((regexp-exec error-pattern line) #f) ((regexp-exec error-pattern line)
(error "test failed"))
(else (loop))))))) (else (loop)))))))
(run-test (lambda (test) (run-test (lambda (test)
(system* "make" test) (invoke "make" test)
(call-with-input-file (call-with-input-file
(string-append "test/" test ".log") (string-append "test/" test ".log")
checker)))) checker))))
(or #t ; skip tests (when #f ; skip tests
(and (run-test "check-hotspot") (run-test "check-hotspot")
(run-test "check-langtools") (run-test "check-langtools")
(run-test "check-jdk")))))) (run-test "check-jdk")))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((doc (string-append (assoc-ref outputs "doc") (let ((doc (string-append (assoc-ref outputs "doc")
@ -1695,9 +1693,9 @@ (define-public ant/java8
;; result in the tests to be run. ;; result in the tests to be run.
(substitute* "build.xml" (substitute* "build.xml"
(("depends=\"jars,test-jar\"") "depends=\"jars\"")) (("depends=\"jars,test-jar\"") "depends=\"jars\""))
(zero? (system* "bash" "bootstrap.sh" (invoke "bash" "bootstrap.sh"
(string-append "-Ddist.dir=" (string-append "-Ddist.dir="
(assoc-ref outputs "out")))))))))) (assoc-ref outputs "out")))))))))
(native-inputs (native-inputs
`(("jdk" ,icedtea-8 "jdk") `(("jdk" ,icedtea-8 "jdk")
("zip" ,zip) ("zip" ,zip)
@ -1827,14 +1825,13 @@ (define-public clojure
(lambda (name) (lambda (name)
(mkdir-p name) (mkdir-p name)
(with-directory-excursion name (with-directory-excursion name
(or (zero? (system* "tar" (invoke "tar"
;; Use xz for repacked tarball. ;; Use xz for repacked tarball.
"--xz" "--xz"
"--extract" "--extract"
"--verbose" "--verbose"
"--file" (assoc-ref inputs name) "--file" (assoc-ref inputs name)
"--strip-components=1")) "--strip-components=1"))
(error "failed to unpack tarball" name)))
(copy-recursively (string-append name "/src/main/clojure/") (copy-recursively (string-append name "/src/main/clojure/")
"src/clj/")) "src/clj/"))
'("core-specs-alpha-src" '("core-specs-alpha-src"
@ -1847,7 +1844,7 @@ (define-public clojure
;; The javadoc target is not built by default. ;; The javadoc target is not built by default.
(add-after 'build 'build-doc (add-after 'build 'build-doc
(lambda _ (lambda _
(zero? (system* "ant" "javadoc")))) (invoke "ant" "javadoc")))
;; Needed since no install target is provided. ;; Needed since no install target is provided.
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -2009,7 +2006,8 @@ (define-public java-ecj-3
(lambda (in out) (lambda (in out)
(display "Manifest-Version: 1.0 (display "Manifest-Version: 1.0
Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n" Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n"
out))))) out)))
#t))
(replace 'install (install-jars "."))))) (replace 'install (install-jars ".")))))
(home-page "https://eclipse.org") (home-page "https://eclipse.org")
(synopsis "Eclipse Java development tools core batch compiler") (synopsis "Eclipse Java development tools core batch compiler")
@ -2042,7 +2040,8 @@ (define-public java-ecj-3.5
(lambda (in out) (lambda (in out)
(dump-port in out) (dump-port in out)
(display "Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n" (display "Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n"
out))))) out)))
#t))
(replace 'install (install-jars "."))))) (replace 'install (install-jars ".")))))
(native-inputs (native-inputs
`(("unzip" ,unzip))))) `(("unzip" ,unzip)))))
@ -2509,7 +2508,7 @@ (define-public java-classpathx-servletapi
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'install (replace 'install
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(zero? (apply system* `("ant" "dist" ,@make-flags)))))))) (apply invoke `("ant" "dist" ,@make-flags)))))))
(home-page "https://www.gnu.org/software/classpathx/") (home-page "https://www.gnu.org/software/classpathx/")
(synopsis "Java servlet API implementation") (synopsis "Java servlet API implementation")
(description "This is the GNU servlet API distribution, part of the (description "This is the GNU servlet API distribution, part of the
@ -2551,11 +2550,11 @@ (define-public java-swt
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'unpack (replace 'unpack
(lambda* (#:key source #:allow-other-keys) (lambda* (#:key source #:allow-other-keys)
(and (mkdir "swt") (mkdir "swt")
(zero? (system* "unzip" source "-d" "swt")) (invoke "unzip" source "-d" "swt")
(chdir "swt") (chdir "swt")
(mkdir "src") (mkdir "src")
(zero? (system* "unzip" "src.zip" "-d" "src"))))) (invoke "unzip" "src.zip" "-d" "src")))
;; The classpath contains invalid icecat jars. Since we don't need ;; The classpath contains invalid icecat jars. Since we don't need
;; anything other than the JDK on the classpath, we can simply unset ;; anything other than the JDK on the classpath, we can simply unset
;; it. ;; it.
@ -2570,7 +2569,7 @@ (define-public java-swt
(mkdir-p lib) (mkdir-p lib)
(setenv "OUTPUT_DIR" lib) (setenv "OUTPUT_DIR" lib)
(with-directory-excursion "src" (with-directory-excursion "src"
(zero? (system* "bash" "build.sh")))))) (invoke "bash" "build.sh")))))
(add-after 'install 'install-native (add-after 'install 'install-native
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((lib (string-append (assoc-ref outputs "out") "/lib"))) (let ((lib (string-append (assoc-ref outputs "out") "/lib")))
@ -2656,7 +2655,7 @@ (define-public java-qdox-1.12
(lambda* (#:key source #:allow-other-keys) (lambda* (#:key source #:allow-other-keys)
(mkdir "src") (mkdir "src")
(with-directory-excursion "src" (with-directory-excursion "src"
(zero? (system* "jar" "-xf" source))))) (invoke "jar" "-xf" source))))
;; At this point we don't have junit, so we must remove the API ;; At this point we don't have junit, so we must remove the API
;; tests. ;; tests.
(add-after 'unpack 'delete-tests (add-after 'unpack 'delete-tests
@ -2767,7 +2766,8 @@ (define-public java-hamcrest-core
return _allMethods; return _allMethods;
} }
private Method[] allMethods = getSortedMethods();"))))) private Method[] allMethods = getSortedMethods();")))
#t))
(add-before 'build 'do-not-use-bundled-qdox (add-before 'build 'do-not-use-bundled-qdox
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "build.xml" (substitute* "build.xml"
@ -3058,7 +3058,8 @@ (define-public java-plexus-archiver
(lambda _ (lambda _
;; Requires an older version of plexus container ;; Requires an older version of plexus container
(delete-file (delete-file
"src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java"))) "src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java")
#t))
(add-before 'build 'copy-resources (add-before 'build 'copy-resources
(lambda _ (lambda _
(mkdir-p "build/classes/META-INF/plexus") (mkdir-p "build/classes/META-INF/plexus")
@ -3251,15 +3252,15 @@ (define-public java-plexus-sec-dispatcher
(add-before 'build 'generate-models (add-before 'build 'generate-models
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(define (modello-single-mode file version mode) (define (modello-single-mode file version mode)
(zero? (system* "java" (invoke "java"
"org.codehaus.modello.ModelloCli" "org.codehaus.modello.ModelloCli"
file mode "src/main/java" version file mode "src/main/java" version
"false" "true"))) "false" "true"))
(let ((file "src/main/mdo/settings-security.mdo")) (let ((file "src/main/mdo/settings-security.mdo"))
(and
(modello-single-mode file "1.0.0" "java") (modello-single-mode file "1.0.0" "java")
(modello-single-mode file "1.0.0" "xpp3-reader") (modello-single-mode file "1.0.0" "xpp3-reader")
(modello-single-mode file "1.0.0" "xpp3-writer"))))) (modello-single-mode file "1.0.0" "xpp3-writer"))
#t))
(add-before 'build 'generate-components.xml (add-before 'build 'generate-components.xml
(lambda _ (lambda _
(mkdir-p "build/classes/META-INF/plexus") (mkdir-p "build/classes/META-INF/plexus")
@ -3288,10 +3289,12 @@ (define (modello-single-mode file version mode)
</configuration>\n </configuration>\n
</component>\n </component>\n
</components>\n </components>\n
</component-set>\n"))))) </component-set>\n")))
#t))
(add-before 'check 'fix-paths (add-before 'check 'fix-paths
(lambda _ (lambda _
(copy-recursively "src/test/resources" "target")))))) (copy-recursively "src/test/resources" "target")
#t)))))
(inputs (inputs
`(("java-plexus-cipher" ,java-plexus-cipher))) `(("java-plexus-cipher" ,java-plexus-cipher)))
(native-inputs (native-inputs
@ -3514,7 +3517,8 @@ (define-public java-modello-plugins-xml
(with-directory-excursion "modello-plugins/modello-plugin-xml/src/test" (with-directory-excursion "modello-plugins/modello-plugin-xml/src/test"
(substitute* (substitute*
"java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java" "java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java"
(("src/test") "modello-plugins/modello-plugin-xml/src/test")))))))) (("src/test") "modello-plugins/modello-plugin-xml/src/test")))
#t)))))
(inputs (inputs
`(("java-modello-core" ,java-modello-core) `(("java-modello-core" ,java-modello-core)
("java-modello-plugins-java" ,java-modello-plugins-java) ("java-modello-plugins-java" ,java-modello-plugins-java)
@ -3609,9 +3613,9 @@ (define-public java-asm
;; We cannot use the "jar" target because it depends on a couple ;; We cannot use the "jar" target because it depends on a couple
;; of unpackaged, complicated tools. ;; of unpackaged, complicated tools.
(mkdir "dist") (mkdir "dist")
(zero? (system* "jar" (invoke "jar"
"-cf" (string-append "dist/asm-" ,version ".jar") "-cf" (string-append "dist/asm-" ,version ".jar")
"-C" "output/build/tmp" ".")))) "-C" "output/build/tmp" ".")))
(replace 'install (replace 'install
(install-jars "dist"))))) (install-jars "dist")))))
(native-inputs (native-inputs
@ -4099,7 +4103,8 @@ (define-public java-commons-collections
(mkdir-p "build/conf") (mkdir-p "build/conf")
(call-with-output-file "build/conf/MANIFEST.MF" (call-with-output-file "build/conf/MANIFEST.MF"
(lambda (file) (lambda (file)
(format file "Manifest-Version: 1.0\n"))))) (format file "Manifest-Version: 1.0\n")))
#t))
(replace 'install (replace 'install
(install-jars "build")))))))) (install-jars "build"))))))))
@ -4345,7 +4350,8 @@ (define-public java-commons-bsf
(property (@ (name "tests.dir") (value "src/org/apache/bsf/test"))) (property (@ (name "tests.dir") (value "src/org/apache/bsf/test")))
(property (@ (name "build.tests") (value "build/test-classes"))) (property (@ (name "build.tests") (value "build/test-classes")))
(property (@ (name "build.dest") (value "build/classes")))) (property (@ (name "build.dest") (value "build/classes"))))
port))))) port)))
#t))
(replace 'install (install-jars "build"))))) (replace 'install (install-jars "build")))))
(native-inputs (native-inputs
`(("java-junit" ,java-junit))) `(("java-junit" ,java-junit)))
@ -5792,8 +5798,8 @@ (define-public java-slf4j-api
;; pom.xml ignores these files in the jar creation process. If we don't, ;; pom.xml ignores these files in the jar creation process. If we don't,
;; we get the error "This code should have never made it into slf4j-api.jar" ;; we get the error "This code should have never made it into slf4j-api.jar"
(delete-file-recursively "build/classes/org/slf4j/impl") (delete-file-recursively "build/classes/org/slf4j/impl")
(zero? (system* "jar" "-cf" "build/jar/slf4j-api.jar" "-C" (invoke "jar" "-cf" "build/jar/slf4j-api.jar" "-C"
"build/classes" ".")))) "build/classes" ".")))
(add-before 'check 'dont-test-abstract-classes (add-before 'check 'dont-test-abstract-classes
(lambda _ (lambda _
;; abstract classes are not meant to be run with junit ;; abstract classes are not meant to be run with junit
@ -5801,7 +5807,8 @@ (define-public java-slf4j-api
(("<include name=\"\\*\\*/\\*Test.java\" />") (("<include name=\"\\*\\*/\\*Test.java\" />")
(string-append "<include name=\"**/*Test.java\" />" (string-append "<include name=\"**/*Test.java\" />"
"<exclude name=\"**/MultithreadedInitializationTest" "<exclude name=\"**/MultithreadedInitializationTest"
".java\" />")))))))) ".java\" />")))
#t)))))
(inputs (inputs
`(("java-junit" ,java-junit) `(("java-junit" ,java-junit)
("java-hamcrest-core" ,java-hamcrest-core))) ("java-hamcrest-core" ,java-hamcrest-core)))
@ -5842,10 +5849,9 @@ (define-public java-slf4j-simple
(setenv "CLASSPATH" (setenv "CLASSPATH"
(string-append (getcwd) ":" (getenv "CLASSPATH"))) (string-append (getcwd) ":" (getenv "CLASSPATH")))
;; ... and build test helper classes here: ;; ... and build test helper classes here:
(zero? (apply invoke
(apply system* `("javac" "-d" "."
`("javac" "-d" "." ,@(find-files "slf4j-api/src/test" ".*\\.java"))))))))
,@(find-files "slf4j-api/src/test" ".*\\.java")))))))))
(inputs (inputs
`(("java-junit" ,java-junit) `(("java-junit" ,java-junit)
("java-hamcrest-core" ,java-hamcrest-core) ("java-hamcrest-core" ,java-hamcrest-core)
@ -5944,11 +5950,12 @@ (define-public java-stringtemplate-3
(add-before 'build 'generate-grammar (add-before 'build 'generate-grammar
(lambda _ (lambda _
(with-directory-excursion "src/org/antlr/stringtemplate/language/" (with-directory-excursion "src/org/antlr/stringtemplate/language/"
(every (lambda (file) (for-each (lambda (file)
(format #t "~a\n" file) (format #t "~a\n" file)
(zero? (system* "antlr" file))) (invoke "antlr" file))
'("template.g" "angle.bracket.template.g" "action.g" '("template.g" "angle.bracket.template.g" "action.g"
"eval.g" "group.g" "interface.g")))))))) "eval.g" "group.g" "interface.g")))
#t)))))
(native-inputs (native-inputs
`(("antlr" ,antlr2) `(("antlr" ,antlr2)
("java-junit" ,java-junit))) ("java-junit" ,java-junit)))
@ -6006,10 +6013,11 @@ (define-public java-stringtemplate
(add-before 'build 'generate-grammar (add-before 'build 'generate-grammar
(lambda _ (lambda _
(with-directory-excursion "src/org/stringtemplate/v4/compiler/" (with-directory-excursion "src/org/stringtemplate/v4/compiler/"
(every (lambda (file) (for-each (lambda (file)
(format #t "~a\n" file) (format #t "~a\n" file)
(zero? (system* "antlr3" file))) (invoke "antlr3" file))
'("STParser.g" "Group.g" "CodeGenerator.g")))))))) '("STParser.g" "Group.g" "CodeGenerator.g")))
#t)))))
(inputs (inputs
`(("antlr3" ,antlr3-bootstrap) `(("antlr3" ,antlr3-bootstrap)
("antlr2" ,antlr2) ("antlr2" ,antlr2)
@ -6076,14 +6084,15 @@ (define-public antlr3
"/lib") "/lib")
".*\\.jar")) ".*\\.jar"))
" org.antlr.Tool $*")))) " org.antlr.Tool $*"))))
(chmod (string-append bin "/antlr3") #o755)))) (chmod (string-append bin "/antlr3") #o755))
#t))
(add-before 'build 'generate-grammar (add-before 'build 'generate-grammar
(lambda _ (lambda _
(chdir "tool/src/main/antlr3/org/antlr/grammar/v3/") (chdir "tool/src/main/antlr3/org/antlr/grammar/v3/")
(for-each (lambda (file) (for-each (lambda (file)
(display file) (display file)
(newline) (newline)
(system* "antlr3" file)) (invoke "antlr3" file))
'("ANTLR.g" "ANTLRTreePrinter.g" "ActionAnalysis.g" '("ANTLR.g" "ANTLRTreePrinter.g" "ActionAnalysis.g"
"AssignTokenTypesWalker.g" "AssignTokenTypesWalker.g"
"ActionTranslator.g" "TreeToNFAConverter.g" "ActionTranslator.g" "TreeToNFAConverter.g"
@ -6094,14 +6103,15 @@ (define-public antlr3
(substitute* "ANTLRv3Parser.java" (substitute* "ANTLRv3Parser.java"
(("public Object getTree") "public CommonTree getTree")) (("public Object getTree") "public CommonTree getTree"))
(chdir "../../../../../java") (chdir "../../../../../java")
(system* "antlr" "-o" "org/antlr/tool" (invoke "antlr" "-o" "org/antlr/tool"
"org/antlr/tool/serialize.g") "org/antlr/tool/serialize.g")
(substitute* "org/antlr/tool/LeftRecursiveRuleAnalyzer.java" (substitute* "org/antlr/tool/LeftRecursiveRuleAnalyzer.java"
(("import org.antlr.grammar.v3.\\*;") "import org.antlr.grammar.v3.*; (("import org.antlr.grammar.v3.\\*;") "import org.antlr.grammar.v3.*;
import org.antlr.grammar.v3.ANTLRTreePrinter;")) import org.antlr.grammar.v3.ANTLRTreePrinter;"))
(substitute* "org/antlr/tool/ErrorManager.java" (substitute* "org/antlr/tool/ErrorManager.java"
(("case NO_SUCH_ATTRIBUTE_PASS_THROUGH:") "")) (("case NO_SUCH_ATTRIBUTE_PASS_THROUGH:") ""))
(chdir "../../../.."))) (chdir "../../../..")
#t))
(add-before 'build 'fix-build-xml (add-before 'build 'fix-build-xml
(lambda _ (lambda _
(substitute* "build.xml" (substitute* "build.xml"
@ -6112,7 +6122,8 @@ (define-public antlr3
<include name=\"**/*.sti\"/> <include name=\"**/*.sti\"/>
<include name=\"**/STLexer.tokens\"/> <include name=\"**/STLexer.tokens\"/>
</fileset> </fileset>
</copy><exec"))))))) </copy><exec"))
#t)))))
(native-inputs (native-inputs
`(("antlr" ,antlr2) `(("antlr" ,antlr2)
("antlr3" ,antlr3-bootstrap))) ("antlr3" ,antlr3-bootstrap)))
@ -6201,19 +6212,19 @@ (define antlr3-3.3
import org.antlr.grammar.v2.TreeToNFAConverter;\n import org.antlr.grammar.v2.TreeToNFAConverter;\n
import org.antlr.grammar.v2.DefineGrammarItemsWalker;\n import org.antlr.grammar.v2.DefineGrammarItemsWalker;\n
import org.antlr.grammar.v2.ANTLRTreePrinter;")) import org.antlr.grammar.v2.ANTLRTreePrinter;"))
(and (with-directory-excursion "tool/src/main/antlr2/org/antlr/grammar/v2/"
(with-directory-excursion "tool/src/main/antlr2/org/antlr/grammar/v2/" (for-each (lambda (file)
(every (lambda (file) (format #t "~a\n" file)
(format #t "~a\n" file) (invoke "antlr" file))
(zero? (system* "antlr" file))) '("antlr.g" "antlr.print.g" "assign.types.g"
'("antlr.g" "antlr.print.g" "assign.types.g" "buildnfa.g" "codegen.g" "define.g")))
"buildnfa.g" "codegen.g" "define.g"))) (with-directory-excursion "tool/src/main/antlr3/org/antlr/grammar/v3/"
(with-directory-excursion "tool/src/main/antlr3/org/antlr/grammar/v3/" (for-each (lambda (file)
(every (lambda (file) (format #t "~a\n" file)
(format #t "~a\n" file) (invoke "antlr3" file))
(zero? (system* "antlr3" file))) '("ActionAnalysis.g" "ActionTranslator.g" "ANTLRv3.g"
'("ActionAnalysis.g" "ActionTranslator.g" "ANTLRv3.g" "ANTLRv3Tree.g")))
"ANTLRv3Tree.g")))))) #t))
(add-before 'build 'fix-build-xml (add-before 'build 'fix-build-xml
(lambda _ (lambda _
(substitute* "build.xml" (substitute* "build.xml"
@ -6276,7 +6287,8 @@ (define antlr3-3.1
"/lib") "/lib")
".*\\.jar")) ".*\\.jar"))
" org.antlr.Tool $*")))) " org.antlr.Tool $*"))))
(chmod (string-append bin "/antlr3") #o755)))) (chmod (string-append bin "/antlr3") #o755))
#t))
(add-before 'build 'generate-grammar (add-before 'build 'generate-grammar
(lambda _ (lambda _
(let ((dir "src/org/antlr/tool/")) (let ((dir "src/org/antlr/tool/"))
@ -6300,7 +6312,8 @@ (define antlr3-3.1
<include name=\"**/*.sti\"/> <include name=\"**/*.sti\"/>
<include name=\"**/STLexer.tokens\"/> <include name=\"**/STLexer.tokens\"/>
</fileset> </fileset>
</copy><exec"))))))) </copy><exec"))
#t)))))
(native-inputs (native-inputs
`(("antlr" ,antlr2))) `(("antlr" ,antlr2)))
(inputs (inputs
@ -6925,7 +6938,8 @@ (define-public java-ops4j-base-lang
(string-append (string-append
"version=" ,version "\n" "version=" ,version "\n"
"groupId=org.ops4j.base" "groupId=org.ops4j.base"
"artifactId=ops4j-base-lang\n"))))))))) "artifactId=ops4j-base-lang\n"))))
#t)))))
(home-page "https://ops4j1.jira.com/wiki/spaces/base/overview") (home-page "https://ops4j1.jira.com/wiki/spaces/base/overview")
(synopsis "Utility classes and extensions to be used in OPS4J projects") (synopsis "Utility classes and extensions to be used in OPS4J projects")
(description "OPS4J stands for Open Participation Software for Java. This (description "OPS4J stands for Open Participation Software for Java. This
@ -7163,7 +7177,8 @@ (define-public java-ops4j-pax-tinybundles
;; it with our own version. ;; it with our own version.
(substitute* "src/test/java/org/ops4j/pax/tinybundles/bnd/BndTest.java" (substitute* "src/test/java/org/ops4j/pax/tinybundles/bnd/BndTest.java"
(("[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*") (("[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*")
,(package-version java-aqute-bndlib)))))))) ,(package-version java-aqute-bndlib)))
#t)))))
(inputs (inputs
`(("lang" ,java-ops4j-base-lang) `(("lang" ,java-ops4j-base-lang)
("io" ,java-ops4j-base-io) ("io" ,java-ops4j-base-io)
@ -7238,7 +7253,8 @@ (define-public java-ops4j-pax-exam-core-spi
(add-before 'configure 'chdir (add-before 'configure 'chdir
(lambda _ (lambda _
;; Tests assume we are in this directory ;; Tests assume we are in this directory
(chdir "core/pax-exam-spi"))) (chdir "core/pax-exam-spi")
#t))
(add-before 'check 'fix-tests (add-before 'check 'fix-tests
(lambda _ (lambda _
;; One test checks that this file is present. ;; One test checks that this file is present.
@ -7257,7 +7273,8 @@ (define-public java-ops4j-pax-exam-core-spi
(("target") "build")) (("target") "build"))
;; One test is expected to fail, but it doesn't throw the expected exception ;; One test is expected to fail, but it doesn't throw the expected exception
(substitute* "src/test/java/org/ops4j/pax/exam/spi/reactors/BaseStagedReactorTest.java" (substitute* "src/test/java/org/ops4j/pax/exam/spi/reactors/BaseStagedReactorTest.java"
(("AssertionError") "IllegalArgumentException"))))))) (("AssertionError") "IllegalArgumentException"))
#t)))))
(inputs (inputs
`(("java-ops4j-pax-exam-core" ,java-ops4j-pax-exam-core) `(("java-ops4j-pax-exam-core" ,java-ops4j-pax-exam-core)
("lang" ,java-ops4j-base-lang) ("lang" ,java-ops4j-base-lang)
@ -7357,15 +7374,18 @@ (define-public java-fasterxml-jackson-core
(("@package@") "com.fasterxml.jackson.core.json") (("@package@") "com.fasterxml.jackson.core.json")
(("@projectversion@") ,version) (("@projectversion@") ,version)
(("@projectgroupid@") "com.fasterxml.jackson.core") (("@projectgroupid@") "com.fasterxml.jackson.core")
(("@projectartifactid@") "jackson-core"))))) (("@projectartifactid@") "jackson-core")))
#t))
(add-before 'build 'copy-resources (add-before 'build 'copy-resources
(lambda _ (lambda _
(copy-recursively "src/main/resources" (copy-recursively "src/main/resources"
"build/classes"))) "build/classes")
#t))
(add-before 'check 'copy-test-resources (add-before 'check 'copy-test-resources
(lambda _ (lambda _
(copy-recursively "src/test/resources" (copy-recursively "src/test/resources"
"build/test-classes")))))) "build/test-classes")
#t)))))
(native-inputs (native-inputs
`(("junit" ,java-junit) `(("junit" ,java-junit)
("hamcrest" ,java-hamcrest-core))) ("hamcrest" ,java-hamcrest-core)))
@ -7402,10 +7422,12 @@ (define-public java-fasterxml-jackson-databind
(("@package@") "com.fasterxml.jackson.databind.cfg") (("@package@") "com.fasterxml.jackson.databind.cfg")
(("@projectversion@") ,version) (("@projectversion@") ,version)
(("@projectgroupid@") "com.fasterxml.jackson.databind") (("@projectgroupid@") "com.fasterxml.jackson.databind")
(("@projectartifactid@") "jackson-databind"))))) (("@projectartifactid@") "jackson-databind")))
#t))
(add-before 'build 'copy-resources (add-before 'build 'copy-resources
(lambda _ (lambda _
(copy-recursively "src/main/resources" "build/classes")))))) (copy-recursively "src/main/resources" "build/classes")
#t)))))
(inputs (inputs
`(("java-fasterxml-jackson-annotations" ,java-fasterxml-jackson-annotations) `(("java-fasterxml-jackson-annotations" ,java-fasterxml-jackson-annotations)
("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core))) ("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core)))
@ -7449,10 +7471,12 @@ (define-public java-fasterxml-jackson-modules-base-jaxb
(("@package@") "com.fasterxml.jackson.module.jaxb") (("@package@") "com.fasterxml.jackson.module.jaxb")
(("@projectversion@") ,version) (("@projectversion@") ,version)
(("@projectgroupid@") "com.fasterxml.jackson.module.jaxb") (("@projectgroupid@") "com.fasterxml.jackson.module.jaxb")
(("@projectartifactid@") "jackson-module-jaxb"))))) (("@projectartifactid@") "jackson-module-jaxb")))
#t))
(add-before 'build 'copy-resources (add-before 'build 'copy-resources
(lambda _ (lambda _
(copy-recursively "jaxb/src/main/resources" "build/classes")))))) (copy-recursively "jaxb/src/main/resources" "build/classes")
#t)))))
(inputs (inputs
`(("java-fasterxml-jackson-annotations" ,java-fasterxml-jackson-annotations) `(("java-fasterxml-jackson-annotations" ,java-fasterxml-jackson-annotations)
("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core) ("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core)
@ -7517,7 +7541,8 @@ (define-public java-fasterxml-jackson-dataformat-yaml
(("@package@") "com.fasterxml.jackson.dataformat.yaml") (("@package@") "com.fasterxml.jackson.dataformat.yaml")
(("@projectversion@") ,version) (("@projectversion@") ,version)
(("@projectgroupid@") "com.fasterxml.jackson.dataformat.yaml") (("@projectgroupid@") "com.fasterxml.jackson.dataformat.yaml")
(("@projectartifactid@") "jackson-dataformat-yaml")))))))) (("@projectartifactid@") "jackson-dataformat-yaml")))
#t)))))
(inputs (inputs
`(("java-fasterxml-jackson-annotations" ,java-fasterxml-jackson-annotations) `(("java-fasterxml-jackson-annotations" ,java-fasterxml-jackson-annotations)
("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core) ("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core)
@ -7584,10 +7609,12 @@ (define-public java-woodstox-core
;; msv's latest release is from 2011 and we don't need it ;; msv's latest release is from 2011 and we don't need it
(delete-file-recursively "src/main/java/com/ctc/wstx/msv") (delete-file-recursively "src/main/java/com/ctc/wstx/msv")
(delete-file-recursively "src/test/java/wstxtest/osgi") (delete-file-recursively "src/test/java/wstxtest/osgi")
(delete-file-recursively "src/test/java/wstxtest/msv"))) (delete-file-recursively "src/test/java/wstxtest/msv")
#t))
(add-before 'build 'copy-resources (add-before 'build 'copy-resources
(lambda _ (lambda _
(copy-recursively "src/main/resources" "build/classes")))))) (copy-recursively "src/main/resources" "build/classes")
#t)))))
(inputs (inputs
`(("stax2" ,java-stax2-api))) `(("stax2" ,java-stax2-api)))
(native-inputs (native-inputs
@ -7627,10 +7654,12 @@ (define-public java-fasterxml-jackson-dataformat-xml
(("@package@") "com.fasterxml.jackson.dataformat.xml") (("@package@") "com.fasterxml.jackson.dataformat.xml")
(("@projectversion@") ,version) (("@projectversion@") ,version)
(("@projectgroupid@") "com.fasterxml.jackson.dataformat.xml") (("@projectgroupid@") "com.fasterxml.jackson.dataformat.xml")
(("@projectartifactid@") "jackson-dataformat-xml"))))) (("@projectartifactid@") "jackson-dataformat-xml")))
#t))
(add-before 'build 'copy-resources (add-before 'build 'copy-resources
(lambda _ (lambda _
(copy-recursively "src/main/resources" "build/classes")))))) (copy-recursively "src/main/resources" "build/classes")
#t)))))
(inputs (inputs
`(("jackson-annotations" ,java-fasterxml-jackson-annotations) `(("jackson-annotations" ,java-fasterxml-jackson-annotations)
("jackson-core" ,java-fasterxml-jackson-core) ("jackson-core" ,java-fasterxml-jackson-core)
@ -8105,15 +8134,15 @@ (define-public java-testng
#t)) #t))
(replace 'check (replace 'check
(lambda _ (lambda _
(system* "ant" "compile-tests") (invoke "ant" "compile-tests")
;; we don't have groovy ;; we don't have groovy
(substitute* "src/test/resources/testng.xml" (substitute* "src/test/resources/testng.xml"
(("<class name=\"test.groovy.GroovyTest\" />") "")) (("<class name=\"test.groovy.GroovyTest\" />") ""))
(zero? (system* "java" "-cp" (string-append (getenv "CLASSPATH") (invoke "java" "-cp" (string-append (getenv "CLASSPATH")
":build/classes" ":build/classes"
":build/test-classes") ":build/test-classes")
"-Dtest.resources.dir=src/test/resources" "-Dtest.resources.dir=src/test/resources"
"org.testng.TestNG" "src/test/resources/testng.xml"))))))) "org.testng.TestNG" "src/test/resources/testng.xml"))))))
(propagated-inputs (propagated-inputs
`(("junit" ,java-junit) `(("junit" ,java-junit)
("java-jsr305" ,java-jsr305) ("java-jsr305" ,java-jsr305)
@ -8177,8 +8206,7 @@ (define-public java-jnacl
":build/classes" ":build/classes"
":build/test-classes") ":build/test-classes")
"org.testng.TestNG" "-testclass" "org.testng.TestNG" "-testclass"
"build/test-classes/com/neilalexander/jnacl/NaClTest.class") "build/test-classes/com/neilalexander/jnacl/NaClTest.class"))))))
#t)))))
(native-inputs (native-inputs
`(("java-testng" ,java-testng) `(("java-testng" ,java-testng)
("java-fest-util" ,java-fest-util) ("java-fest-util" ,java-fest-util)
@ -8361,8 +8389,7 @@ (define-public java-bouncycastle
(replace 'build (replace 'build
(lambda _ (lambda _
(invoke "ant" "-f" "ant/jdk15+.xml" "build-provider") (invoke "ant" "-f" "ant/jdk15+.xml" "build-provider")
(invoke "ant" "-f" "ant/jdk15+.xml" "build") (invoke "ant" "-f" "ant/jdk15+.xml" "build")))
#t))
;; FIXME: the tests freeze. ;; FIXME: the tests freeze.
;; (replace 'check ;; (replace 'check
;; (lambda _ ;; (lambda _
@ -8540,7 +8567,8 @@ (define-public java-powermock-core
(add-before 'build 'copy-resources (add-before 'build 'copy-resources
(lambda _ (lambda _
(copy-recursively "powermock-core/src/main/resources" (copy-recursively "powermock-core/src/main/resources"
"build/classes")))))) "build/classes")
#t)))))
(inputs (inputs
`(("reflect" ,java-powermock-reflect) `(("reflect" ,java-powermock-reflect)
("javassist" ,java-jboss-javassist))) ("javassist" ,java-jboss-javassist)))
@ -8597,7 +8625,8 @@ (define-public java-powermock-modules-junit4
;; Our junit version is 4.12-SNAPSHOT ;; Our junit version is 4.12-SNAPSHOT
(substitute* (find-files "powermock-modules/powermock-module-junit4" (substitute* (find-files "powermock-modules/powermock-module-junit4"
"PowerMockJUnit4MethodValidator.java") "PowerMockJUnit4MethodValidator.java")
(("4.12") "4.12-SNAPSHOT"))))))) (("4.12") "4.12-SNAPSHOT"))
#t)))))
(inputs (inputs
`(("core" ,java-powermock-core) `(("core" ,java-powermock-core)
("reflect" ,java-powermock-reflect) ("reflect" ,java-powermock-reflect)
@ -9062,8 +9091,7 @@ (define-public java-jansi-native
(string-append "-I" (assoc-ref inputs "jdk") (string-append "-I" (assoc-ref inputs "jdk")
"/include/linux") "/include/linux")
"-fPIC" "-O2") "-fPIC" "-O2")
(invoke "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o") (invoke "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o"))))
#t)))
(add-before 'build 'install-native (add-before 'build 'install-native
(lambda _ (lambda _
(let ((dir (string-append "build/classes/META-INF/native/" (let ((dir (string-append "build/classes/META-INF/native/"
@ -9108,7 +9136,7 @@ (define-public java-jansi
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'check 'clear-term (add-after 'check 'clear-term
(lambda _ (lambda _
(zero? (system* "echo" "-e" "\\e[0m"))))))) (invoke "echo" "-e" "\\e[0m"))))))
(inputs (inputs
`(("java-jansi-native" ,java-jansi-native))) `(("java-jansi-native" ,java-jansi-native)))
(native-inputs (native-inputs
@ -9572,7 +9600,8 @@ (define-public java-commons-httpclient
'("src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java" '("src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java"
"src/examples/TrivialApp.java" "src/examples/ClientApp.java" "src/examples/TrivialApp.java" "src/examples/ClientApp.java"
"src/test/org/apache/commons/httpclient/TestHttps.java" "src/test/org/apache/commons/httpclient/TestHttps.java"
"src/test/org/apache/commons/httpclient/TestURIUtil2.java")))) "src/test/org/apache/commons/httpclient/TestURIUtil2.java"))
#t))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(invoke "ant" "dist" (invoke "ant" "dist"
@ -9622,7 +9651,8 @@ (define-public java-commons-vfs
(lambda _ (lambda _
(for-each delete-file-recursively (for-each delete-file-recursively
'("commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/webdav" '("commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/webdav"
"commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs"))))))) "commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/hdfs"))
#t)))))
(inputs (inputs
`(("java-commons-collections4" ,java-commons-collections4) `(("java-commons-collections4" ,java-commons-collections4)
("java-commons-compress" ,java-commons-compress) ("java-commons-compress" ,java-commons-compress)
@ -9933,7 +9963,8 @@ (define-public java-apache-ivy
(find-files "." ".*.properties") (find-files "." ".*.properties")
(find-files "." ".*.xsd") (find-files "." ".*.xsd")
(find-files "." ".*.xsl") (find-files "." ".*.xsl")
(find-files "." ".*.xml")))))) (find-files "." ".*.xml"))))
#t))
(add-before 'build 'fix-vfs (add-before 'build 'fix-vfs
(lambda _ (lambda _
(substitute* (substitute*
@ -9948,8 +9979,7 @@ (define-public java-apache-ivy
(add-before 'install 'repack (add-before 'install 'repack
(lambda _ (lambda _
(invoke "jar" "-cmf" "build/classes/META-INF/MANIFEST.MF" "build/jar/ivy.jar" (invoke "jar" "-cmf" "build/classes/META-INF/MANIFEST.MF" "build/jar/ivy.jar"
"-C" "build/classes" ".") "-C" "build/classes" ".")))
#t))
(add-after 'install 'install-bin (add-after 'install 'install-bin
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((bin (string-append (assoc-ref outputs "out") "/bin")) (let* ((bin (string-append (assoc-ref outputs "out") "/bin"))
@ -10162,7 +10192,8 @@ (define-public java-janino
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'chdir (add-before 'configure 'chdir
(lambda _ (lambda _
(chdir "janino")))))) (chdir "janino")
#t)))))
(inputs (inputs
`(("java-commons-compiler" ,java-commons-compiler))) `(("java-commons-compiler" ,java-commons-compiler)))
(native-inputs (native-inputs
@ -10187,7 +10218,9 @@ (define-public java-logback-core
"1x6ga74yfgm94cfx98gybakbrlilx8i2gn6dx13l40kasmys06mi")) "1x6ga74yfgm94cfx98gybakbrlilx8i2gn6dx13l40kasmys06mi"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(delete-file-recursively "logback-access/lib")))) '(begin
(delete-file-recursively "logback-access/lib")
#t))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "logback.jar" `(#:jar-name "logback.jar"

9
guix/build/ant-build-system.scm
View file

@ -179,10 +179,11 @@ (define* (generate-jar-indices #:key outputs #:allow-other-keys)
dependencies of this jar file." dependencies of this jar file."
(define (generate-index jar) (define (generate-index jar)
(invoke "jar" "-i" jar)) (invoke "jar" "-i" jar))
(every (match-lambda (for-each (match-lambda
((output . directory) ((output . directory)
(every generate-index (find-files directory "\\.jar$")))) (for-each generate-index (find-files directory "\\.jar$"))))
outputs)) outputs)
#t)
(define* (strip-jar-timestamps #:key outputs (define* (strip-jar-timestamps #:key outputs
#:allow-other-keys) #:allow-other-keys)

2
guix/build/java-utils.scm
View file

@ -31,7 +31,7 @@ (define (package-name-version store-dir)
(define* (ant-build-javadoc #:key (target "javadoc") (make-flags '()) (define* (ant-build-javadoc #:key (target "javadoc") (make-flags '())
#:allow-other-keys) #:allow-other-keys)
(zero? (apply system* `("ant" ,target ,@make-flags)))) (apply invoke `("ant" ,target ,@make-flags)))
(define* (install-jars jar-directory) (define* (install-jars jar-directory)
"Install jar files from JAR-DIRECTORY to the default target directory. This "Install jar files from JAR-DIRECTORY to the default target directory. This