Author: jfrederic.clere(a)jboss.com Date: 2011-12-15 03:21:54 -0500 (Thu, 15 Dec 2011) New Revision: 2880 Modified: trunk/build/unix/util/jbossweb/src/assembly/jar.xml Log: rename the macosx .libdyn to .jnilib. Modified: trunk/build/unix/util/jbossweb/src/assembly/jar.xml =================================================================== --- trunk/build/unix/util/jbossweb/src/assembly/jar.xml 2011-12-14 22:04:06 UTC (rev 2879) +++ trunk/build/unix/util/jbossweb/src/assembly/jar.xml 2011-12-15 08:21:54 UTC (rev 2880) @@ -5,31 +5,54 @@ <format>jar</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <!-- macosx intel 64 bits --> - <fileSet> - <directory>src/main/resources/bin/META-INF/lib/macosx/x64</directory> - <includes> - <include>libapr-1.dylib</include> - <include>libcrypto.dylib</include> - <include>libssl.dylib</include> - <include>libtcnative-1.dylib</include> - </includes> - <outputDirectory>lib/macosx-x86_64</outputDirectory> - </fileSet> - <!-- macosx intel 32 bits --> - <fileSet> - <directory>src/main/resources/bin/META-INF/lib/macosx/i386</directory> - <includes> - <include>libapr-1.dylib</include> - <include>libcrypto.dylib</include> - <include>libssl.dylib</include> - <include>libtcnative-1.dylib</include> - </includes> - <outputDirectory>lib/macosx-i686</outputDirectory> - </fileSet> + <files> + <!-- macosx intel 64 bits --> + <file> + <source>src/main/resources/bin/META-INF/lib/macosx/x64/libapr-1.dylib</source> + <outputDirectory>lib/macosx-x86_64</outputDirectory> + <destName>libapr-1.jnilib</destName> + </file> + <file> + <source>src/main/resources/bin/META-INF/lib/macosx/x64/libcrypto.dylib</source> + <outputDirectory>lib/macosx-x86_64</outputDirectory> + <destName>libcrypto.jnilib</destName> + </file> + <file> + <source>src/main/resources/bin/META-INF/lib/macosx/x64/libssl.dylib</source> + <outputDirectory>lib/macosx-x86_64</outputDirectory> + <destName>libssl.jnilib</destName> + </file> + <file> + <source>src/main/resources/bin/META-INF/lib/macosx/x64/libtcnative-1.dylib</source> + <outputDirectory>lib/macosx-x86_64</outputDirectory> + <destName>libtcnative-1.jnilib</destName> + </file> + <!-- macosx intel 32 bits --> + <file> + <source>src/main/resources/bin/META-INF/lib/macosx/i386/libapr-1.dylib</source> + <outputDirectory>lib/macosx-i686</outputDirectory> + <destName>libapr-1.jnilib</destName> + </file> + <file> + <source>src/main/resources/bin/META-INF/lib/macosx/i386/libcrypto.dylib</source> + <outputDirectory>lib/macosx-i686</outputDirectory> + <destName>libcrypto.jnilib</destName> + </file> + <file> + <source>src/main/resources/bin/META-INF/lib/macosx/i386/libssl.dylib</source> + <outputDirectory>lib/macosx-i686</outputDirectory> + <destName>libssl.jnilib</destName> + </file> + <file> + <source>src/main/resources/bin/META-INF/lib/macosx/i386/libtcnative-1.dylib</source> + <outputDirectory>lib/macosx-i686</outputDirectory> + <destName>libtcnative-1.jnilib</destName> + </file> + </files> + + <fileSets> <!-- linux intel 32 bits --> <fileSet> <directory>src/main/resources/bin/META-INF/lib/linux2/x86</directory>