Update josm

Julien LepillerSat Apr 14 11:58:31+0200 2018

5e55929

Update josm

more/packages/java.scm

932932 
(define-public java-jmapviewer
933933 
  (package
934934 
    (name "java-jmapviewer")
935-
    (version "2.3")
935+
    (version "2.7")
936936 
    (source (origin
937937 
              (method url-fetch)
938938 
              (uri (string-append "https://svn.openstreetmap.org/applications/viewer/jmapviewer/releases/"
939939 
                                  version "/JMapViewer-" version "-Source.zip"))
940940 
              (sha256
941941 
               (base32
942-
                "0xalq8bacn8ibz3xiaqvj5pg6pxk9irvwx5f1lb0y2z5gsny3l1x"))))
942+
                "1s8agib0pncbmavgzb372qdwvgwc9jr77p13hqzak6xjlbnxldar"))))
943943 
    (build-system ant-build-system)
944944 
    (native-inputs
945945 
     `(("unzip" ,unzip)))

…

965965 
(define-public java-josm
966966 
  (package
967967 
    (name "java-josm")
968-
    (version "13367")
968+
    (version "13576")
969969 
    (source (origin
970970 
              (method git-fetch)
971971 
              (uri (git-reference
972972 
                    (url "https://github.com/openstreetmap/josm.git")
973-
                    (commit "18d1ca07e20533e5220642d01a866c3880887458")))
973+
                    (commit "ac76e49953464260a30b110a86dfd8529171db50")))
974974 
              ;; https://josm.openstreetmap.de/browser
975975 
              ;; FIXME: Fetching from mirror on github because svn-fetch result
976976 
              ;; is not deterministic: hash differs each time it fetches the repo.

…

979979 
              ;      (revision (string->number version))))
980980 
              (sha256
981981 
               (base32
982-
                "0pd7p2wnvammqgf456df13kwzfka1xbrkqj5a6lqfil9p8pcnflw"))
982+
                "0x8xh0cn6dbyn55n3davyv6r84pgd4yb52fbxj6qdwh2icprkz92"))
983983 
              (file-name (string-append name "-" version))
984984 
              (modules '((guix build utils)))
985985 
              (snippet
986-
                '(delete-file-recursively "src/org/apache"))))
986+
                '(begin
987+
                   (for-each delete-file (find-files "." ".*.jar"))
988+
                   (delete-file-recursively "windows")))))
987989 
    (build-system ant-build-system)
988990 
    (native-inputs
989991 
     `(("java-javacc" ,java-javacc)))

…

35273529 
    (inputs
35283530 
     `(("antlr2" ,antlr2)))))
35293531 
3530-
;(define-public antlr3-3.4
3531-
;  (package
3532-
;    (name "antlr3")
3533-
;    (version "3.4")
3534-
;    (source (origin
3535-
;              (method url-fetch)
3536-
;              (uri (string-append "https://github.com/antlr/website-antlr3/raw/"
3537-
;                                  "gh-pages/download/antlr-"
3538-
;                                  version ".tar.gz"))
3539-
;              (sha256
3540-
;               (base32
3541-
;                "1cwfswpk3jlzl1dhc6b6586srza8q0bbzwlxcq136p29v62fjrb3"))))
3542-
;    (build-system ant-build-system)
3543-
;    (arguments
3544-
;     `(#:jar-name (string-append ,name "-" ,version ".jar")
3545-
;       #:source-dir "tool/src/main/java:runtime/Java/src/main/java:tool/src/main/antlr3"
3546-
;       #:tests? #f
3547-
;       #:phases
3548-
;       (modify-phases %standard-phases
3549-
;         (add-after 'install 'bin-install
3550-
;           (lambda* (#:key inputs outputs #:allow-other-keys)
3551-
;             (let ((jar (string-append (assoc-ref outputs "out") "/share/java"))
3552-
;                   (bin (string-append (assoc-ref outputs "out") "/bin")))
3553-
;               (mkdir-p bin)
3554-
;               (with-output-to-file (string-append bin "/antlr3")
3555-
;                 (lambda _
3556-
;                   (display
3557-
;                     (string-append "#!/bin/sh\n"
3558-
;                                    "java -cp " jar "/antlr3-3.3.jar:"
3559-
;                                    (string-concatenate
3560-
;                                      (find-files (assoc-ref inputs "stringtemplate")
3561-
;                                                  ".*\\.jar"))
3562-
;                                    ":"
3563-
;                                    (string-concatenate
3564-
;                                      (find-files (string-append (assoc-ref inputs "antlr") "/lib")
3565-
;                                                  ".*\\.jar"))
3566-
;                                    " org.antlr.Tool $*"))))
3567-
;               (chmod (string-append bin "/antlr3") #o755))))
3568-
;         (add-before 'build 'generate-grammar
3569-
;           (lambda _
3570-
;             (chdir "tool/src/main/antlr3/org/antlr/grammar/v3/")
3571-
;             (for-each (lambda (file)
3572-
;                         (display file)
3573-
;                         (newline)
3574-
;                         (system* "antlr3" file))
3575-
;                       '("ActionAnalysis.g" "ActionTranslator.g" "ANTLR.g"
3576-
;                         "ANTLRTreePrinter.g" "ANTLRv3.g" "ANTLRv3Tree.g"
3577-
;                         "AssignTokenTypesWalker.g" "CodeGenTreeWalker.g"
3578-
;                         "DefineGrammarItemsWalker.g" "LeftRecursiveRuleWalker.g"
3579-
;                         "TreeToNFAConverter.g"))
3580-
;             (chdir "../../../../../../../..")
3581-
;             (system* "antlr" "-o" "tool/src/main/java/org/antlr/tool"
3582-
;                      "tool/src/main/java/org/antlr/tool/serialize.g")
3583-
;             (substitute* "tool/src/main/java/org/antlr/tool/LeftRecursiveRuleAnalyzer.java"
3584-
;               (("import org.antlr.grammar.v3.\\*;") "import org.antlr.grammar.v3.*;
3585-
;import org.antlr.grammar.v3.ANTLRTreePrinter;"))
3586-
;             (substitute* "tool/src/main/java/org/antlr/tool/Grammar.java"
3587-
;               (("import org.antlr.grammar.v3.\\*;")
3588-
;                "import org.antlr.grammar.v3.*;\n
3589-
;import org.antlr.grammar.v3.TreeToNFAConverter;\n
3590-
;import org.antlr.grammar.v3.DefineGrammarItemsWalker;\n
3591-
;import org.antlr.grammar.v3.ANTLRTreePrinter;"))
3592-
;             (substitute* "tool/src/main/java/org/antlr/tool/ErrorManager.java"
3593-
;               (("case NO_SUCH_ATTRIBUTE_PASS_THROUGH:") ""))
3594-
;             (substitute* "tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRParser.java"
3595-
;               (("public Object getTree") "public GrammarAST getTree"))
3596-
;             (substitute* "tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3Parser.java"
3597-
;               (("public Object getTree") "public CommonTree getTree"))))
3598-
;         (add-before 'build 'fix-build-xml
3599-
;           (lambda _
3600-
;             (substitute* "build.xml"
3601-
;               (("<exec") "<copy todir=\"${classes.dir}\">
3602-
;<fileset dir=\"tool/src/main/resources\">
3603-
;<include name=\"**/*.stg\"/>
3604-
;<include name=\"**/*.st\"/>
3605-
;<include name=\"**/*.sti\"/>
3606-
;<include name=\"**/STLexer.tokens\"/>
3607-
;</fileset>
3608-
;</copy><exec")))))))
3609-
;    (native-inputs
3610-
;     `(("antlr" ,antlr2)
3611-
;       ("antlr3" ,antlr3-3.3)))
3612-
;    (inputs
3613-
;     `(("java-junit" ,java-junit)))
3614-
;    (propagated-inputs
3615-
;     `(("stringtemplate" ,java-stringtemplate-3)
3616-
;       ("stringtemplate4" ,java-stringtemplate)
3617-
;       ("antlr" ,antlr2)
3618-
;       ("antlr3" ,antlr3-3.1)))
3619-
;    (home-page "http://www.stringtemplate.org")
3620-
;    (synopsis "")
3621-
;    (description "")
3622-
;    (license license:bsd-3)))
3623-
36243532 
(define-public libantlr3c
36253533 
  (package
36263534 
    (inherit antlr3)
…
46694577 
                                          '("java-logback-core" "java-slf4j-api"
46704578 
                                            "java-commons-compiler" "java-tomcat")))
46714579 
                       ":"))
4672-
     ;`(("java-javax-mail" ,java-javax-mail)
4673-
     ;  ("java-tomcat" ,java-tomcat)
4674-
     ;  ("java-commons-compiler" ,java-commons-compiler)
4675-
     ;  ("java-janino" ,java-janino)))
46764580 
             (and
4677-
               ;; FIXME: Using groovyc from groovy directly fails
4678-
               ;(zero? (apply system* "java" "-cp" (getenv "CLASSPATH")
4679-
               ;              "org.codehaus.groovy.tools.FileSystemCompiler"
4680-
               ;              "-d" "build/classes" "-j"
4681-
               ;              (find-files "src/main/" ".*\\.(groovy|java)$")))
46824581 
               (apply invoke "groovyc" "-d" "build/classes" "-j"
46834582 
                      (find-files "src/main/" ".*\\.(groovy|java)$"))
46844583 
               (zero? (system* "ant" "jar"))))))))