Skip to content

Commit

Permalink
Ensure JARs created from the build system don't contain invalid extra…
Browse files Browse the repository at this point in the history
… info
  • Loading branch information
matthiasblaesing committed Sep 11, 2019
1 parent 4dce701 commit f7d3c94
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Bug Fixes
* [#1115](https://github.com/java-native-access/jna/issues/1115): Fix signature for `c.s.j.p.win32.Kernel32#CreateRemoteThread` and bind `VirtualAllocEx`, `VirtualFreeEx`, `GetExitCodeThread` in `c.s.j.p.win32.Kernel32` - [@apangin](https://github.com/apangin), [@matthiasblaesing](https://github.com/matthiasblaesing).
* [#1127](https://github.com/java-native-access/jna/issues/1127): Windows needs a wide string in `c.s.j.p.win32.COM.IShellFolder#ParseDisplayName` - [@dbwiddis](https://github.com/dbwiddis).
* [#1128](https://github.com/java-native-access/jna/issues/1128): KEY_ALL_ACCESS value is incorrect in `c.s.j.p.win32.WinNT.java` - [@trevormaggs](https://github.com/trevormaggs).
* [#1133](https://github.com/java-native-access/jna/issues/1133): Ensure JARs created from the build system don't contain invalid `Info-ZIP Unicode Path` extra info - [@matthiasblaesing](https://github.com/matthiasblaesing).

Release 5.4.0
=============
Expand Down
18 changes: 9 additions & 9 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
<!-- Bundle native components with primary jar to facilitate
easy distribution to common platforms.
-->
<jar jarfile="${build}/${jar}" duplicate="preserve">
<jar jarfile="${build}/${jar}" duplicate="preserve" createUnicodeExtraFields="never" encoding="UTF-8">
<manifest>
<attribute name="Main-Class" value="com.sun.jna.Native"/>
<attribute name="Manifest-Version" value="1.0"/>
Expand Down Expand Up @@ -674,7 +674,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
</target>

<target name="idea-jar" depends="jar" description="Build Intellij Idea convenience jar">
<jar destfile="${dist}/idea-dispatch.jar">
<jar destfile="${dist}/idea-dispatch.jar" createUnicodeExtraFields="never" encoding="UTF-8">
<zipfileset src="${dist-jar}" excludes="**/*.class"/>
</jar>
</target>
Expand Down Expand Up @@ -965,7 +965,7 @@ cd build
zip ../${os.prefix}.jar libjnidispatch.so jnidispatch.dll
cd ..
</echo>
<jar jarfile="${build}/${os.prefix}.jar">
<jar jarfile="${build}/${os.prefix}.jar" createUnicodeExtraFields="never" encoding="UTF-8">
<manifest>
<attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
<attribute name="Specification-Version" value="${jni.version}"/>
Expand Down Expand Up @@ -1028,7 +1028,7 @@ cd ..
</copy>
<!-- For web start, native libraries may be provided in the root of -->
<!-- an included jar file -->
<jar jarfile="${build}/${native.jar}">
<jar jarfile="${build}/${native.jar}" createUnicodeExtraFields="never" encoding="UTF-8">
<fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
<manifest>
<attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
Expand Down Expand Up @@ -1090,7 +1090,7 @@ cd ..
</fileset>
</copy>
<!-- Create a jar for easy movement of tests, and jar load test -->
<jar jarfile="${build}/${testjar}">
<jar jarfile="${build}/${testjar}" createUnicodeExtraFields="never" encoding="UTF-8">
<fileset dir="${test.classes}">
<patternset refid="jar-compiled"/>
<include name="**/*testlib-jar*"/>
Expand All @@ -1111,7 +1111,7 @@ cd ..
<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">
<jar jarfile="${build}/jws/jnidispatch.jar" createUnicodeExtraFields="never" encoding="UTF-8">
<fileset dir="${build.native}" includes="*jnidispatch.*"/>
</jar>
<!-- To allow JNLP tests to run, import the JNA testing certificate as a CA -->
Expand All @@ -1137,7 +1137,7 @@ cd ..
device/simulator storage card. -->
<property name="shared" value="shared"/>
<!-- w32ce arm testing -->
<jar jarfile="${shared}/test.jar">
<jar jarfile="${shared}/test.jar" createUnicodeExtraFields="never" encoding="UTF-8">
<zipfileset src="${build}/${jar}"/>
<zipfileset src="${build}/${testjar}"/>
</jar>
Expand Down Expand Up @@ -1330,7 +1330,7 @@ cd ..

<arg value="-notimestamp"/>
</javadoc>
<jar jarfile="${platform-javadoc-jar}">
<jar jarfile="${platform-javadoc-jar}" createUnicodeExtraFields="never" encoding="UTF-8">
<fileset dir="${javadoc}" />
</jar>
</target>
Expand All @@ -1350,7 +1350,7 @@ cd ..
<include name="**/build/demo-*.jar" />
</fileset>
</copy>
<jar jarfile="${maven-javadoc-jar}">
<jar jarfile="${maven-javadoc-jar}" createUnicodeExtraFields="never" encoding="UTF-8">
<fileset dir="${javadoc}" />
</jar>

Expand Down

0 comments on commit f7d3c94

Please sign in to comment.