comments for groovy 3.0.0

Julien LepillerWed Dec 13 23:39:34+0100 2017

0b5b3bd

comments for groovy 3.0.0

more/packages/groovy.scm

3333 
  (package
3434 
    (name "groovy-java-bootstrap")
3535 
    (version "2.4.13")
36+
    ;(version "3.0.0-alpha1")
3637 
    (source (origin
3738 
              (method url-fetch)
3839 
              (uri (string-append "https://github.com/apache/groovy/archive/GROOVY_"
3940 
                                  "2_4_13.tar.gz"))
41+
              ;(uri (string-append "https://github.com/apache/groovy/archive/GROOVY_"
42+
              ;                    "3_0_0_ALPHA_1.tar.gz"))
4043 
              (file-name (string-append name "-" version ".tar.gz"))
4144 
              (sha256
4245 
               (base32
4346 
                "0qf1l029ilhnldmd194aybk3053apya3vfd33d3m80n2zh2wnbc1"))
47+
              ;  "0iqqp9mf5ar2y4c33i8i1rvnb1yi1k905yjr3gnx8i2hzbmkscr3"))
4448 
              (patches
4549 
                (search-patches
4650 
                  "groovy-Add-exceptionutilsgenerator.patch"))))

…

5054 
       #:source-dir "src/main:subprojects/groovy-test/src/main/java"
5155 
       #:test-dir "src/test"
5256 
       #:tests? #f
53-
       ;; Reference to plus is ambiguous
54-
       ;#:jdk ,icedtea-8
57+
       #:jdk ,icedtea-8
5558 
       #:main-class "groovy.ui.GroovyMain"
5659 
       #:phases
5760 
       (modify-phases %standard-phases
58-
         (add-before 'build 'generate-parser
61+
         (add-before 'build 'fix-java8
62+
           ;; Fix "Reference to plus is ambiguous"
63+
           (lambda _
64+
             (substitute* "src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java"
65+
               (("toList\\(left\\)")
66+
                "(List<T>)toList(left)"))))
67+
         (add-before 'build 'generate-parsers
5968 
           (lambda _
6069 
             (with-directory-excursion "src/main/org/codehaus/groovy/antlr/java"
6170 
               (zero? (system* "antlr" "java.g")))

…

7988 
       ("java-xmlunit-legacy" ,java-xmlunit-legacy)))
8089 
    (inputs
8190 
     `(("java-commons-cli" ,java-commons-cli)
91+
       ;("java-asm-6" ,java-asm-6)
8292 
       ("java-asm" ,java-asm)
8393 
       ("java-classpathx-servletapi" ,java-classpathx-servletapi)
8494 
       ("java-xstream" ,java-xstream)

…

96106 
    (name "groovy-bootstrap")
97107 
    (arguments
98108 
     `(#:jar-name "groovy.jar"
109+
       #:jdk ,icedtea-8
99110 
       ;Requires groovy-xml and logback-classic which are circular dependencies
100111 
       #:tests? #f
101112 
       #:phases
102113 
       (modify-phases %standard-phases
114+
         (add-before 'build 'fix-java8
115+
           ;; Fix "Reference to plus is ambiguous"
116+
           (lambda _
117+
             (substitute* "src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java"
118+
               (("toList\\(left\\)")
119+
                "(List<T>)toList(left)"))))
103120 
         (add-before 'build 'generate-parser
104121 
           (lambda _
105122 
             (with-directory-excursion "src/main/org/codehaus/groovy/antlr/java"

…

161178 
    (name "groovy-tests-bootstrap")
162179 
    (arguments
163180 
     `(#:jar-name "groovy-tests-bootstrap.jar"
181+
       #:jdk ,icedtea-8
164182 
       #:tests? #f; no tests
165183 
       #:phases
166184 
       (modify-phases %standard-phases

…

186204 
     `(("groovy-bootstrap" ,groovy-bootstrap)
187205 
       ,@(package-native-inputs groovy-java-bootstrap)))))
188206 
207+
; for groovy-3.0.0
208+
;(define-public groovy-parser-antlr4
209+
;  (package
210+
;    (inherit groovy-java-bootstrap)
211+
;    (name "groovy-parser-antlr4")
212+
;    (arguments
213+
;     `(#:jar-name "groovy-parser-antlr4.jar"
214+
;       #:jdk ,icedtea-8
215+
;       #:test-dir "subprojects/parser-antlr4/src/test"
216+
;       #:source-dir "subprojects/parser-antlr4/src/main/java"
217+
;       #:phases
218+
;       (modify-phases %standard-phases
219+
;         (add-before 'build 'generate-parser
220+
;           (lambda _
221+
;             (with-directory-excursion "src/antlr"
222+
;               (zero? (system* "antlr4" "-visitor" "-no-listener" "-package"
223+
;                               "org.apache.groovy.parser.antlr4"
224+
;                               "-o" "../../subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4"
225+
;                               "GroovyLexer.g4"))
226+
;               (zero? (system* "antlr4" "-visitor" "-no-listener" "-package"
227+
;                               "org.apache.groovy.parser.antlr4"
228+
;                               "-o" "../../subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4"
229+
;                               "GroovyParser.g4"))))))))
230+
;                               ;"-lib" "src/antlr" "-Xlog")))))))
231+
;    (inputs
232+
;     `(("groovy-java-bootstrap" ,groovy-java-bootstrap)
233+
;       ("java-antlr4" ,java-antlr4)
234+
;       ("java-antlr4-runtime" ,java-antlr4-runtime)
235+
;       ,@(package-inputs groovy-java-bootstrap)))))
236+
189237 
(define-public groovy-test
190238 
  (package
191239 
    (inherit groovy-bootstrap)
192240 
    (name "groovy-test")
193241 
    (arguments
194242 
     `(#:jar-name "groovy-test.jar"
243+
       #:jdk ,icedtea-8
195244 
       #:test-dir "subprojects/groovy-test/src/test"
196245 
       #:phases
197246 
       (modify-phases %standard-phases
…
233282 
    (name "groovy-xml")
234283 
    (arguments
235284 
     `(#:jar-name "groovy-xml.jar"
285+
       #:jdk ,icedtea-8
236286 
       #:test-dir "src/test"
237287 
       #:phases
238288 
       (modify-phases %standard-phases
…
280330 
    (name "groovy-templates")
281331 
    (arguments
282332 
     `(#:jar-name "groovy-templates.jar"
333+
       #:jdk ,icedtea-8
283334 
       #:test-dir "subprojects/groovy-templates/src/test"
284335 
       #:tests? #f;Requires spock-framework which is a circular dependency
285336 
       #:phases
…
312363 
    (name "groovy-groovydoc")
313364 
    (arguments
314365 
     `(#:jar-name "groovy-groovydoc.jar"
366+
       #:jdk ,icedtea-8
315367 
       #:test-dir "subprojects/groovy-groovydoc/src/test"
316368 
       #:tests? #f; Requires groovy-ant which is a circular dependency
317369 
       #:phases
…
348400 
    (name "groovy-ant")
349401 
    (arguments
350402 
     `(#:jar-name "groovy-ant.jar"
403+
       #:jdk ,icedtea-8
351404 
       #:test-dir "src/test"
352405 
       ;; FIXME: Excluding all tests because they fail
353406 
       #:test-exclude (list
…
405458 
    (name "groovy-bsf")
406459 
    (arguments
407460 
     `(#:jar-name "groovy-bsf.jar"
461+
       #:jdk ,icedtea-8
408462 
       #:test-dir "src/test"
409463 
       #:test-exclude (list
410464 
;; exception from Groovy: org.codehaus.groovy.runtime.InvokerInvocationException:
…
461515 
    (name "groovy-swing")
462516 
    (arguments
463517 
     `(#:jar-name "groovy-swing.jar"
518+
       #:jdk ,icedtea-8
464519 
       ;; FIXME: tests are not run
465520 
       #:test-dir "src/test"
466521 
       #:phases
…
511566 
    (name "groovy-console")
512567 
    (arguments
513568 
     `(#:jar-name "groovy-console.jar"
569+
       #:jdk ,icedtea-8
514570 
       ;; FIXME: tests are not run
515571 
       #:test-dir "src/test"
516572 
       #:phases
…
572628 
    (name "groovy-docgenerator")
573629 
    (arguments
574630 
     `(#:jar-name "groovy-docgenerator.jar"
631+
       #:jdk ,icedtea-8
575632 
       #:tests? #f; No tests
576633 
       #:phases
577634 
       (modify-phases %standard-phases
…
845902 
    (inherit groovy-bootstrap)
846903 
    (name "groovy-servlet")
847904 
    (arguments
848-
     `(#:jar-name "groovy-jsr223.jar"
905+
     `(#:jar-name "groovy-servlet.jar"
849906 
       #:test-dir "src/test"
850907 
       #:jdk ,icedtea-8
851908 
       #:phases
…
9611018 
       ("groovy-tests-bootstrap" ,groovy-tests-bootstrap)
9621019 
       ,@(package-native-inputs groovy-java-bootstrap)))))
9631020 
1021+
(define-public groovy-macro
1022+
  (package
1023+
    (inherit groovy-bootstrap)
1024+
    (name "groovy-macro")
1025+
    (arguments
1026+
     `(#:jar-name "groovy-macro.jar"
1027+
       #:test-dir "src/test"
1028+
       #:jdk ,icedtea-8
1029+
       #:phases
1030+
       (modify-phases %standard-phases
1031+
         (add-before 'configure 'chdir
1032+
           (lambda _
1033+
             (chdir "subprojects/groovy-macro")))
1034+
         (replace 'build
1035+
           (lambda _
1036+
             (mkdir-p "build/classes")
1037+
             (mkdir-p "build/jar")
1038+
             (and
1039+
               (zero? (apply system* "java" "-cp" (getenv "CLASSPATH")
1040+
                               "org.codehaus.groovy.tools.FileSystemCompiler"
1041+
                               "-d" "build/classes"
1042+
                               "-j"; joint compilation
1043+
                               (find-files "src/main"
1044+
                                           ".*\\.(groovy|java)$")))
1045+
               (zero? (system* "jar" "-cf" "build/jar/groovy-macro.jar"
1046+
                               "-C" "build/classes" ".")))))
1047+
         (replace 'check
1048+
           (lambda _
1049+
             (mkdir-p "build/test-classes")
1050+
             (substitute* "build.xml"
1051+
               (("depends=\"compile-tests\"") "depends=\"\"")
1052+
               (("}/java") "}/groovy"))
1053+
             (and
1054+
               (zero? (apply system* "java" "-cp"
1055+
                             (string-append (getenv "CLASSPATH") ":build/classes")
1056+
                             "org.codehaus.groovy.tools.FileSystemCompiler"
1057+
                             "-d" "build/test-classes"
1058+
                             "-j"
1059+
                             (append
1060+
                               (find-files "src/test"
1061+
                                           ".*\\.(groovy|java)$"))))
1062+
               (zero? (system* "ant" "check"))))))))
1063+
    (inputs
1064+
     `(("groovy-templates" ,groovy-templates)
1065+
       ("groovy-xml" ,groovy-xml)
1066+
       ,@(package-inputs groovy-bootstrap)))
1067+
    (native-inputs
1068+
     `(("groovy-bootstrap" ,groovy-bootstrap)
1069+
       ("groovy-json" ,groovy-json)
1070+
       ("groovy-test" ,groovy-test)
1071+
       ("groovy-tests-bootstrap" ,groovy-tests-bootstrap)
1072+
       ,@(package-native-inputs groovy-java-bootstrap)))))
1073+
9641074 
(define-public groovy
9651075 
  (package
9661076 
    (inherit groovy-bootstrap)
9671077 
    (name "groovy")
9681078 
    (arguments
9691079 
     `(#:tests? #f; No tests
1080+
       #:jdk ,icedtea-8
9701081 
       #:phases
9711082 
       (modify-phases %standard-phases
9721083 
         (delete 'configure)
…
9961107 
                                 "java-commons-cli" "java-asm"
9971108 
                                 "java-classpathx-servletapi" "java-xstream"
9981109 
                                 "java-jansi" "java-jline-2" "antlr2")))
999-
                        ":"))))
1110+
                        ":")))
1111+
                   (("MAX_FD=\"maximum\"")
1112+
                    (string-append
1113+
                      "MAX_FD=\"maximum\"\nJAVACMD="
1114+
                      (assoc-ref inputs "jdk") "/bin/java")))
10001115 
                 (for-each
10011116 
                   (lambda (tool)
10021117 
                     (install-file tool out-bin)