diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-01-16 20:27:28 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-16 20:27:28 +0000 |
commit | 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch) | |
tree | 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-java/jna/files | |
parent | c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff) |
gentoo resync : 16.01.2021
Diffstat (limited to 'dev-java/jna/files')
-rw-r--r-- | dev-java/jna/files/5.10.0-build.xml.patch | 55 | ||||
-rw-r--r-- | dev-java/jna/files/5.10.0-tests-exclude.patch | 27 |
2 files changed, 82 insertions, 0 deletions
diff --git a/dev-java/jna/files/5.10.0-build.xml.patch b/dev-java/jna/files/5.10.0-build.xml.patch new file mode 100644 index 000000000000..242845bfd356 --- /dev/null +++ b/dev-java/jna/files/5.10.0-build.xml.patch @@ -0,0 +1,55 @@ +diff --git a/build.xml b/build.xml +index ed104c2..cd8895c 100644 +--- a/build.xml ++++ b/build.xml +@@ -182,9 +182,9 @@ + + <target name="-prepare-anttools"> + <subant antfile="build-ant-tools.xml" buildpath="${basedir}"></subant> +- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:$lib/asm-8.0.1.jar" /> +- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" /> +- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" /> ++ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:${gentoo.classpath}" /> ++ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:${gentoo.classpath}" /> ++ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:${gentoo.classpath}" /> + </target> + + <target name="-dynamic-properties" depends="-prepare-anttools"> +@@ -385,7 +385,9 @@ + <pathelement path="${build}/${jar}"/> + <pathelement path="${test.classes}"/> + <pathelement path="${build}/${testjar}"/> ++ <!-- + <pathelement path="lib/clover.jar"/> ++ --> + <path refid="test.libs"/> + </path> + </target> +@@ -1265,8 +1267,10 @@ cd .. + <mkdir dir="${build}/jws"/> + <copy todir="${build}/jws" file="${build}/${jar}"/> + <copy todir="${build}/jws" file="${build}/${testjar}"/> ++ <!-- + <copy todir="${build}/jws" file="lib/junit.jar"/> + <copy todir="${build}/jws" file="lib/clover.jar"/> ++ --> + <jar jarfile="${build}/jws/jnidispatch.jar" createUnicodeExtraFields="never" encoding="UTF-8"> + <fileset dir="${build.native}" includes="*jnidispatch.*"/> + </jar> +diff --git a/contrib/platform/build.xml b/contrib/platform/build.xml +index 47fa8ed..a623ce6 100644 +--- a/contrib/platform/build.xml ++++ b/contrib/platform/build.xml +@@ -115,9 +115,9 @@ + + <target name="-prepare-anttools"> + <subant antfile="build-ant-tools.xml" buildpath="${basedir}/../../"></subant> +- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" /> +- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" /> +- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" /> ++ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" /> ++ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" /> ++ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" /> + </target> + + <macrodef name="build-manifest"> diff --git a/dev-java/jna/files/5.10.0-tests-exclude.patch b/dev-java/jna/files/5.10.0-tests-exclude.patch new file mode 100644 index 000000000000..e608e2087f44 --- /dev/null +++ b/dev-java/jna/files/5.10.0-tests-exclude.patch @@ -0,0 +1,27 @@ +From 2b50e2296c9c9961fd168abe285f773aecd6437a Mon Sep 17 00:00:00 2001 +From: Yuan Liao <liaoyuan@gmail.com> +Date: Thu, 6 Jan 2022 12:21:22 -0800 +Subject: [PATCH] Skip execution of test classes without any tests + +Signed-off-by: Yuan Liao <liaoyuan@gmail.com> +--- + build.xml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/build.xml b/build.xml +index ed104c2..9fb15ae 100644 +--- a/build.xml ++++ b/build.xml +@@ -1388,6 +1388,9 @@ cd .. + <fileset dir="${test.src}" excludes="${tests.exclude-patterns}"> + <patternset includes="${tests.include}"/> + <include name="${tests.platform}"/> ++ <exclude name="com/sun/jna/DefaultMethodInvocationTest.java"/> ++ <exclude name="com/sun/jna/ELFAnalyserTest.java"/> ++ <exclude name="com/sun/jna/PrematureGCTest.java"/> + <exclude name="${tests.exclude}"/> + </fileset> + </batchtest> +-- +2.34.1 + |