Browse code
Bug 1876199: [1.0] Remove clover.jar from jna-devel
Change-Id: I04bdc7afd67537e38d45bdb02c2629adc438bb5d
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3575
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
harishspqr authored on 2017/08/18 04:52:35Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,72 @@ |
| 0 |
+--- a/build.xml 2017-08-18 11:11:31.715877910 -0700 |
|
| 1 |
+@@ -320,7 +320,6 @@ |
|
| 2 |
+ <pathelement path="${build}/${jar}"/>
|
|
| 3 |
+ <pathelement path="${test.classes}"/>
|
|
| 4 |
+ <pathelement path="${build}/${testjar}"/>
|
|
| 5 |
+- <pathelement path="lib/clover.jar"/> |
|
| 6 |
+ <path refid="test.libs"/> |
|
| 7 |
+ </path> |
|
| 8 |
+ </target> |
|
| 9 |
+@@ -910,7 +909,6 @@ |
|
| 10 |
+ <copy todir="${build}/jws" file="${build}/${jar}"/>
|
|
| 11 |
+ <copy todir="${build}/jws" file="${build}/${testjar}"/>
|
|
| 12 |
+ <copy todir="${build}/jws" file="lib/junit.jar"/>
|
|
| 13 |
+- <copy todir="${build}/jws" file="lib/clover.jar"/>
|
|
| 14 |
+ <jar jarfile="${build}/jws/jnidispatch.jar">
|
|
| 15 |
+ <fileset dir="${build.native}" includes="*jnidispatch.*"/>
|
|
| 16 |
+ </jar> |
|
| 17 |
+@@ -919,7 +917,7 @@ |
|
| 18 |
+ <!-- javaws -viewer (security tab, import CSR as CA--> |
|
| 19 |
+ <!-- |
|
| 20 |
+ <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> |
|
| 21 |
+- <fileset dir="${build}/jws" includes="${jar},${testjar},junit.jar,jnidispatch.jar,clover.jar"/>
|
|
| 22 |
++ <fileset dir="${build}/jws" includes="${jar},${testjar},junit.jar,jnidispatch.jar"/>
|
|
| 23 |
+ </signjar> |
|
| 24 |
+ --> |
|
| 25 |
+ </target> |
|
| 26 |
+@@ -1032,27 +1030,6 @@ |
|
| 27 |
+ </subant> |
|
| 28 |
+ </target> |
|
| 29 |
+ |
|
| 30 |
+- <target name="with.clover" description="Enable code coverage for tests"> |
|
| 31 |
+- <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/> |
|
| 32 |
+- <property name="clover" value="true"/> |
|
| 33 |
+- <property name="build" value="build.clover"/> |
|
| 34 |
+- <clover-setup/> |
|
| 35 |
+- </target> |
|
| 36 |
+- |
|
| 37 |
+- <target name="clover" depends="with.clover,test" |
|
| 38 |
+- description="Generate test code coverage reports"> |
|
| 39 |
+- <property name="reports.clover" value="${reports}/clover"/>
|
|
| 40 |
+- <mkdir dir="${reports.clover}"/>
|
|
| 41 |
+- <clover-report> |
|
| 42 |
+- <current outfile="${reports.clover}" title="clover">
|
|
| 43 |
+- <fileset dir="." includes="**/*.java" /> |
|
| 44 |
+- <testresults dir="${results.junit}" includes="TEST-*.xml"/>
|
|
| 45 |
+- <format type="html"/> |
|
| 46 |
+- </current> |
|
| 47 |
+- </clover-report> |
|
| 48 |
+- <echo>Reports generated in ${reports.clover}</echo>
|
|
| 49 |
+- </target> |
|
| 50 |
+- |
|
| 51 |
+ <target name="javadoc" depends="-setup"> |
|
| 52 |
+ <path id="javadoc.src.path"> |
|
| 53 |
+ <path refid="src.path"/> |
|
| 54 |
+@@ -1142,7 +1119,7 @@ |
|
| 55 |
+ <!-- Full sources required to build and test everything --> |
|
| 56 |
+ <zip zipfile="${dist}/src-full.zip">
|
|
| 57 |
+ <zipfileset src="${dist}/src.zip"/>
|
|
| 58 |
+- <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/> |
|
| 59 |
++ <zipfileset dir="lib" includes="junit.jar" prefix="lib"/> |
|
| 60 |
+ <zipfileset dir="." includes=".classpath,.project"/> |
|
| 61 |
+ <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
|
|
| 62 |
+ </zip> |
|
| 63 |
+@@ -1157,7 +1134,6 @@ |
|
| 64 |
+ <fileset dir="${build}"/>
|
|
| 65 |
+ </delete> |
|
| 66 |
+ <delete quiet="true" includeEmptyDirs="true"> |
|
| 67 |
+- <fileset dir=".clover"/> |
|
| 68 |
+ <fileset dir="${javadoc}"/>
|
|
| 69 |
+ <fileset dir="." includes="*~,**/*~,build.number,native/libffi/configure"/> |
|
| 70 |
+ </delete> |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Java Native Access |
| 2 | 2 |
Name: jna |
| 3 | 3 |
Version: 4.2.1 |
| 4 |
-Release: 9%{?dist}
|
|
| 4 |
+Release: 10%{?dist}
|
|
| 5 | 5 |
License: Apache |
| 6 | 6 |
URL: http://github.com/twall/jna |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -9,6 +9,7 @@ Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
BuildArch: x86_64 |
| 11 | 11 |
Source0: http://dl.bintray.com/vmware/photon_release_1.0_TP1_x86_64/%{name}-%{version}.tar.gz
|
| 12 |
+Patch0: jna-4.2.1-remove-clover-jar.patch |
|
| 12 | 13 |
%define sha1 jna=30a1132f9ca6b3222eccd380a3f4149aa7df3f59 |
| 13 | 14 |
Requires: openjre |
| 14 | 15 |
BuildRequires: openjre |
| ... | ... |
@@ -29,8 +30,8 @@ Requires: jna = %{version}-%{release}
|
| 29 | 29 |
Sources for JNA |
| 30 | 30 |
|
| 31 | 31 |
%prep |
| 32 |
- |
|
| 33 | 32 |
%setup -q |
| 33 |
+%patch0 -p1 |
|
| 34 | 34 |
|
| 35 | 35 |
%clean |
| 36 | 36 |
rm -rf %{buildroot}
|
| ... | ... |
@@ -67,6 +68,8 @@ ant -Ddist=$JNA_DIST_DIR dist -Drelease=true |
| 67 | 67 |
%{_prefix}/*sources.jar
|
| 68 | 68 |
|
| 69 | 69 |
%changelog |
| 70 |
+* Thu Aug 17 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.1-10 |
|
| 71 |
+- Remove clover.jar from jna-devel |
|
| 70 | 72 |
* Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 4.2.1-9 |
| 71 | 73 |
- Removed dependency on ANT_HOME |
| 72 | 74 |
* Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.1-8 |
| ... | ... |
@@ -90,6 +93,6 @@ ant -Ddist=$JNA_DIST_DIR dist -Drelease=true |
| 90 | 90 |
* Fri Sep 18 2015 Divya Thaluru <dthaluru@vmware.com> 4.1.0-2 |
| 91 | 91 |
- Disabling tests |
| 92 | 92 |
* Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.1.0-1 |
| 93 |
-- Updated dependencies after repackaging openjdk. |
|
| 93 |
+- Updated dependencies after repackaging openjdk. |
|
| 94 | 94 |
* Fri May 29 2015 Sriram Nambakam <snambakam@vmware.com> 4.1.0-0 |
| 95 | 95 |
- Initial commit |