January 2012 - jbossnative-commits

JBoss Native SVN: r2895 - in trunk/build/unix: src/assembly and 1 other directory.

by jbossnative-commits＠lists.jboss.org

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>  <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>  <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>  <fileSet> - <directory>lib</directory> + <directory>native</directory> <includes> <include>libapr-1.so</include> <include>libcrypto.so</include> @@ -21,7 +21,7 @@  <fileSet> - <directory>lib</directory> + <directory>native</directory> <includes> <include>libapr-1.so</include> <include>libcrypto.so</include> @@ -33,7 +33,7 @@  <fileSet> - <directory>lib</directory> + <directory>native</directory> <includes> <include>tcnative-1.dll</include> </includes> @@ -42,7 +42,7 @@  <fileSet> - <directory>lib</directory> + <directory>native</directory> <includes> <include>tcnative-1.dll</include> </includes>

12 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2894 - in trunk/build/unix: src/assembly and 1 other directory.

by jbossnative-commits＠lists.jboss.org

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> +  + <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> +  + <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> -  - <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> - -  - <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>  <fileSet>

12 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2893 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-10 02:55:04 -0500 (Tue, 10 Jan 2012) New Revision: 2893 Modified: trunk/build/unix/buildbin.jboss-native.sh Log: Arrange the solaris names. Modified: trunk/build/unix/buildbin.jboss-native.sh =================================================================== --- trunk/build/unix/buildbin.jboss-native.sh 2012-01-10 07:36:43 UTC (rev 2892) +++ trunk/build/unix/buildbin.jboss-native.sh 2012-01-10 07:55:04 UTC (rev 2893) @@ -174,22 +174,22 @@ PLATFORM=linux CPU=x64 ;; - *solaris-sun4v*) + *solaris10-sun4v*) PLATFORM=solaris10 - CPU=sparc + if $force_64; then + CPU=sparcv9 + else + CPU=sparc + fi ;; - *solaris64-sun4v*) - PLATFORM=solaris10 - CPU=sparcv9 - ;; *solaris-sparcv9*) PLATFORM=solaris9 - CPU=sparc + if $force_64; then + CPU=sparcv9 + else + CPU=sparc + fi ;; - *solaris64-sparcv9*) - PLATFORM=solaris9 - CPU=sparcv9 - ;; *solaris10-x86*) PLATFORM=solaris10 CPU=x86

12 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2892 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-10 02:36:43 -0500 (Tue, 10 Jan 2012) New Revision: 2892 Modified: trunk/build/unix/buildbin.jboss-native.sh Log: Arrange names. Modified: trunk/build/unix/buildbin.jboss-native.sh =================================================================== --- trunk/build/unix/buildbin.jboss-native.sh 2012-01-09 18:36:33 UTC (rev 2891) +++ trunk/build/unix/buildbin.jboss-native.sh 2012-01-10 07:36:43 UTC (rev 2892) @@ -145,12 +145,12 @@ case ${BUILD_SYS}-${BUILD_CPU} in *hpux-parisc2*) PLATFORM=hpux - if $force_64; then - CPU=parisc64 - else - CPU=parisc2 - fi + CPU=parisc2 ;; + *hpux64-parisc2*) + PLATFORM=hpux + CPU=parisc64 + ;; *hpux-i64*) PLATFORM=hpux # We only build a 64 bit one.

12 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2891 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-09 13:36:33 -0500 (Mon, 09 Jan 2012) New Revision: 2891 Modified: trunk/build/unix/buildbin.jboss-native.sh Log: use right location. Modified: trunk/build/unix/buildbin.jboss-native.sh =================================================================== --- trunk/build/unix/buildbin.jboss-native.sh 2012-01-09 18:13:23 UTC (rev 2890) +++ trunk/build/unix/buildbin.jboss-native.sh 2012-01-09 18:36:33 UTC (rev 2891) @@ -232,5 +232,5 @@ 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 + (cd ${common_loc}; mvn install) || exit 1 fi

12 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2890 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

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>

12 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2889 - in trunk/build/unix: src and 1 other directories.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-09 12:15:40 -0500 (Mon, 09 Jan 2012) New Revision: 2889 Added: trunk/build/unix/pom.native.xml trunk/build/unix/src/ trunk/build/unix/src/assembly/ trunk/build/unix/src/assembly/jar.native.xml Modified: trunk/build/unix/build.sh trunk/build/unix/buildbin.jboss-native.sh Log: Add logic to create an assembly jar while building. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2012-01-05 13:32:58 UTC (rev 2888) +++ trunk/build/unix/build.sh 2012-01-09 17:15:40 UTC (rev 2889) @@ -118,6 +118,7 @@ esac shift done +export force_64 # Check if we just have only to build the binaries # something like package-version-src or Modified: trunk/build/unix/buildbin.jboss-native.sh =================================================================== --- trunk/build/unix/buildbin.jboss-native.sh 2012-01-05 13:32:58 UTC (rev 2888) +++ trunk/build/unix/buildbin.jboss-native.sh 2012-01-09 17:15:40 UTC (rev 2889) @@ -138,4 +138,97 @@ rm -f ${current_loc}/x.tar cp ${common_loc}/bin/openssl ${output_loc}/bin/${output_bin} + + echo "Preparing corresponding maven resources" + case ${BUILD_SYS}${BUILD_CPU} in + *hpux-parisc2*) + PLATFORM=hpux + if $force_64; then + CPU=parisc64 + else + CPU=parisc2 + fi + ;; + *hpux-i64*) + PLATFORM=hpux + # We only build a 64 bit one. + #if $force_64; then + CPU=ia64w + #else + # CPU=ia64n + #fi + CHANGETOSL=true + ;; + *linux2-x86*) + PLATFORM=linux + CPU=i686 + ;; + # jboss-modules doesn't support it. + *linux2-i64*) + PLATFORM=linux + CPU=ia64 + ;; + *linux2-x64*) + PLATFORM=linux + CPU=x64 + ;; + *solaris-sun4v*) + PLATFORM=solaris10 + CPU=sparc + ;; + *solaris64-sun4v*) + PLATFORM=solaris10 + CPU=sparcv9 + ;; + *solaris-sparcv9*) + PLATFORM=solaris9 + CPU=sparc + ;; + *solaris64-sparcv9*) + PLATFORM=solaris9 + CPU=sparcv9 + ;; + *solaris10-x86*) + PLATFORM=solaris10 + CPU=x86 + ;; + *solaris10-x64*) + PLATFORM=solaris10 + CPU=x64 + ;; + *solaris9-x86*) + PLATFORM=solaris9 + CPU=x86 + ;; + *solaris9-x64*) + PLATFORM=solaris9 + CPU=x64 + ;; + *macosx-x86*) + PLATFORM=macosx + CPU=i386 + ;; + *macosx-x64*) + PLATFORM=macosx + CPU=x64 + ;; + *windows-x64*) + PLATFORM=windows + CPU=x64 + ;; + *windows-x86*) + PLATFORM=windows + CPU=x86 + ;; + *) + 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 + 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 fi Added: trunk/build/unix/pom.native.xml =================================================================== --- trunk/build/unix/pom.native.xml (rev 0) +++ trunk/build/unix/pom.native.xml 2012-01-09 17:15:40 UTC (rev 2889) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project 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/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>6-beta-1</version> + </parent> + + <groupId>org.jboss.as.native</groupId> + <artifactId>jbossweb-native</artifactId> + <version>2.0.10.Beta2-SNAPSHOT</version> + <description>natives bundled in jar</description> + <packaging>jar</packaging> + + <name>JBoss Application Server: Web Native Subsystem</name> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossnative/trunk/build/unix/util/...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/trunk/build/unix/util/jbo...</developerConnection> + <url>http://fisheye.jboss.org/browse/jbossnative/trunk/build/unix/util/jbossweb</url> + </scm> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Public Repository</name> + <url>http://repository.jboss.org/nexus/content/groups/public/</url> + </repository> + </repositories> + + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*TestCase.java</include> + </includes> + <enableAssertions>false</enableAssertions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2.2</version> + <executions> + <execution> + <id>jar</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <finalName>${project.artifactId}.jar</finalName> + <appendAssemblyId>false</appendAssemblyId> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <descriptors> + <descriptor>src/assembly/jar.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + + <resources> + <resource> + <directory>lib</directory> + <includes> + <include>**/*.so</include> + <include>**/*.dll</include> + <include>**/*.sl</include> + <include>**/*.dylib</include> + <include>**/libapr-1.dylib</include> + <include>**/libcrypto.dylib</include> + <include>**/libssl.dylib</include> + <include>**/libtcnative-1.dylib</include> + </includes> + </resource> + </resources> + + </build> + +</project> Added: trunk/build/unix/src/assembly/jar.native.xml =================================================================== --- trunk/build/unix/src/assembly/jar.native.xml (rev 0) +++ trunk/build/unix/src/assembly/jar.native.xml 2012-01-09 17:15:40 UTC (rev 2889) @@ -0,0 +1,98 @@ +<?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> +  + <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> + +  + <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> +  + <fileSet> + <directory>lib</directory> + <includes> + <include>libapr-1.so</include> + <include>libcrypto.so</include> + <include>libssl.so</include> + <include>libtcnative-1.so</include> + </includes> + <outputDirectory>lib/linux-i686</outputDirectory> + </fileSet> + +  + <fileSet> + <directory>lib</directory> + <includes> + <include>libapr-1.so</include> + <include>libcrypto.so</include> + <include>libssl.so</include> + <include>libtcnative-1.so</include> + </includes> + <outputDirectory>lib/linux-x86_64</outputDirectory> + </fileSet> + +  + <fileSet> + <directory>lib</directory> + <includes> + <include>tcnative-1.dll</include> + </includes> + <outputDirectory>lib/win-i686</outputDirectory> + </fileSet> + +  + <fileSet> + <directory>lib</directory> + <includes> + <include>tcnative-1.dll</include> + </includes> + <outputDirectory>lib/win-x86_64</outputDirectory> + </fileSet> + </fileSets> +</assembly>

12 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2888 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-05 08:32:58 -0500 (Thu, 05 Jan 2012) New Revision: 2888 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: Try to produce the binary. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2012-01-05 08:59:31 UTC (rev 2887) +++ trunk/build/unix/buildbin.mod_cluster.sh 2012-01-05 13:32:58 UTC (rev 2888) @@ -275,6 +275,8 @@ echo "maven build failed" exit 1 fi + # the src/assembly/bin.xml is executed too early so the first time the file is "empty". + mvn -P dist package -Djboss.server.log.dir=`pwd` -Djava.net.preferIPv4Stack=true -Dmaven.test.skip=true cp target/*-bin.* ${build_top}/output ) || exit 1 mkdir -p ${RPM_BUILD_ROOT}/${BASEHTTPD}/tools

12 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2887 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-05 03:59:31 -0500 (Thu, 05 Jan 2012) New Revision: 2887 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: Break the build if maven part failed. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2011-12-20 07:30:00 UTC (rev 2886) +++ trunk/build/unix/buildbin.mod_cluster.sh 2012-01-05 08:59:31 UTC (rev 2887) @@ -271,8 +271,12 @@ # Also build the java part. (cd ../mod_cluster mvn -P dist package -Djboss.server.log.dir=`pwd` -Djava.net.preferIPv4Stack=true + if [ $? -ne 0 ]; then + echo "maven build failed" + exit 1 + fi cp target/*-bin.* ${build_top}/output -) +) || exit 1 mkdir -p ${RPM_BUILD_ROOT}/${BASEHTTPD}/tools (cd ../mod_cluster/test/java ant compile

12 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits January 2012