Skip to content

Commit

Permalink
Always include the OS in the tcnative library name (#11064)
Browse files Browse the repository at this point in the history
Motivation:

These days we always include the OS in the library name. This means we also can simplify things

Modifications:

Adjust build configuration to address for libray name change

Result:

Simplify build
  • Loading branch information
normanmaurer committed Mar 8, 2021
1 parent 0f12472 commit 4f49870
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions testsuite-shading/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
</activation>
<properties>
<nativeTransportLib>netty_transport_native_kqueue_${os.detected.arch}.jnilib</nativeTransportLib>
<nativeTcnativeLib>netty_tcnative_osx_${os.detected.arch}.jnilib</nativeTcnativeLib>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -227,10 +228,6 @@
<copy file="${classesShadedNativeDir}/lib${nativeTransportLib}" tofile="${classesShadedNativeDir}/lib${shadingPrefix2}_${nativeTransportLib}" />
<delete file="${classesShadedNativeDir}/lib${nativeTransportLib}" />

<condition property="nativeTcnativeLib" value="netty_tcnative_osx_${os.detected.arch}.jnilib" else="netty_tcnative.jnilib">
<equals arg1="${tcnative.classifier}" arg2="" />
</condition>

<copy file="${classesShadedNativeDir}/lib${nativeTcnativeLib}" tofile="${classesShadedNativeDir}/lib${shadingPrefix}_${nativeTcnativeLib}" />
<copy file="${classesShadedNativeDir}/lib${nativeTcnativeLib}" tofile="${classesShadedNativeDir}/lib${shadingPrefix2}_${nativeTcnativeLib}" />
<delete file="${classesShadedNativeDir}/lib${nativeTcnativeLib}" />
Expand Down Expand Up @@ -273,6 +270,7 @@
</activation>
<properties>
<nativeTransportLib>netty_transport_native_epoll_${os.detected.arch}.so</nativeTransportLib>
<nativeTcnativeLib>netty_tcnative_linux_${os.detected.arch}.so</nativeTcnativeLib>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -373,10 +371,6 @@
<copy file="${classesShadedNativeDir}/lib${nativeTransportLib}" tofile="${classesShadedNativeDir}/lib${shadingPrefix2}_${nativeTransportLib}" />
<delete file="${classesShadedNativeDir}/lib${nativeTransportLib}" />

<condition property="nativeTcnativeLib" value="netty_tcnative_linux_${os.detected.arch}.so" else="netty_tcnative.so">
<equals arg1="${tcnative.classifier}" arg2="" />
</condition>

<copy file="${classesShadedNativeDir}/lib${nativeTcnativeLib}" tofile="${classesShadedNativeDir}/lib${shadingPrefix}_${nativeTcnativeLib}" />
<copy file="${classesShadedNativeDir}/lib${nativeTcnativeLib}" tofile="${classesShadedNativeDir}/lib${shadingPrefix2}_${nativeTcnativeLib}" />
<delete file="${classesShadedNativeDir}/lib${nativeTcnativeLib}" />
Expand Down

0 comments on commit 4f49870

Please sign in to comment.