Author: jfrederic.clere(a)jboss.com Date: 2012-01-10 03:26:10 -0500 (Tue, 10 Jan 2012) New Revision: 2894 Added: trunk/build/unix/src/assembly/jar.native.macosx-i686.xml trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml Modified: trunk/build/unix/buildbin.jboss-native.sh trunk/build/unix/src/assembly/jar.native.xml Log: Move the macosx file renaming stuff to macosx files. Modified: trunk/build/unix/buildbin.jboss-native.sh =================================================================== --- trunk/build/unix/buildbin.jboss-native.sh 2012-01-10 07:55:04 UTC (rev 2893) +++ trunk/build/unix/buildbin.jboss-native.sh 2012-01-10 08:26:10 UTC (rev 2894) @@ -142,6 +142,7 @@ echo "Preparing corresponding maven resources" # https://github.com/jbossas/jboss-modules/blob/master/src/main/java/org/jb... # For the file location. + ASSSEMBLY=src/assembly/jar.native.xml case ${BUILD_SYS}-${BUILD_CPU} in *hpux-parisc2*) PLATFORM=hpux @@ -209,10 +210,12 @@ *macosx-x86*) PLATFORM=macosx CPU=i386 + ASSSEMBLY=src/assembly/jar.native.macosx-i686.xml ;; *macosx-x64*) PLATFORM=macosx CPU=x64 + ASSSEMBLY=src/assembly/jar.native.macosx-x64.xml ;; *windows-x64*) PLATFORM=windows @@ -231,6 +234,6 @@ # Process the pom and assembly jar. cat ${build_top}/pom.native.xml | sed s:@ARTIFACT@:${BUILD_SYS}-${BUILD_CPU}: > ${common_loc}/pom.xml mkdir -p ${common_loc}/src/assembly - cp ${build_top}/src/assembly/jar.native.xml ${common_loc}/src/assembly/jar.xml + cp ${build_top}/${ASSSEMBLY} ${common_loc}/src/assembly/jar.xml (cd ${common_loc}; mvn install) || exit 1 fi Added: trunk/build/unix/src/assembly/jar.native.macosx-i686.xml =================================================================== --- trunk/build/unix/src/assembly/jar.native.macosx-i686.xml (rev 0) +++ trunk/build/unix/src/assembly/jar.native.macosx-i686.xml 2012-01-10 08:26:10 UTC (rev 2894) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd"> + <id>jar</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <files> + <!-- macosx intel 32 bits --> + <file> + <source>lib/libapr-1.dylib</source> + <outputDirectory>lib/macosx-i686</outputDirectory> + <destName>libapr-1.jnilib</destName> + </file> + <file> + <source>lib/libcrypto.dylib</source> + <outputDirectory>lib/macosx-i686</outputDirectory> + <destName>libcrypto.jnilib</destName> + </file> + <file> + <source>lib/libssl.dylib</source> + <outputDirectory>lib/macosx-i686</outputDirectory> + <destName>libssl.jnilib</destName> + </file> + <file> + <source>lib/libtcnative-1.dylib</source> + <outputDirectory>lib/macosx-i686</outputDirectory> + <destName>libtcnative-1.jnilib</destName> + </file> + </files> +</assembly> Added: trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml =================================================================== --- trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml (rev 0) +++ trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml 2012-01-10 08:26:10 UTC (rev 2894) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd"> + <id>jar</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <files> + <!-- macosx intel 64 bits --> + <file> + <source>lib/libapr-1.dylib</source> + <outputDirectory>lib/macosx-x86_64</outputDirectory> + <destName>libapr-1.jnilib</destName> + </file> + <file> + <source>lib/libcrypto.dylib</source> + <outputDirectory>lib/macosx-x86_64</outputDirectory> + <destName>libcrypto.jnilib</destName> + </file> + <file> + <source>lib/libssl.dylib</source> + <outputDirectory>lib/macosx-x86_64</outputDirectory> + <destName>libssl.jnilib</destName> + </file> + <file> + <source>lib/libtcnative-1.dylib</source> + <outputDirectory>lib/macosx-x86_64</outputDirectory> + <destName>libtcnative-1.jnilib</destName> + </file> + + </files> + +</assembly> Modified: trunk/build/unix/src/assembly/jar.native.xml =================================================================== --- trunk/build/unix/src/assembly/jar.native.xml 2012-01-10 07:55:04 UTC (rev 2893) +++ trunk/build/unix/src/assembly/jar.native.xml 2012-01-10 08:26:10 UTC (rev 2894) @@ -6,52 +6,6 @@ </formats> <includeBaseDirectory>false</includeBaseDirectory> - <files> - <!-- macosx intel 64 bits --> - <file> - <source>lib/libapr-1.dylib</source> - <outputDirectory>lib/macosx-x86_64</outputDirectory> - <destName>libapr-1.jnilib</destName> - </file> - <file> - <source>lib/libcrypto.dylib</source> - <outputDirectory>lib/macosx-x86_64</outputDirectory> - <destName>libcrypto.jnilib</destName> - </file> - <file> - <source>lib/libssl.dylib</source> - <outputDirectory>lib/macosx-x86_64</outputDirectory> - <destName>libssl.jnilib</destName> - </file> - <file> - <source>lib/libtcnative-1.dylib</source> - <outputDirectory>lib/macosx-x86_64</outputDirectory> - <destName>libtcnative-1.jnilib</destName> - </file> - - <!-- macosx intel 32 bits --> - <file> - <source>lib/libapr-1.dylib</source> - <outputDirectory>lib/macosx-i686</outputDirectory> - <destName>libapr-1.jnilib</destName> - </file> - <file> - <source>lib/libcrypto.dylib</source> - <outputDirectory>lib/macosx-i686</outputDirectory> - <destName>libcrypto.jnilib</destName> - </file> - <file> - <source>lib/libssl.dylib</source> - <outputDirectory>lib/macosx-i686</outputDirectory> - <destName>libssl.jnilib</destName> - </file> - <file> - <source>lib/libtcnative-1.dylib</source> - <outputDirectory>lib/macosx-i686</outputDirectory> - <destName>libtcnative-1.jnilib</destName> - </file> - </files> - <fileSets> <!-- linux intel 32 bits --> <fileSet>