Improve j2objc and error-prone

Julien LepillerMon May 15 17:36:44+0200 2017

90eca8e

Improve j2objc and error-prone

more/packages/java.scm

321321 
    (license license:asl2.0)))
322322
323323 
324-
;; https://github.com/KengoTODA/java-diff-utils ?
325324 
;; com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE
326325 
;; com.sun.source.tree.PackageTree
327326 
;; com.sun.tools.javac.tree.JCTree.JCPackageDecl
327+
328+
;; TODO: error-prone depends on java9 at least from version 2.0.13 which is the
329+
;; earliest version that guava can use.
330+
;; Fortunately, java7 can be used for -annotations.
328331 
(define-public java-error-prone
329332 
  (package
330333 
    (name "java-error-prone")
…
356359 
    (description "")
357360 
    (license license:asl2.0)))
358361 
359-
(define-public java-error-prone-check-api
360-
  (package
361-
    (inherit java-error-prone)
362-
    (name "java-error-prone-check-api")
363-
    (version (package-version java-error-prone))
364-
    (arguments
365-
     `(#:tests? #f
366-
       #:jdk ,icedtea-8
367-
       #:jar-name (string-append ,name "-" ,version ".jar")
368-
       #:source-dir "check_api/src/main/java"))
369-
    (propagated-inputs
370-
     `(("java-error-prone-annotations" ,java-error-prone-annotations)
371-
       ("java-error-prone-annotation" ,java-error-prone-annotation)
372-
       ("java-jsr305" ,java-jsr305)
373-
       ("java-diff-utils" ,java-diff-utils)
374-
       ("java-auto-value" ,java-auto-value)
375-
       ("java-checker-framework" ,java-checker-framework)
376-
       ("java-guava" ,java-guava)))))
362+
;(define-public java-error-prone-check-api
363+
;  (package
364+
;    (inherit java-error-prone)
365+
;    (name "java-error-prone-check-api")
366+
;    (version (package-version java-error-prone))
367+
;    (arguments
368+
;     `(#:tests? #f
369+
;       #:jdk ,icedtea-8
370+
;       #:jar-name (string-append ,name "-" ,version ".jar")
371+
;       #:source-dir "check_api/src/main/java"))
372+
;    (propagated-inputs
373+
;     `(("java-error-prone-annotations" ,java-error-prone-annotations)
374+
;       ("java-error-prone-annotation" ,java-error-prone-annotation)
375+
;       ("java-jsr305" ,java-jsr305)
376+
;       ("java-diff-utils" ,java-diff-utils)
377+
;       ("java-auto-value" ,java-auto-value)
378+
;       ("java-checker-framework" ,java-checker-framework)
379+
;       ("java-guava" ,java-guava)))))
380+
381+
;(define-public java-error-prone-core
382+
;  (package
383+
;    (inherit java-error-prone)
384+
;    (name "java-error-prone-core")
385+
;    (version (package-version java-error-prone))
386+
;    (arguments
387+
;     `(#:tests? #f
388+
;       #:jdk ,icedtea-8
389+
;       #:jar-name (string-append ,name "-" ,version ".jar")
390+
;       #:source-dir "core/src/main/java"))
391+
;    (propagated-inputs
392+
;     `(("java-error-prone-annotations" ,java-error-prone-annotations)
393+
;       ("java-error-prone-annotation" ,java-error-prone-annotation)
394+
;       ("java-jsr305" ,java-jsr305)
395+
;       ("java-auto-value" ,java-auto-value)
396+
;       ("java-checker-framework" ,java-checker-framework)
397+
;       ("java-guava" ,java-guava)))))
377398 
378399 
(define-public java-error-prone-annotation
379400 
  (package
…
400421 
    (propagated-inputs
401422 
     `(("java-jsr305" ,java-jsr305)))))
402423 
403-
(define-public java-j2objc
424+
;; Java-j2objc is for OS X, but the annotations sub-project is used by other
425+
;; packages here, such as guava.
426+
(define-public java-j2objc-annotations
404427 
  (package
405-
    (name "java-j2objc")
428+
    (name "java-j2objc-annotations")
406429 
    (version "1.3.1")
407430 
    (source (origin
408431 
              (method url-fetch)
409432 
              (uri (string-append "https://github.com/google/j2objc/archive/"
410433 
                                  version ".tar.gz"))
411434 
              (file-name (string-append name "-" version ".tar.gz"))
412-
              (patches (search-patches "java-j2objc-add-build.xml.patch"))
413435 
              (sha256
414436 
               (base32
415437 
                "0d5spbr1whw2afg6mknyr7ifm6xivn3bbvnzjxva2zzkyq944hv0"))))
416438 
    (build-system ant-build-system)
417439 
    (arguments
418-
     `(#:tests? #f))
419-
    (home-page "http://j2objc.org")
440+
     `(#:tests? #f
441+
       #:jar-name (string-append ,name "-" ,version ".jar")
442+
       #:source-dir "annotations/src/main/java"))
420443 
    (synopsis "")
421444 
    (description "")
422445 
    (license license:asl2.0)))
423446 
424-
(define-public java-j2objc-annotations
425-
  (package
426-
    (inherit java-j2objc)
427-
    (name "java-j2objc-annotations")
428-
    (version "1.3.1")
429-
    (arguments
430-
     `(#:tests? #f
431-
       #:jar-name (string-append ,name "-" ,version ".jar")
432-
       #:source-dir "annotations/src/main/java"))))
433-
434447 
;; TODO: animal-sniffer-enforcer-rule and animal-sniffer-maven-plugin depend
435448 
;; on maven.
436449 
(define-public java-animal-sniffer