Fix building intellij-platform-util-2013

Julien LepillerSun May 19 20:49:52+0200 2019

f8f69f8

Fix building intellij-platform-util-2013

more/packages/intellij.scm

145145 
    (description "")
146146 
    (license license:asl2.0)))
147147 
148+
(define-public java-jdom-for-intellij-2013
149+
  (package
150+
    (inherit java-jdom)
151+
    (version "0")
152+
    (source (origin
153+
              (method url-fetch)
154+
              (uri (string-append "https://github.com/JetBrains/"
155+
                                  "intellij-community/raw/"
156+
                                  intellij-community-2013-commit
157+
                                  "/lib/src/jdom.zip"))
158+
              (sha256
159+
               (base32
160+
                "0yvs1bxxbpa11bnvhdhi11mnps1qbgg3qw7s8zw24s8wabznjn6a"))))
161+
    (arguments
162+
     `(#:jar-name "jdom.jar"
163+
       #:source-dir ".."
164+
       #:tests? #f))
165+
    (inputs
166+
     `(("java-jaxen" ,java-jaxen)))
167+
    (native-inputs
168+
     `(("unzip" ,unzip)))))
169+
148170 
(define-public java-intellij-compiler-javac2
149171 
  (package
150172 
    (name "java-intellij-compiler-javac2")
…
250272 
       (append (alist-delete "java-jdom-for-intellij" (package-propagated-inputs base))
251273 
               `(("java-batik" ,java-batik)
252274 
                 ("java-iq80-snappy" ,java-iq80-snappy)
253-
                 ("java-jdom1-for-intellij" ,java-jdom1-for-intellij))))
275+
                 ("java-jdom" ,java-jdom-for-intellij-2013))))
276+
      (inputs
277+
       `(("java-eawtstub" ,java-eawtstub)))
254278 
      (arguments
255279 
        (substitute-keyword-arguments (package-arguments base)
256280 
          ((#:phases phases)
257281 
           `(modify-phases ,phases
258-
              (add-before 'build 'fix-implicit-conversions
259-
                (lambda _
260-
                  (substitute* "build.xml"
261-
                    (("<javac") "<javac source=\"1.6\""))))
262282 
              (delete 'remove-apple))))))))
263-
                ;(lambda _
264-
                ;  (delete-file "platform/util/src/com/intellij/util/AppleHiDPIScaledImage.java")
265-
                ;  (delete-file "platform/util/src/com/intellij/util/ui/IsRetina.java")
266-
                ;  (delete-file "platform/util/src/com/intellij/util/RetinaImage.java")
267-
                ;  (substitute* "platform/util/src/com/intellij/util/ui/UIUtil.java"
268-
                ;    (("IsRetina.isRetina\\(\\)") "false"))
269-
                ;  #t)))))))))
270283 
271284 
(define-public java-intellij-platform-extensions
272285 
  (package
more/packages/java.scm
21732173 
               (install-file "build/jdom.jar" jar-dir)
21742174 
               #t))))))))
21752175 
2176-
;; One commit before the rename to jdom2
2177-
;; How to find the version that's supposed to be used though?
2178-
(define-public java-jdom1-for-intellij
2179-
  (package
2180-
    (inherit java-jdom)
2181-
    (version "1.1.1-intellij")
2182-
    (source (origin
2183-
              (method git-fetch)
2184-
              (uri (git-reference
2185-
                     (url "https://github.com/JetBrains/intellij-deps-jdom")
2186-
                     (commit "fac95752180b2e0e27fe6539cad819623d50975a")))
2187-
              (file-name (git-file-name "java-jdom" version))
2188-
              (sha256
2189-
               (base32
2190-
                "1iyqysa71fjhnr5q61cbx1q6brkx4mpbvg33zzrhagjmkslw2axn"))
2191-
              (modules '((guix build utils)))
2192-
              (snippet
2193-
                `(begin
2194-
                   (for-each delete-file (find-files "." ".*.jar$"))
2195-
                   #t))))
2196-
    (arguments
2197-
     `(#:jar-name "jdom.jar"
2198-
       #:tests? #f
2199-
       #:source-dir "core/src/java"))
2200-
    (inputs
2201-
     `(("java-jaxen" ,java-jaxen)))
2202-
    (native-inputs
2203-
      (append (package-native-inputs java-jdom)
2204-
              `(("unzip" ,unzip))))))
2205-
22062176 
(define-public java-jdom-for-intellij
22072177 
  (package
22082178 
    (inherit java-jdom)
…
83758345 
    (synopsis "")
83768346 
    (description "")
83778347 
    (license license:asl2.0)))
8348+
8349+
(define-public java-eawtstub
8350+
  (let ((commit "ae5d21ccbc62754eb0353b5b1d57abf1da954652"))
8351+
    (package
8352+
      (name "java-eawtstub")
8353+
      (version (git-version "0.0.0" "0" commit))
8354+
      (source (origin
8355+
                (method git-fetch)
8356+
                (uri (git-reference
8357+
                       (url "https://github.com/consulo/eawtstub")
8358+
                       (commit commit)))
8359+
                (file-name (git-file-name name version))
8360+
                (sha256
8361+
                 (base32
8362+
                  "0l0xng9qxs3b5l86nb77vr65a924ginxd32sjiqjrb9lbh2yp7ap"))))
8363+
      (build-system ant-build-system)
8364+
      (arguments
8365+
       `(#:jar-name "eawtstub.jar"
8366+
         ;; No tests
8367+
         #:tests? #f))
8368+
      (home-page "")
8369+
      (synopsis "")
8370+
      (description "")
8371+
      (license license:asl2.0))))