Author: mladen.turk(a)jboss.com
Date: 2008-03-26 11:40:55 -0400 (Wed, 26 Mar 2008)
New Revision: 1464
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildbin.jboss-native.sh
trunk/build/unix/buildbin.jboss-native.windows.sh
Log:
Make new distribution target for jboss-native so
we can simply drop them to the jbossweb installation
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-26 15:07:28 UTC (rev 1463)
+++ trunk/build/unix/build.sh 2008-03-26 15:40:55 UTC (rev 1464)
@@ -1001,16 +1001,16 @@
# set the urls
if $BUILD_WIN ; then
-
APRURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${apr_ver...
-
APUURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-${ap...
-
APIURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-iconv-${a...
+
APRURL=http://www.apache.org/dist/apr/apr-${apr_version}-win32-src.zip
+
APUURL=http://www.apache.org/dist/apr/apr-util-${apu_version}-win32-src.zip
+
APIURL=http://www.apache.org/dist/apr/apr-iconv-${api_version}-win32-src.zip
APRURLBACK=http://archive.apache.org/dist/apr/apr-${apu_version}-win32-sr...
APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}-win...
APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}-wi...
else
-
APRURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${apr_ver...
-
APUURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-${ap...
-
APIURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-iconv-${a...
+
APRURL=http://www.apache.org/dist/apr/apr-${apr_version}.tar.gz
+
APUURL=http://www.apache.org/dist/apr/apr-util-${apu_version}.tar.gz
+
APIURL=http://www.apache.org/dist/apr/apr-iconv-${api_version}.tar.gz
APRURLBACK=http://archive.apache.org/dist/apr/apr-${apr_version}.tar.gz
APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}.tar.gz
APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}.ta...
Modified: trunk/build/unix/buildbin.jboss-native.sh
===================================================================
--- trunk/build/unix/buildbin.jboss-native.sh 2008-03-26 15:07:28 UTC (rev 1463)
+++ trunk/build/unix/buildbin.jboss-native.sh 2008-03-26 15:40:55 UTC (rev 1464)
@@ -44,6 +44,9 @@
output_loc=$3
has_openssl=$4
+output_lib="META-INF/lib/${BUILD_SYS}/${BUILD_CPU}"
+output_bin="META-INF/bin/${BUILD_SYS}/${BUILD_CPU}"
+
echo "Configuring tomcat-native in `pwd`"
add_conf=""
if [ "x$JAVA_HOME" = "x" ]; then
@@ -57,7 +60,8 @@
add_conf="${add_conf} --with-ssl=no"
fi
-mkdir -p ${output_loc}/bin/native
+mkdir -p ${output_loc}/bin/${output_lib}
+mkdir -p ${output_loc}/bin/${output_bin}
native_sources=srclib/`ls srclib | grep tomcat-native`
# Build native part.
@@ -89,7 +93,7 @@
(cd ${prefix_loc}/lib
tar -cf ${current_loc}/x.tar *.${so_extension}*
)
-(cd ${output_loc}/bin/native
+(cd ${output_loc}/bin/${output_lib}
tar -xf ${current_loc}/x.tar
)
rm -f ${current_loc}/x.tar
@@ -97,7 +101,7 @@
(cd ${common_loc}/lib
tar -cf ${current_loc}/x.tar *.${so_extension}*
)
-(cd ${output_loc}/bin/native
+(cd ${output_loc}/bin/${output_lib}
tar -xf ${current_loc}/x.tar
)
rm -f ${current_loc}/x.tar
@@ -107,10 +111,10 @@
(cd ${common_loc}/lib
tar -cf ${current_loc}/x.tar engines
)
- (cd ${output_loc}/bin/native
+ (cd ${output_loc}/bin/${output_lib}
tar -xf ${current_loc}/x.tar
)
rm -f ${current_loc}/x.tar
- cp ${common_loc}/bin/openssl ${output_loc}/bin
+ cp ${common_loc}/bin/openssl ${output_loc}/bin/${output_bin}
fi
Modified: trunk/build/unix/buildbin.jboss-native.windows.sh
===================================================================
--- trunk/build/unix/buildbin.jboss-native.windows.sh 2008-03-26 15:07:28 UTC (rev 1463)
+++ trunk/build/unix/buildbin.jboss-native.windows.sh 2008-03-26 15:40:55 UTC (rev 1464)
@@ -46,6 +46,9 @@
has_openssl=$4
has_static=$5
+output_lib="META-INF/lib/${BUILD_SYS}/${BUILD_CPU}"
+output_bin="META-INF/bin/${BUILD_SYS}/${BUILD_CPU}"
+
if $has_static; then
common_loc=${common_loc}-static
fi
@@ -63,7 +66,8 @@
add_conf="${add_conf} APR_DECLARE_STATIC=true"
fi
-mkdir -p ${output_loc}/bin/native
+mkdir -p ${output_loc}/bin/${output_lib}
+mkdir -p ${output_loc}/bin/${output_bin}
native_sources=srclib/`ls srclib | grep tomcat-native`
src_dir=`cygpath -w -a ${native_sources}`
(cd $native_sources
@@ -83,15 +87,15 @@
cp README-service.txt ${output_loc}/bin
)
-cp ${common_loc}/lib/libapr*.dll ${output_loc}/bin/native 2>/dev/null
+cp ${common_loc}/lib/libapr*.dll ${output_loc}/bin/${output_lib} 2>/dev/null
if $has_openssl ; then
- cp ${common_loc}/bin/*eay32.dll ${output_loc}/bin/native 2>/dev/null
- cp ${common_loc}/bin/openssl.exe ${output_loc}/bin
+ cp ${common_loc}/bin/*eay32.dll ${output_loc}/bin/${output_lib} 2>/dev/null
+ cp ${common_loc}/bin/openssl.exe ${output_loc}/bin/${output_bin}
fi
-cp ${prefix_loc}/lib/*.dll ${output_loc}/bin/native 2>/dev/null
-cp ${prefix_loc}/bin/jboss*.* ${output_loc}/bin 2>/dev/null
+cp ${prefix_loc}/lib/*.dll ${output_loc}/bin/${output_lib} 2>/dev/null
+cp ${prefix_loc}/bin/jboss*.* ${output_loc}/${output_bin} 2>/dev/null
if [ -n "${CRT_REDIST}" ] ; then
crt_redist_loc=`cygpath -u "${CRT_REDIST}"`
- cp "${crt_redist_loc}"/*.dll ${output_loc}/bin/native
+ cp "${crt_redist_loc}"/*.dll ${output_loc}/bin/${output_lib}
fi