finish netty-common

Julien LepillerSat Dec 08 18:43:04+0100 2018

be8af60

finish netty-common

more/packages/java.scm

731731 
               (with-fluids ((%default-port-encoding "ISO-8859-1"))
732732 
                 (substitute* '("visitclass/PreorderVisitor.java"
733733 
                                "StackMapAnalyzer.java"
734-
				"classfile/engine/ClassParserUsingASM.java")
734+
                                "classfile/engine/ClassParserUsingASM.java")
735735 
                   ;; The two classes were merged in the latter
736736 
                   (("StackMapTable") "StackMap")
737-
		   (("Constants") "Const")
738-
		   (("Const2") "Constants2")
739-
		   (("getByteCodeOffsetDelta") "getByteCodeOffset"))
740-
		 (substitute* "detect/DumbMethods.java"
741-
		   (("import org.apache.bcel.classfile.Attribute;")
742-
		    "import org.apache.bcel.classfile.Attribute;
737+
                   (("Constants") "Const")
738+
                   (("Const2") "Constants2")
739+
                   (("getByteCodeOffsetDelta") "getByteCodeOffset"))
740+
                 (substitute* "detect/DumbMethods.java"
741+
                   (("import org.apache.bcel.classfile.Attribute;")
742+
                    "import org.apache.bcel.classfile.Attribute;
743743 
import org.apache.bcel.Const;")
744-
		   (("MAJOR_1") "Const.MAJOR_1"))
744+
                   (("MAJOR_1") "Const.MAJOR_1"))
745745 
                 (substitute* "ba/AbstractFrameModelingVisitor.java"
746746 
                   (("VisitorSupportsInvokeDynamic") "Visitor"))
747-
		 (substitute* "xml/XMLUtil.java"
748-
		   (("<T> List<T>") "List<Node>"))
747+
                 (substitute* "xml/XMLUtil.java"
748+
                   (("<T> List<T>") "List<Node>"))
749749 
                 (substitute* "visitclass/PreorderVisitor.java"
750750 
                   (("import org.apache.bcel.classfile.Attribute;")
751751 
                    "import org.apache.bcel.classfile.Attribute;

…

843843 
    (version "3.1.6")
844844 
    (source (origin
845845 
              (method url-fetch)
846-
	      (uri (string-append "https://github.com/spotbugs/spotbugs/archive/"
847-
				  version ".tar.gz"))
846+
              (uri (string-append "https://github.com/spotbugs/spotbugs/archive/"
847+
                                  version ".tar.gz"))
848848 
              (sha256
849849 
               (base32
850850 
                "198gzk2vs4id90fxgpida51ygwpb31xwkv6lf91kgmvqcsknf6y4"))

…

877877 
       #:jdk ,icedtea-8
878878 
       #:phases
879879 
       (modify-phases %standard-phases
880-
	 (add-before 'build 'remove-osx
881-
	   (lambda _
882-
	     ;; Requires AppleJavaExtensions.jar (com.apple.eawt.*)
883-
	     (delete-file "spotbugs/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java")
884-
	     #t)))))
880+
         (add-before 'build 'remove-osx
881+
           (lambda _
882+
             ;; Requires AppleJavaExtensions.jar (com.apple.eawt.*)
883+
             (delete-file "spotbugs/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java")
884+
             #t)))))
885885 
    (inputs
886886 
     `(("java-asm" ,java-asm)
887887 
       ("java-commons-bcel" ,java-commons-bcel)

…

10051005 
                     (commit "1f6020a3f17d9d88dfd54a31370e91e3361c216b")))
10061006 
              (sha256
10071007 
               (base32
1008-
                "1cpg9j86ckp5cmxlisfr4xr4i4v983xj2mkk0pkbygk3qarjfb88"))))))
1009-
1008+
                "1cpg9j86ckp5cmxlisfr4xr4i4v983xj2mkk0pkbygk3qarjfb88"))))
1009+
    (arguments
1010+
     `(#:jar-name "asm.jar"
1011+
       #:source-dir "asm/src/main/java"
1012+
       #:test-dir "asm/src/test"
1013+
       ;; Tests require org.junit.jupiter
1014+
       #:tests? #f))))
1015+
1016+
(define-public java-asm-tree-7
1017+
  (package
1018+
    (inherit java-asm-7)
1019+
    (name "java-asm-tree")
1020+
    (arguments
1021+
     `(#:jar-name "asm-tree.jar"
1022+
       #:source-dir "asm-tree/src/main/java"
1023+
       #:test-dir "asm-tree/src/test"
1024+
       ;; Tests require org.junit.jupiter
1025+
       #:tests? #f))
1026+
    (propagated-inputs
1027+
     `(("java-asm-7" ,java-asm-7)))))
1028+
1029+
(define-public java-asm-commons-7
1030+
  (package
1031+
    (inherit java-asm-7)
1032+
    (name "java-asm-commons")
1033+
    (arguments
1034+
     `(#:jar-name "asm-commons.jar"
1035+
       #:source-dir "asm-commons/src/main/java"
1036+
       #:test-dir "asm-commons/src/test"
1037+
       ;; Tests require org.junit.jupiter
1038+
       #:tests? #f))
1039+
    (propagated-inputs
1040+
     `(("java-asm-tree-7" ,java-asm-tree-7)))))
10101041 
10111042 
(define-public java-byte-buddy-dep
10121043 
  (package
…
10371068 
                 (("import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;") "")))
10381069 
             #t)))))
10391070 
    (inputs
1040-
     `(("java-asm-6" ,java-asm-6)))
1071+
     `(("java-asm-commons-7" ,java-asm-commons-7)))
10411072 
    (home-page "http://bytebuddy.net/")
10421073 
    (synopsis "")
10431074 
    (description "")
10441075 
    (license license:asl2.0)))
10451076 
1077+
(define-public java-byte-buddy-agent
1078+
  (package
1079+
    (inherit java-byte-buddy-dep)
1080+
    (name "java-byte-buddy-agent")
1081+
    (arguments
1082+
     `(#:jar-name "byte-buddy-agent.jar"
1083+
       #:source-dir "byte-buddy-agent/src/main/java"
1084+
       #:test-dir "byte-buddy-agent/src/test"
1085+
       #:test-exclude (list "**/VirtualMachineForHotSpotTest.*")
1086+
       #:phases
1087+
       (modify-phases %standard-phases
1088+
         (add-before 'build 'remove-annotations
1089+
           (lambda _
1090+
             (with-directory-excursion "byte-buddy-agent/src/main/java/net/bytebuddy"
1091+
               (substitute* (find-files "." ".*.java")
1092+
                 (("@SuppressFBWarnings.*") "")
1093+
                 (("import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;") "")))
1094+
             #t)))))
1095+
    (inputs
1096+
     `(("java-junixsocket-common" ,java-junixsocket-common)
1097+
       ,@(package-inputs java-byte-buddy-dep)))
1098+
    (native-inputs
1099+
     `(("java-byte-buddy-dep" ,java-byte-buddy-dep)
1100+
       ("java-cglib" ,java-cglib)
1101+
       ("java-hamcrest-core" ,java-hamcrest-core)
1102+
       ("java-junit" ,java-junit)
1103+
       ("java-mockito-1" ,java-mockito-1)
1104+
       ("java-objenesis" ,java-objenesis)))))
1105+
1106+
(define-public java-junixsocket-common
1107+
  (package
1108+
    (name "java-junixsocket-common")
1109+
    (version "2.0.4")
1110+
    (source (origin
1111+
              (method url-fetch)
1112+
              (uri (string-append "https://github.com/kohlschutter/junixsocket/archive/"
1113+
                                  "junixsocket-parent-" version ".tar.gz"))
1114+
              (sha256
1115+
               (base32
1116+
                "0c31qgry5pnhcnp3w62xb0ha0pic1d363rabn4fh8sdpmwnmakww"))))
1117+
    (build-system ant-build-system)
1118+
    (arguments
1119+
     `(#:jar-name "junixsocket-common.jar"
1120+
       #:source-dir "junixsocket-common/src/main/java"
1121+
       #:tests? #f));no tests
1122+
    (home-page "")
1123+
    (synopsis "")
1124+
    (description "")
1125+
    (license license:asl2.0)))
1126+
10461127 
(define-public java-intellij-annotation
10471128 
  (package
10481129 
    (name "java-intellij-annotation")
…
16971778 
    (inherit javacc)
16981779 
    (version "6.1.3")
16991780 
    (source (origin
1700-
	      (method url-fetch)
1701-
	      (uri (string-append "https://github.com/javacc/javacc/archive/release_"
1781+
              (method url-fetch)
1782+
              (uri (string-append "https://github.com/javacc/javacc/archive/release_"
17021783 
                                  (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
1703-
				  ".tar.gz"))
1784+
                                  ".tar.gz"))
17041785 
              (sha256
17051786 
               (base32
17061787 
                "03xpipk365szfzrab7divlr1i1r58j1hh47mhj5cpj1kv9zc2p6c"))))
…
17081789 
     `(#:tests? #f
17091790 
       #:phases
17101791 
       (modify-phases %standard-phases
1711-
	 (add-after 'unpack 'delete-bundled-libs
1712-
	   (lambda _
1713-
	     (delete-file-recursively "lib")
1714-
	      #t))
1715-
	 (replace 'install (install-jars "target")))))
1792+
         (add-after 'unpack 'delete-bundled-libs
1793+
           (lambda _
1794+
             (delete-file-recursively "lib")
1795+
              #t))
1796+
         (replace 'install (install-jars "target")))))
17161797 
    (native-inputs
17171798 
     `(("java-junit" ,java-junit)))))
17181799 
…
18091890 
             (copy-recursively "src/main/resources" "build/classes")
18101891 
             #t))
18111892 
         (add-before 'build 'remove-unpackaged-dependencies
1812-
	   ;; TODO: package these dependencies
1813-
	   (lambda _
1814-
	     (delete-file-recursively "src/main/java/freemarker/ext/jython")
1893+
           ;; TODO: package these dependencies
1894+
           (lambda _
1895+
             (delete-file-recursively "src/main/java/freemarker/ext/jython")
18151896 
         (delete-file "src/test/java/freemarker/core/ObjectBuilderSettingsTest.java")
1816-
	     (delete-file-recursively "src/main/java/freemarker/ext/rhino")
1817-
	     ;; This class depends on javareble, a non-free package
1818-
	     (delete-file "src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java")
1819-
	     (delete-file "src/main/java/freemarker/ext/ant/UnlinkedJythonOperationsImpl.java")
1820-
	     (delete-file "src/main/java/freemarker/template/utility/JythonRuntime.java")
1821-
	     #t))
1897+
             (delete-file-recursively "src/main/java/freemarker/ext/rhino")
1898+
             ;; This class depends on javareble, a non-free package
1899+
             (delete-file "src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java")
1900+
             (delete-file "src/main/java/freemarker/ext/ant/UnlinkedJythonOperationsImpl.java")
1901+
             (delete-file "src/main/java/freemarker/template/utility/JythonRuntime.java")
1902+
             #t))
18221903 
     (add-before 'build 'update-jsp
18231904 
       (lambda _
18241905 
         (substitute* "src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory.java"
…
18451926 
18461927 
import javax.el.ELContext;"))
18471928 
         #t))
1848-
	 (add-before 'build 'run-javacc
1849-
	   (lambda _
1850-
	     (invoke "java" "-cp" (getenv "CLASSPATH") "javacc"
1851-
		     "-OUTPUT_DIRECTORY=src/main/java/freemarker/core"
1852-
		     "src/main/javacc/FTL.jj")
1853-
	     #t)))))
1929+
         (add-before 'build 'run-javacc
1930+
           (lambda _
1931+
             (invoke "java" "-cp" (getenv "CLASSPATH") "javacc"
1932+
                     "-OUTPUT_DIRECTORY=src/main/java/freemarker/core"
1933+
                     "src/main/javacc/FTL.jj")
1934+
             #t)))))
18541935 
    (inputs
18551936 
     `(("java-avalon-logkit" ,java-avalon-logkit)
18561937 
       ("java-commons-jxpath" ,java-commons-jxpath)
…
48664947 
    (version "1.2.6")
48674948 
    (source (origin
48684949 
              (method url-fetch)
4869-
	      (uri (string-append "https://www.cs.princeton.edu/~appel/modern/"
4870-
				  "java/JLex/Archive/" version "/Main.java"))
4950+
              (uri (string-append "https://www.cs.princeton.edu/~appel/modern/"
4951+
                                  "java/JLex/Archive/" version "/Main.java"))
48714952 
              (sha256
48724953 
               (base32
48734954 
                "1msblmsgzij3z9pwm7gff1q2cv1q802q23xsn0mrflrs7g7axsxf"))))
…
48764957 
     `(#:tests? #f; no tests
48774958 
       #:phases
48784959 
       (modify-phases %standard-phases
4879-
	 (delete 'unpack)
4880-
	 (delete 'configure)
4881-
	 (replace 'build
4882-
	   (lambda* (#:key inputs #:allow-other-keys)
4883-
	     (mkdir "JLex")
4884-
	     (copy-file (assoc-ref inputs "source") "Main.java")
4885-
	     (invoke "javac" "Main.java" "-d" ".")
4886-
	     (apply invoke "jar" "cf" "jlex.jar" (find-files "." ".*.class"));"JLex/Main.class")
4887-
	     #t))
4888-
	 (replace 'install
4889-
	   (install-jars ".")))))
4960+
         (delete 'unpack)
4961+
         (delete 'configure)
4962+
         (replace 'build
4963+
           (lambda* (#:key inputs #:allow-other-keys)
4964+
             (mkdir "JLex")
4965+
             (copy-file (assoc-ref inputs "source") "Main.java")
4966+
             (invoke "javac" "Main.java" "-d" ".")
4967+
             (apply invoke "jar" "cf" "jlex.jar" (find-files "." ".*.class"));"JLex/Main.class")
4968+
             #t))
4969+
         (replace 'install
4970+
           (install-jars ".")))))
48904971 
    (home-page "https://jflex.de")
48914972 
    (synopsis "")
48924973 
    (description "")
…
63436424 
    (arguments
63446425 
     `(#:jar-name "mockito.jar"
63456426 
       #:source-dir "src/main/java"
6427+
       #:tests? #f; Some compilation errors
63466428 
       #:phases
63476429 
       (modify-phases %standard-phases
63486430 
         (add-before 'build 'use-system-asm
…
63506432 
             (substitute* "src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java"
63516433 
               (("net.bytebuddy.jar.asm") "org.objectweb.asm"))
63526434 
             #t)))))
6353-
    (inputs
6435+
    (propagated-inputs
63546436 
     `(("java-asm" ,java-asm)
6437+
       ("java-byte-buddy-agent" ,java-byte-buddy-agent)
63556438 
       ("java-byte-buddy-dep" ,java-byte-buddy-dep)
63566439 
       ("java-hamcrest-core" ,java-hamcrest-core)
63576440 
       ("java-junit" ,java-junit)
63586441 
       ("java-objenesis" ,java-objenesis)))
6442+
    (native-inputs
6443+
     `(("java-assertj" ,java-assertj)))
63596444 
    (home-page "https://mockito.org/")
63606445 
    (synopsis "")
63616446 
    (description "")
…
63766461 
    (arguments
63776462 
     `(#:jar-name "netty-common.jar"
63786463 
       #:source-dir "common/src/main/java"
6379-
       #:test-dir "common/src/test"))
6464+
       #:test-dir "common/src/test"
6465+
       ;; Weird issue with log4j
6466+
       #:test-exclude (list "**/Abstract*.*"
6467+
                            "**/Log4JLoggerFactoryTest.*")))
63806468 
    (inputs
63816469 
     `(("java-commons-logging-minimal" ,java-commons-logging-minimal)
63826470 
       ("java-jctools-core" ,java-jctools-core)
…
63876475 
    (native-inputs
63886476 
     `(("java-hamcrest-all" ,java-hamcrest-all)
63896477 
       ("java-junit" ,java-junit)
6390-
       ("java-mockito" ,java-mockito)))
6478+
       ("java-mockito" ,java-mockito)
6479+
       ("java-slf4j-simple" ,java-slf4j-simple)))
63916480 
    (home-page "https://netty.io/")
63926481 
    (synopsis "")
63936482 
    (description "")