1:59 a.m.
Author: jfrederic.clere(a)jboss.com
Date: 2012-01-11 02:59:48 -0500 (Wed, 11 Jan 2012)
New Revision: 2895
Modified:
trunk/build/unix/buildbin.jboss-native.sh
trunk/build/unix/pom.native.xml
trunk/build/unix/src/assembly/jar.native.macosx-i686.xml
trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml
trunk/build/unix/src/assembly/jar.native.xml
Log:
Arrange the libraries location.
Modified: trunk/build/unix/buildbin.jboss-native.sh
===================================================================
--- trunk/build/unix/buildbin.jboss-native.sh 2012-01-10 08:26:10 UTC (rev 2894)
+++ trunk/build/unix/buildbin.jboss-native.sh 2012-01-11 07:59:48 UTC (rev 2895)
@@ -44,9 +44,6 @@
output_loc=$3
has_openssl=$4
-output_lib="native"
-output_bin="native"
-
echo "Configuring tomcat-native in `pwd`"
add_conf=""
if [ "x$JAVA_HOME" = "x" ]; then
@@ -70,8 +67,7 @@
;;
esac
-mkdir -p ${output_loc}/bin/${output_lib}
-mkdir -p ${output_loc}/bin/${output_bin}
+mkdir -p ${output_loc}/bin/native
native_sources=srclib/`ls srclib | grep tomcat-native`
# Build native part.
@@ -114,7 +110,7 @@
(cd ${prefix_loc}/lib
tar -cf ${current_loc}/x.tar *.${so_extension}*
)
-(cd ${output_loc}/bin/${output_lib}
+(cd ${output_loc}/bin/native
tar -xf ${current_loc}/x.tar
)
rm -f ${current_loc}/x.tar
@@ -122,7 +118,7 @@
(cd ${common_loc}/lib
tar -cf ${current_loc}/x.tar *.${so_extension}*
)
-(cd ${output_loc}/bin/${output_lib}
+(cd ${output_loc}/bin/native
tar -xf ${current_loc}/x.tar
)
rm -f ${current_loc}/x.tar
@@ -132,12 +128,12 @@
(cd ${common_loc}/lib
tar -cf ${current_loc}/x.tar engines
)
- (cd ${output_loc}/bin/${output_lib}
+ (cd ${output_loc}/bin/native
tar -xf ${current_loc}/x.tar
)
rm -f ${current_loc}/x.tar
- cp ${common_loc}/bin/openssl ${output_loc}/bin/${output_bin}
+ cp ${common_loc}/bin/openssl ${output_loc}/bin/native
echo "Preparing corresponding maven resources"
#
https://github.com/jbossas/jboss-modules/blob/master/src/main/java/org/jb...
@@ -232,8 +228,8 @@
esac
# 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}/${ASSSEMBLY} ${common_loc}/src/assembly/jar.xml
- (cd ${common_loc}; mvn install) || exit 1
+ cat ${build_top}/pom.native.xml | sed s:@ARTIFACT@:${BUILD_SYS}-${BUILD_CPU}: >
${output_loc}/pom.xml
+ mkdir -p ${output_loc}/src/assembly
+ cp ${build_top}/${ASSSEMBLY} ${output_loc}/src/assembly/jar.xml
+ (cd ${output_loc}; mvn install) || exit 1
fi
Modified: trunk/build/unix/pom.native.xml
===================================================================
--- trunk/build/unix/pom.native.xml 2012-01-10 08:26:10 UTC (rev 2894)
+++ trunk/build/unix/pom.native.xml 2012-01-11 07:59:48 UTC (rev 2895)
@@ -91,7 +91,7 @@
<resources>
<resource>
- <directory>lib</directory>
+ <directory>bin</directory>
<includes>
<include>**/*.so</include>
<include>**/*.dll</include>
Modified: trunk/build/unix/src/assembly/jar.native.macosx-i686.xml
===================================================================
--- trunk/build/unix/src/assembly/jar.native.macosx-i686.xml 2012-01-10 08:26:10 UTC (rev
2894)
+++ trunk/build/unix/src/assembly/jar.native.macosx-i686.xml 2012-01-11 07:59:48 UTC (rev
2895)
@@ -9,22 +9,22 @@
<files>
<!-- macosx intel 32 bits -->
<file>
- <source>lib/libapr-1.dylib</source>
+ <source>native/libapr-1.dylib</source>
<outputDirectory>lib/macosx-i686</outputDirectory>
<destName>libapr-1.jnilib</destName>
</file>
<file>
- <source>lib/libcrypto.dylib</source>
+ <source>native/libcrypto.dylib</source>
<outputDirectory>lib/macosx-i686</outputDirectory>
<destName>libcrypto.jnilib</destName>
</file>
<file>
- <source>lib/libssl.dylib</source>
+ <source>native/libssl.dylib</source>
<outputDirectory>lib/macosx-i686</outputDirectory>
<destName>libssl.jnilib</destName>
</file>
<file>
- <source>lib/libtcnative-1.dylib</source>
+ <source>native/libtcnative-1.dylib</source>
<outputDirectory>lib/macosx-i686</outputDirectory>
<destName>libtcnative-1.jnilib</destName>
</file>
Modified: trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml
===================================================================
--- trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml 2012-01-10 08:26:10 UTC
(rev 2894)
+++ trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml 2012-01-11 07:59:48 UTC
(rev 2895)
@@ -9,22 +9,22 @@
<files>
<!-- macosx intel 64 bits -->
<file>
- <source>lib/libapr-1.dylib</source>
+ <source>native/libapr-1.dylib</source>
<outputDirectory>lib/macosx-x86_64</outputDirectory>
<destName>libapr-1.jnilib</destName>
</file>
<file>
- <source>lib/libcrypto.dylib</source>
+ <source>native/libcrypto.dylib</source>
<outputDirectory>lib/macosx-x86_64</outputDirectory>
<destName>libcrypto.jnilib</destName>
</file>
<file>
- <source>lib/libssl.dylib</source>
+ <source>native/libssl.dylib</source>
<outputDirectory>lib/macosx-x86_64</outputDirectory>
<destName>libssl.jnilib</destName>
</file>
<file>
- <source>lib/libtcnative-1.dylib</source>
+ <source>native/libtcnative-1.dylib</source>
<outputDirectory>lib/macosx-x86_64</outputDirectory>
<destName>libtcnative-1.jnilib</destName>
</file>
Modified: trunk/build/unix/src/assembly/jar.native.xml
===================================================================
--- trunk/build/unix/src/assembly/jar.native.xml 2012-01-10 08:26:10 UTC (rev 2894)
+++ trunk/build/unix/src/assembly/jar.native.xml 2012-01-11 07:59:48 UTC (rev 2895)
@@ -9,7 +9,7 @@
<fileSets>
<!-- linux intel 32 bits -->
<fileSet>
- <directory>lib</directory>
+ <directory>native</directory>
<includes>
<include>libapr-1.so</include>
<include>libcrypto.so</include>
@@ -21,7 +21,7 @@
<!-- linux intel 64 bits -->
<fileSet>
- <directory>lib</directory>
+ <directory>native</directory>
<includes>
<include>libapr-1.so</include>
<include>libcrypto.so</include>
@@ -33,7 +33,7 @@
<!-- win32 -->
<fileSet>
- <directory>lib</directory>
+ <directory>native</directory>
<includes>
<include>tcnative-1.dll</include>
</includes>
@@ -42,7 +42,7 @@
<!-- win64 -->
<fileSet>
- <directory>lib</directory>
+ <directory>native</directory>
<includes>
<include>tcnative-1.dll</include>
</includes>