Fix code for finding legacy Java 6 JAWT directory

In the latest version of Maven, it doesn't appear to be possible for a
fileset to include a file outside of its base directory. This commit
uses multirootfileset as a workaround.
master
Graham 4 years ago
parent 91524d5ddd
commit bd273cb250
  1. 9
      gl-natives/pom.xml

@ -35,13 +35,16 @@
<target> <target>
<pathconvert property="openrs2.jawtDirectory"> <pathconvert property="openrs2.jawtDirectory">
<first> <first>
<fileset dir="${nar.javaHome}"> <multirootfileset>
<basedir file="${nar.javaHome}" />
<include name="lib/**/jawt.lib" /> <include name="lib/**/jawt.lib" />
<include name="lib/**/libjawt.dylib" /> <include name="lib/**/libjawt.dylib" />
<include name="lib/**/libjawt.so" /> <include name="lib/**/libjawt.so" />
<!-- legacy Java on macOS --> <!-- legacy Java on macOS -->
<include name="../Libraries/libjawt.dylib" /> <basedir file="${nar.javaHome}/.." />
</fileset> <include name="Libraries/libjawt.dylib" />
</multirootfileset>
</first> </first>
<regexpmapper from="(.*)/" to="\1" handledirsep="true" /> <regexpmapper from="(.*)/" to="\1" handledirsep="true" />
</pathconvert> </pathconvert>

Loading…
Cancel
Save