remove javacc

Julien LepillerThu May 16 19:19:18+0200 2019

493e8df

remove javacc

more/packages/java.scm

17231723 
             #t))
17241724 
         (add-before 'build 'copy-jars
17251725 
           (lambda* (#:key inputs #:allow-other-keys)
1726-
             (copy-file (car (find-files (assoc-ref inputs "java-javacc") "\\.jar$"))
1726+
             (copy-file (car (find-files (assoc-ref inputs "javacc") "\\.jar$"))
17271727 
                        "../libraries/javacc.jar")
17281728 
             (copy-file (car (find-files (assoc-ref inputs "ant") "ant\\.jar$"))
17291729 
                        "../libraries/ant.jar")

…

17311731 
         (replace 'install
17321732 
           (install-jars "dist")))))
17331733 
    (native-inputs
1734-
     `(("java-javacc" ,java-javacc)))
1734+
     `(("javacc" ,javacc)))
17351735 
    (home-page "https://github.com/blackears/svgSalamander")
17361736 
    (synopsis "")
17371737 
    (description "")

…

17641764 
                   #t))))
17651765 
    (build-system ant-build-system)
17661766 
    (native-inputs
1767-
     `(("java-javacc" ,java-javacc)))
1767+
     `(("javacc" ,javacc)))
17681768 
    (inputs
17691769 
     `(("java-commons-jcs" ,java-commons-jcs)
17701770 
       ("java-commons-compress" ,java-commons-compress-latest)

…

45614561 
                          (string-append dir "/velocity-1.7.jar")))
45624562 
             #t)))))
45634563 
    (native-inputs
4564-
     `(("javacc" ,java-javacc)
4564+
     `(("javacc" ,javacc)
45654565 
       ("antlr" ,antlr2)))
45664566 
    (propagated-inputs
45674567 
     `(("java-commons-collections" ,java-commons-collections)

…

49764976 
    (description "")
49774977 
    (license license:asl2.0)))
49784978 
4979-
(define-public java-javacc
4980-
  (package
4981-
    (name "java-javacc")
4982-
    (version "7.0.2")
4983-
    (source (origin
4984-
              (method url-fetch)
4985-
              (uri (string-append "https://github.com/javacc/javacc/archive/release_"
4986-
                                  (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
4987-
                                  ".tar.gz"))
4988-
              (sha256
4989-
               (base32
4990-
                "0yf93993nlsk5kijazddi5621x4y2bwq3vl46j8h8f7di2z9jv2h"))))
4991-
    (build-system ant-build-system)
4992-
    (arguments
4993-
     `(#:test-target "unittest"
4994-
       #:phases
4995-
       (modify-phases %standard-phases
4996-
         (add-after 'unpack 'remove-binaries
4997-
           (lambda* _
4998-
             ;; Note: we cannot remove bootstrap/javacc.jar because no version of javacc comes with no bootstrap
4999-
             (delete-file-recursively "lib")))
5000-
         (replace 'install
5001-
           (lambda* (#:key outputs inputs #:allow-other-keys)
5002-
             (let* ((out (assoc-ref outputs "out"))
5003-
                    (dir (string-append out "/share/java"))
5004-
                    (bin (string-append out "/bin")))
5005-
               (mkdir-p dir)
5006-
               (mkdir-p bin)
5007-
               (copy-file "target/javacc.jar" (string-append dir "/javacc.jar"))
5008-
               (with-output-to-file (string-append bin "/javacc")
5009-
                 (lambda _
5010-
                   (display
5011-
                     (string-append "#!/bin/sh\n"
5012-
                                    (assoc-ref inputs "jdk") "/bin/java"
5013-
                                    " -cp " dir "/javacc.jar" " `basename $0`" " $*"))))
5014-
               (chmod (string-append bin "/javacc") #o755)
5015-
               (symlink (string-append bin "/javacc")
5016-
                        (string-append bin "/jjdoc"))
5017-
               (symlink (string-append bin "/javacc")
5018-
                        (string-append bin "/jjtree"))))))))
5019-
    (native-inputs
5020-
     `(("java-junit" ,java-junit)))
5021-
    (home-page "https://javacc.org")
5022-
    (synopsis "")
5023-
    (description "")
5024-
    (license license:bsd-3)))
5025-
50264979 
;; This version is required by velocity 2.0
50274980 
(define-public java-javacc-5
50284981 
  (package
5029-
    (inherit java-javacc)
4982+
    (inherit javacc)
50304983 
    (version "5.0")
50314984 
    (source (origin
50324985 
              (method url-fetch)
…
50354988 
               (base32
50364989 
                "0w3kl5zal9g0gwpcnlii6spgvb2yi3dpj1vz592ly18h6yfswv3n"))))
50374990 
    (arguments
5038-
      (substitute-keyword-arguments (package-arguments java-javacc)
4991+
      (substitute-keyword-arguments (package-arguments javacc)
50394992 
        ((#:phases phases)
50404993 
         `(modify-phases ,phases
50414994 
            ;; This phase renames the generated jar so it can be handled by