Author: jfrederic.clere(a)jboss.com
Date: 2012-01-09 13:13:23 -0500 (Mon, 09 Jan 2012)
New Revision: 2890
Modified:
trunk/build/unix/buildbin.jboss-native.sh
trunk/build/unix/pom.native.xml
Log:
Try to use a different artifact for each platform.
Modified: trunk/build/unix/buildbin.jboss-native.sh
===================================================================
--- trunk/build/unix/buildbin.jboss-native.sh 2012-01-09 17:15:40 UTC (rev 2889)
+++ trunk/build/unix/buildbin.jboss-native.sh 2012-01-09 18:13:23 UTC (rev 2890)
@@ -140,7 +140,9 @@
cp ${common_loc}/bin/openssl ${output_loc}/bin/${output_bin}
echo "Preparing corresponding maven resources"
- case ${BUILD_SYS}${BUILD_CPU} in
+ #
https://github.com/jbossas/jboss-modules/blob/master/src/main/java/org/jb...
+ # For the file location.
+ case ${BUILD_SYS}-${BUILD_CPU} in
*hpux-parisc2*)
PLATFORM=hpux
if $force_64; then
@@ -221,13 +223,13 @@
CPU=x86
;;
*)
- echo "${BUILD_SYS}${BUILD_CPU} not supported"
+ echo "${BUILD_SYS}-${BUILD_CPU} not supported"
exit 1
;;
esac
# Process the pom and assembly jar.
- cp ${build_top}/pom.native.xml ${common_loc}/pom.xml
+ 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
(cd ${build_top}; mvn install) || exit 1
Modified: trunk/build/unix/pom.native.xml
===================================================================
--- trunk/build/unix/pom.native.xml 2012-01-09 17:15:40 UTC (rev 2889)
+++ trunk/build/unix/pom.native.xml 2012-01-09 18:13:23 UTC (rev 2890)
@@ -31,7 +31,7 @@
</parent>
<groupId>org.jboss.as.native</groupId>
- <artifactId>jbossweb-native</artifactId>
+ <artifactId>@ARTIFACT@</artifactId>
<version>2.0.10.Beta2-SNAPSHOT</version>
<description>natives bundled in jar</description>
<packaging>jar</packaging>