add java-procyon and update josm

Julien LepillerFri Jul 27 15:28:25+0200 2018

8add2b1

add java-procyon and update josm

more/packages/gradle.scm

11 
;;; GNU Guix --- Functional package management for GNU
2-
;;; Copyright ?? 2017 Julien Lepiller <julien@lepiller.eu>
2+
;;; Copyright ?? 2017, 2018 Julien Lepiller <julien@lepiller.eu>
33 
;;;
44 
;;; This file is part of GNU Guix.
55 
;;;

more/packages/java.scm

11371137 
(define-public java-josm
11381138 
  (package
11391139 
    (name "java-josm")
1140-
    (version "13878")
1140+
    (version "14026")
11411141 
    (source (origin
1142-
              (method git-fetch)
1143-
              (uri (git-reference
1144-
                    (url "https://github.com/openstreetmap/josm.git")
1145-
                    (commit "1771fe8e7386f9e9a1fbf90837a6dda4371c5670")))
1146-
              ;; https://josm.openstreetmap.de/browser
1147-
              ;; FIXME: Fetching from mirror on github because svn-fetch result
1148-
              ;; is not deterministic: hash differs each time it fetches the repo.
1149-
              ;(uri (svn-reference
1150-
              ;      (url "https://svn.openstreetmap.org/applications/editors/josm")
1151-
              ;      (revision (string->number version))))
1142+
              (method svn-fetch)
1143+
              (uri (svn-reference
1144+
                    (url "https://svn.openstreetmap.org/applications/editors/josm")
1145+
                    (revision (string->number version))))
11521146 
              (sha256
11531147 
               (base32
1154-
                "0mkbaijlzxq828si3f46avvi4vj8c88gg7g72bq95n75lj8i0saa"))
1148+
                "0w84qcdp80mjryn5wcz3vqs8vw4zxcg4z2ynlhqi9wxrzl86yd7m"))
11551149 
              (file-name (string-append name "-" version))
11561150 
              (modules '((guix build utils)))
11571151 
              (snippet
1158-
                '(begin
1152+
                `(begin
11591153 
                   (for-each delete-file (find-files "." ".*.jar"))
1160-
                   (delete-file-recursively "test/lib")
1161-
                   (delete-file-recursively "windows")))))
1154+
		   (with-directory-excursion (string-append "java-josm-" ,version "/core")
1155+
                     (delete-file-recursively "test/lib")
1156+
                     (delete-file-recursively "windows"))))))
11621157 
    (build-system ant-build-system)
11631158 
    (native-inputs
11641159 
     `(("java-javacc" ,java-javacc)))

…

20442039 
              (sha256
20452040 
               (base32
20462041 
                "0rk7s04hkrr2k3glccx0yrglzqzj4qbipcrxhglk46yhx92vravc"))
2047-
	      (patches
2042+
              (patches
20482043 
            (search-patches "java-velocity-dont-use-werken-xpath.patch"))))
20492044 
    (build-system ant-build-system)
20502045 
    (arguments

…

40714066 
    (synopsis "")
40724067 
    (description "")
40734068 
    (license license:gpl2)))
4069+
4070+
(define-public java-procyon
4071+
  (package
4072+
    (name "java-procyon")
4073+
    (version "0.5.30+1")
4074+
    (source (origin
4075+
              (method hg-fetch)
4076+
              (uri (hg-reference
4077+
                     (url "https://bitbucket.org/mstrobel/procyon")
4078+
                     (changeset "1aa0bd29339b8782b7e9ffafe367b94ee15a7039")))
4079+
              (sha256
4080+
               (base32
4081+
                "0khihmkmv4lrx67mp2s6h5ifd5sk7hf0adfp64ybiq4c3w7786b0"))))
4082+
    (build-system ant-build-system)
4083+
    (arguments
4084+
     `(#:jar-name "procyon.jar"
4085+
       #:jdk ,icedtea-8
4086+
       #:source-dir
4087+
       (string-append "Procyon.CompilerTools/src/main/java:"
4088+
                      "Procyon.Core/src/main/java:"
4089+
                      "Procyon.Decompiler/src/main/java:"
4090+
                      "Procyon.Expressions/src/main/java:"
4091+
                      "Procyon.Reflection/src/main/java")
4092+
       ;; Tests in CompilerTools depend on .class files, no tests in Core or Decompiler.
4093+
       ;; Tests in Expressions and Reflections, but build.xml doesn't support tests
4094+
       ;; in more than one dir.
4095+
       #:tests? #f))
4096+
    (inputs
4097+
     `(("java-jcommander" ,java-jcommander)))
4098+
    (native-inputs
4099+
     `(("java-junit" ,java-junit)))
4100+
    (home-page "")
4101+
    (synopsis "")
4102+
    (description "")
4103+
    (license license:expat)))