[jbossnative-commits] JBoss Native SVN: r1505 - trunk/build.

Author: mladen.turk(a)jboss.com Date: 2008-04-03 04:04:59 -0400 (Thu, 03 Apr 2008) New Revision: 1505 Removed: trunk/build/buildprep.bat trunk/build/buildprep.sh trunk/build/buildsight.sh trunk/build/buildworld.bat trunk/build/buildworld.sh Log: Remove obsolete files that we don't use for a long time Deleted: trunk/build/buildprep.bat =================================================================== --- trunk/build/buildprep.bat 2008-04-03 08:03:26 UTC (rev 1504) +++ trunk/build/buildprep.bat 2008-04-03 08:04:59 UTC (rev 1505) @@ -1,108 +0,0 @@ -@echo off -REM Copyright(c) 2006 Red Hat Middleware, LLC, -REM and individual contributors as indicated by the @authors tag. -REM See the copyright.txt in the distribution for a -REM full listing of individual contributors. -REM -REM This library is free software; you can redistribute it and/or -REM modify it under the terms of the GNU Lesser General Public -REM License as published by the Free Software Foundation; either -REM version 2 of the License, or (at your option) any later version. -REM -REM This library is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -REM Lesser General Public License for more details. -REM -REM You should have received a copy of the GNU Lesser General Public -REM License along with this library in the file COPYING.LIB; -REM if not, write to the Free Software Foundation, Inc., -REM 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -REM -REM @author Mladen Turk -REM - -@if "%OS%" == "Windows_NT" setlocal -set NATIVETAG=HEAD - -set use_openssl=1 -@if "%1" == "nossl" set use_openssl=0 - -REM Replace NATIVEEXT with tagged version number, like 1.1.0 -REM set NATIVEEXT=current -set NATIVEEXT=1.1.11 -set NATIVEVER=2.0.0-windows-src - -REM JBossWeb SVN repository -set JBOSSNATIVESVN=http://anonsvn.jboss.org/repos/jbossnative/trunk - -REM Use tag or trunk -REM set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk -set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TO... - -set NATIVEDIST=jboss-native-%NATIVEVER% -@rmdir /S /Q %NATIVEDIST% 2>NUL -@mkdir %NATIVEDIST%\srclib -@mkdir %NATIVEDIST%\build -@mkdir %NATIVEDIST%\dist -svn export -r %NATIVETAG% %NATIVESVN%/jni/native %NATIVEDIST%/srclib/tomcat-native-%NATIVEEXT% - -set APRVER=1.2.8 -set APUVER=1.2.8 -set OPENSSLVER=0.9.8e - -REM Prebuild -cd %NATIVEDIST% -REM Export Service code -svn export %JBOSSNATIVESVN%/utils/windows/native/service - -cd srclib - -REM Download APR -wget --tries=0 --retry-connrefused http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-%APRVER%-win32-s... -unzip -qo apr-%APRVER%-win32-src.zip -@del /Q apr-%APRVER%-win32-src.zip -@patch -tfsi ../../patch/apr-%APRVER%.hw.patch apr-%APRVER%/include/apr.hw - -REM Download APRUTIL -wget --tries=0 --retry-connrefused http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-%APUVER%-wi... -unzip -qo apr-util-%APUVER%-win32-src.zip -@del /Q apr-util-%APUVER%-win32-src.zip -@patch -tfsi ../../patch/apu/apu-%APUVER%.hw.patch apr-util-%APUVER%/include/apu.hw -REM We simply copy over the expat config files -@cp -fT ../../patch/apu/config-%APUVER%.hw apr-util-%APUVER%/xml/expat/lib/config.h -@cp -fT ../../patch/apu/expat-%APUVER%.hw apr-util-%APUVER%/xml/expat/lib/expat.h - -REM Download OpenSSL -@if "%use_openssl%" == "1" ( - wget --tries=0 --retry-connrefused http://www.openssl.org/source/openssl-%OPENSSLVER%.tar.gz - tar zxf openssl-%OPENSSLVER%.tar.gz 2>NUL - @del /Q openssl-%OPENSSLVER%.tar.gz -) -cd .. -cd .. - -cp ./buildworld.bat %NATIVEDIST%/ -cp ./NMAKEcommon.inc %NATIVEDIST%/build/ -cp ../JBossORG-EULA.txt %NATIVEDIST%/ -cp ../srclib/tomcat-native/NMAKEmakefile %NATIVEDIST%/srclib/tomcat-native-%NATIVEEXT%/ -cp ../srclib/apr/NMAKEmakefile %NATIVEDIST%/srclib/apr-%APRVER%/ -cp ../srclib/apr-util/NMAKEmakefile %NATIVEDIST%/srclib/apr-util-%APUVER%/ -@if "%use_openssl%" == "1" ( - cp ../srclib/openssl/*.bat %NATIVEDIST%/srclib/openssl-%OPENSSLVER%/ -) - -@if "%use_openssl%" == "1" ( - set NATIVESRCZ=%NATIVEDIST% -) else ( - set NATIVESRCZ=%NATIVEDIST%-nossl -) - -zip -9rqo %NATIVESRCZ%.zip %NATIVEDIST% -REM tar cfz %NATIVESRCZ%.tar.gz %NATIVEDIST% - -REM @rmdir /S /Q %NATIVEDIST% -REM Instead packing move the prepared sources. -@rmdir /S /Q ..\..\%NATIVEDIST% 2>NUL -@mv %NATIVEDIST% ../../ -@mv %NATIVESRCZ%.zip ../../ Deleted: trunk/build/buildprep.sh =================================================================== --- trunk/build/buildprep.sh 2008-04-03 08:03:26 UTC (rev 1504) +++ trunk/build/buildprep.sh 2008-04-03 08:04:59 UTC (rev 1505) @@ -1,283 +0,0 @@ -#!/bin/sh -# Copyright(c) 2007 Red Hat Middleware, LLC, -# and individual contributors as indicated by the @authors tag. -# See the copyright.txt in the distribution for a -# full listing of individual contributors. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library in the file COPYING.LIB; -# if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -# -# @author Mladen Turk -# -echo "" -echo "Running $0 $LastChangedDate$" -echo "" -echo "$0 Starting at `date`" -echo "" - -BUILDVER=2.0.0 -# Replace NATIVEEXT with tagged version number, like 1.1.3 -# NATIVEEXT=current -TCNATIVEEXT=1.1.11 -# Use tag or trunk -# NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk -TCNATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_11 -TCNATIVETAG=HEAD -APRVER=1.2.8 -SSLNUM=0.9.8 -SSLBLD=e -SSLVER=${SSLNUM}${SSLBLD} - -# parameters -# --with-openssl-version=0.9.8e -# --with-tcnative-version=1.1.11 -# --with-apr-version=1.2.7 -# --build-version=1.2.2 -# --build-package=native - -build_package=native -crlf=false; -use_openssl=true; -use_tomcat_native=true; -posix_tar=true; - -while [ "x" != "x$1" ] -do - case $1 in - --crlf) - crlf=true - ;; - --disable-openssl) - use_openssl=false - SSLVER=disabled - ;; - --disable-tomcat-native) - use_tomcat_native=false - TCNATIVEEXT=disabled - ;; - --with-openssl-version=*) - SSLVER=`echo $1 | awk -F = '{ print $2 }'` - ;; - ----with-tcnative-version=*) - TCNATIVEEXT=`echo $1 | awk -F = '{ print $2 }'` - TCNATIVETAG=`echo $TCNATIVEEXT | sed 's:\.:_:g'` - TCNATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/... - ;; - --with-apr-version=*) - APRVER=`echo $1 | awk -F = '{ print $2 }'` - ;; - --build-version=*) - BUILDVER=`echo $1 | awk -F = '{ print $2 }'` - ;; - --build-package=*) - build_package=`echo $1 | awk -F = '{ print $2 }'` - ;; - *) - echo "$1: not (yet) supported" - ;; - esac - shift -done - -NATIVEVER=${BUILDVER}-src - -if $use_openssl ; then - NATIVEVER=$NATIVEVER-ssl -fi - -NATIVEDIST=jboss-${build_package}-${NATIVEVER} -rm -rf ${NATIVEDIST} -mkdir -p ${NATIVEDIST}/srclib -mkdir -p ${NATIVEDIST}/build -mkdir -p ${NATIVEDIST}/dist - -# Set path for our own tools -BUILDCPU=`uname -m` -case ${BUILDCPU} in - sun4u*) - BUILDCPU=sparcv9 - ;; - i86pc*) - BUILDCPU=x86 - ;; - 9000/800*) - BUILDCPU=parisc2 - ;; - Power*) - BUILDCPU=ppc - ;; -esac - -BUILDSYS="" -case `uname -s` in - Linux*) - BUILDSYS="linux2" - ;; - SunOS*) - BUILDSYS="solaris" - # Try to use sun studio. - # we need makedepend for make depend (openssl) - PATH=/opt/SUNWspro/bin:/usr/X/bin:/usr/local/bin:$PATH - export PATH - ;; - HP-UX*) - BUILDSYS="hpux" - BUILD_SO_EXT=sl - posix_tar=false - ;; - *) - BUILDSYS=`uname -s` - ;; -esac -if [ -d /home/shared/$BUILDSYS-$BUILDCPU/bin ]; then - PATH=/home/shared/$BUILDSYS-$BUILDCPU/bin:$PATH - echo "PATH changed to $PATH" - export PATH -fi - -# Get tomcat-native via svn. -if $use_tomcat_native ; then - if $crlf ; then - svn export -r $TCNATIVETAG --native-eol CRLF ${TCNATIVESVN}/jni/native ${NATIVEDIST}/srclib/tomcat-native-${TCNATIVEEXT} - else - svn export -r $TCNATIVETAG ${TCNATIVESVN}/jni/native ${NATIVEDIST}/srclib/tomcat-native-${TCNATIVEEXT} - fi -fi - -# Download Common files -if [ ! -d apr-${APRVER} ]; then - echo "Fetching APR ${APRVER}" - if $crlf ; then - wget --tries=0 --retry-connrefused http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${APRVER}-win32-... - unzip -q -o apr-${APRVER}-win32-src.zip - rm -f apr-${APRVER}-win32-src.zip - else - wget --tries=0 --retry-connrefused http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${APRVER}.tar.gz - gunzip -c apr-${APRVER}.tar.gz | tar -xf - - rm -f apr-${APRVER}.tar.gz - fi - if [ ! -d apr-${APRVER} ]; then - echo "APR download or extract failed" - exit 1 - fi -else - echo "Reusing APR ${APRVER}" -fi - -if $use_openssl ; then - if [ ! -d openssl-${SSLVER} ]; then - echo "Fetching OpenSSL ${SSLVER}" - wget --tries=0 --retry-connrefused http://www.openssl.org/source/openssl-${SSLVER}.tar.gz - gunzip -c openssl-${SSLVER}.tar.gz | tar -xf - - rm -f openssl-${SSLVER}.tar.gz - if [ ! -d openssl-${SSLVER} ]; then - echo "OpenSSL download or extract failed" - exit 1 - fi - else - echo "Reusing OpenSSL ${SSLVER}" - fi -fi - -# Copy external components -cp -r apr-${APRVER} ${NATIVEDIST}/srclib -if $use_openssl ; then - cp -r openssl-${SSLVER} ${NATIVEDIST}/srclib -fi - -# Copy component sources -if [ -d ../${build_package} ]; then - echo "Copying component $build_package sources" - cp -r ../${build_package} ${NATIVEDIST} -fi - - -# Prebuild -cd ${NATIVEDIST} -cd srclib - -apr_sources=`pwd`/apr-${APRVER} - -if $use_tomcat_native ; then - # Create Tomcat Native configure - cd tomcat-native-${TCNATIVEEXT} - ./buildconf --with-apr=${apr_sources} - cd .. -fi -cd .. - -if [ -d ${build_package}/native ]; then - cd ${build_package}/native - ./buildconf --with-apr=${apr_sources} - cd ../.. -fi -cd .. - -# Copy common files -# Todo: Rewrite versions when copying -cp ./buildworld.sh ${NATIVEDIST}/ -cp ./NMAKEcommon.inc ${NATIVEDIST}/build/ -cp ../JBossORG-EULA.txt ${NATIVEDIST}/ - -# Copy package build files -if [ -f ./build${build_package}.sh ]; then - cp ./build${build_package}.sh ${NATIVEDIST}/ -else - cp ./buildworld.sh ${NATIVEDIST}/ -fi -if [ -f ./build${build_package}.bat ]; then - cp ./build${build_package}.bat ${NATIVEDIST}/ -fi - - -# Copy external components build files -cp ../srclib/apr/NMAKEmakefile ${NATIVEDIST}/srclib/apr-${APRVER}/ -if $use_tomcat_native ; then - cp ../srclib/tomcat-native/NMAKEmakefile ${NATIVEDIST}/srclib/tomcat-native-${TCNATIVEEXT}/ -fi -if $use_openssl ; then - cp ../srclib/openssl/*.bat ${NATIVEDIST}/srclib/openssl-${SSLVER}/ -fi - -# Create build configuration file -cat >${NATIVEDIST}/build.conf <<EOT -# Automatically generated by buildprep.sh (`date`) -# DO NOT HAND EDIT! -DISTRIBUTION = ${NATIVEDIST} -BUILD_PACKAGE = ${build_package} -BUILD_VERSION = ${BUILDVER} -BUILD_SYSTEM = ${BUILDSYS} -BUILD_CPU = ${BUILDCPU} -APR_VERSION = ${APRVER} -SSL_VERSION = ${SSLVER} -EOT - -# Create distribution -if $crlf ; then - zip -9 -r -q -o ${NATIVEDIST}.zip ${NATIVEDIST} -else - if $posix_tar; then - tar --owner=root --group=bin -cf - ${NATIVEDIST} | gzip -c > ${NATIVEDIST}.tar.gz - else - tar -cf - ${NATIVEDIST} | gzip -c > ${NATIVEDIST}.tar.gz - fi -fi - -rm -rf ../../${NATIVEDIST} -mv ${NATIVEDIST} ../../ -mv ${NATIVEDIST}.tar.gz ../../ -echo "" -echo "$0 Done at `date`" -echo "" Deleted: trunk/build/buildsight.sh =================================================================== --- trunk/build/buildsight.sh 2008-04-03 08:03:26 UTC (rev 1504) +++ trunk/build/buildsight.sh 2008-04-03 08:04:59 UTC (rev 1505) @@ -1,160 +0,0 @@ -#!/bin/sh -# Copyright(c) 2006 Red Hat Middleware, LLC, -# and individual contributors as indicated by the @authors tag. -# See the copyright.txt in the distribution for a -# full listing of individual contributors. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library in the file COPYING.LIB; -# if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -# -# @author Mladen Turk -# -echo "" -echo "Running $0 $LastChangedDate$" -echo "" -echo "$0 Starting at `date`" -echo "" - -TEST=test -BUILDNAM=jboss-sight - -BUILDVER=1.0.0 -APRVER=1.2.8 - -BUILDDIR=`pwd` -BUILD_SO_EXT=so - -posix_tar=true -build_sight=false - -while [ "x" != "x$1" ] -do - case $1 in - --with-apr-version=*) - APRVER=`echo $1 | awk -F = '{ print $2 }'` - ;; - --build-version=*) - BUILDVER=`echo $1 | awk -F = '{ print $2 }'` - ;; - esac - shift -done - -BUILDCPU=`uname -m` -case ${BUILDCPU} in - sun4u*) - BUILDCPU=sparcv9 - ;; - i86pc*) - BUILDCPU=x86 - ;; - 9000/800*) - BUILDCPU=parisc2 - ;; - Power*) - BUILDCPU=ppc - # Add the default java location - if [ "x${JAVA_HOME}" = "x" ]; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/ - export JAVA_HOME - fi - ;; -esac - -BUILDSYS="" -case `uname -s` in - Linux*) - BUILDSYS="linux2" - build_sight=true - ;; - SunOS*) - BUILDSYS="solaris" - # Try to use sun studio. - # we need makedepend for make depend (openssl) - PATH=/opt/SUNWspro/bin:/usr/X/bin:/usr/local/bin:$PATH - export PATH - ;; - HP-UX*) - BUILDSYS="hpux" - BUILD_SO_EXT=sl - posix_tar=false - ;; - *) - BUILDSYS=`uname -s` - ;; -esac - -if $build_sight ; then - echo "Sight enabled" -else - echo "Sight not supported on this platform" - exit 0 -fi - -if [ -d /home/shared/$BUILDSYS-$BUILDCPU/bin ]; then - PATH=/home/shared/$BUILDSYS-$BUILDCPU/bin:$PATH - export PATH - echo "PATH changed to $PATH" -fi - -BUILDTAG=${BUILDSYS}-${BUILDCPU} -BUILDLOC=${BUILDDIR}/dist/${BUILDTAG} - -echo "Configuring apr-${APRVER} with --prefix=${BUILDLOC}" -cd srclib/apr-${APRVER} -./configure --prefix=${BUILDLOC} -make -make install -cd ${BUILDDIR} - -cd sight/native -./configure --with-apr=${BUILDLOC} --prefix=${BUILDLOC} -make -make install -cd .. -ant -ant javadocs -ant jar -mkdir ${BUILDLOC}/bin/native -mkdir -p ${BUILDLOC}/java/lib -cp dist/*.jar ${BUILDLOC}/java/lib/ -cp -r dist/doc ${BUILDLOC}/java/ - -cd ${BUILDLOC} -cp -r lib/* bin/native/ -cp -r java/* . -cp ${BUILDDIR}/JBossORG-EULA.txt . - -# Remove extra generated files -rm -f bin/apr-1-config -rm -f bin/c_rehash -rm -f bin/native/*.a -rm -f bin/native/*.la -rm -f bin/native/*.exp -rm -f bin/native/*.c -rm -rf bin/native/pkgconfig - -INSTALL_TGZ=${BUILDNAM}-${BUILDVER}-${BUILDTAG} - -if $posix_tar; then - tar --owner=root --group=bin -cf - JBossORG-EULA.txt bin/ java/ | gzip -c > ../../../${INSTALL_TGZ}.tar.gz -else - tar -cf - JBossORG-EULA.txt bin/ java/ | gzip -c > ../../../${INSTALL_TGZ}.tar.gz -fi - -cd ${BUILDDIR} -echo "" -echo "$0 Done at `date`" -echo "" Deleted: trunk/build/buildworld.bat =================================================================== --- trunk/build/buildworld.bat 2008-04-03 08:03:26 UTC (rev 1504) +++ trunk/build/buildworld.bat 2008-04-03 08:04:59 UTC (rev 1505) @@ -1,162 +0,0 @@ -@echo off -REM Copyright(c) 2006 Red Hat Middleware, LLC, -REM and individual contributors as indicated by the @authors tag. -REM See the copyright.txt in the distribution for a -REM full listing of individual contributors. -REM -REM This library is free software; you can redistribute it and/or -REM modify it under the terms of the GNU Lesser General Public -REM License as published by the Free Software Foundation; either -REM version 2 of the License, or (at your option) any later version. -REM -REM This library is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -REM Lesser General Public License for more details. -REM -REM You should have received a copy of the GNU Lesser General Public -REM License along with this library in the file COPYING.LIB; -REM if not, write to the Free Software Foundation, Inc., -REM 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -REM -REM @author Mladen Turk -REM -@if "%OS%" == "Windows_NT" setlocal - -@if "%TOOLS_ROOT%" == "" set TOOLS_ROOT=C:\opt - -@echo Using Tools from %TOOLS_ROOT% -set MSVS8VC=%TOOLS_ROOT%\MSVS8\VC -set MSVS6VC=%TOOLS_ROOT%\MSVS6 -set MSWPSDK=%TOOLS_ROOT%\PSDK6 - -set OPENSSLBIN=buildssl -set OPENSSLVER=0.9.8e -set APRVER=1.2.8 -set APUVER=1.2.8 -set TCNVER=1.1.11 -set FLAVOR=DLL -set BUILDNAM=jboss-native -set BUILDVER=2.0.0-windows - -@if not "%1" == "nossl" goto checkSDK -shift -set WITHOUT_OPENSSL=1 - -:checkSDK -@if not "%1" == "sdk" goto checkFLAVOR -shift -set usesdk=1 - -:checkFLAVOR -@if /i "%1" == "dll" goto makeDLL -set FLAVOR=STATIC -goto checkCPU -:makeDLL -set FLAVOR=DLL - -:checkCPU -@if /i "%2" == "x86" goto cpuX86 -@if /i "%2" == "amd64" goto cpuAMD64 -@if /i "%2" == "ia64" goto cpuIA64 -echo Usage: buildworld <CPU> -goto cmdEnd - -:cpuX86 -set CPU=I386 -set CPUEXT=i686 -set OPENSSLBIN=buildsslasm %1 -@if "%usesdk%" == "1" ( - call %MSVS6VC%\vs6vars -) else ( - call %MSVS8VC%\bin\vcvars32 - set CRT_REDIST=%MSVS8VC%\redist\x86\Microsoft.VC80.CRT -) -goto cmdBuild - -:cpuAMD64 -set CPU=AMD64 -set CPUEXT=amd64 -set OPENSSLBIN=buildsslamd64 %1 -@if "%usesdk%" == "1" ( - call %MSWPSDK%\SetEnv /X64 /RETAIL -) else ( - call %MSVS8VC%\bin\amd64\vcvarsamd64 - set CRT_REDIST=%MSVS8VC%\redist\amd64\Microsoft.VC80.CRT -) -goto cmdBuild - -:cpuIA64 -set CPU=IA64 -set CPUEXT=ia64 -set OPENSSLBIN=buildsslia64 %1 -@if "%usesdk%" == "1" ( - call %MSWPSDK%\SetEnv /SRV64 /RETAIL -) else ( - REM Update to correct IA64 paths - call %MSVS8VC%\bin\amd64\vcvarsamd64 - set CRT_REDIST=%MSVS8VC%\redist\amd64\Microsoft.VC80.CRT -) -goto cmdBuild - -:cmdBuild -set INSTALLNAME=%BUILDNAM%-%BUILDVER%-%CPUEXT% -rmdir /S /Q dist\%INSTALLNAME% 2>NUL - -set INCLUDE_PRE64PRA= -set INCLUDE_BUFFEROVERFLOWU= - -@for /F %%i IN ('echo %INCLUDE%') DO ( - @if exist "%%i\PRE64PRA.H" set INCLUDE_PRE64PRA=1 -) - -@for /F %%i IN ('echo %LIB%') DO ( - @if exist "%%i\bufferoverflowu.lib" set INCLUDE_BUFFEROVERFLOWU=1 -) - -@if not "%WITHOUT_OPENSSL%" == "1" ( - cd srclib/openssl-%OPENSSLVER% - call %OPENSSLBIN% %1 - cd .. -) else ( - cd srclib -) - -cd apr-%APRVER% -nmake -f NMAKEMakefile %FLAVOR%=1 -cd .. -cd apr-util-%APUVER% -nmake -f NMAKEMakefile %FLAVOR%=1 -cd .. -cd tomcat-native-%TCNVER% -nmake -f NMAKEMakefile %FLAVOR%=1 install -cd .. -cd .. -cd service -cd jbosssvc -nmake -f NMAKEMakefile STATIC_CRT=1 install -cd .. -cd jbosssch -nmake -f NMAKEMakefile install -cd .. -REM Edit the next line for a JBossAS version. -REM TODO: Make that configurable -awk -f examples/rewritesvc.awk examples/service.bat ../dist/%INSTALLNAME%/bin/service.bat "5.0.0 Beta 3" 5 0 "Windows %CPUEXT%" -cp examples/README-service.txt ../dist/%INSTALLNAME%/bin/ -cd .. -cp JBossORG-EULA.txt dist/%INSTALLNAME%/ -cd dist/%INSTALLNAME% - -@if "%WITHOUT_OPENSSL%" == "1" ( - set INSTALLNAME=%INSTALLNAME%-nossl -) - -@if "%FLAVOR%" == "STATIC" ( -zip -9rqo ../../../%INSTALLNAME%-static.zip JBossORG-EULA.txt bin -) else ( -zip -9rqo ../../../%INSTALLNAME%.zip JBossORG-EULA.txt bin -) -cd .. -cd .. - -:cmdEnd Deleted: trunk/build/buildworld.sh =================================================================== --- trunk/build/buildworld.sh 2008-04-03 08:03:26 UTC (rev 1504) +++ trunk/build/buildworld.sh 2008-04-03 08:04:59 UTC (rev 1505) @@ -1,253 +0,0 @@ -#!/bin/sh -# Copyright(c) 2006 Red Hat Middleware, LLC, -# and individual contributors as indicated by the @authors tag. -# See the copyright.txt in the distribution for a -# full listing of individual contributors. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library in the file COPYING.LIB; -# if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -# -# @author Mladen Turk -# -echo "" -echo "Running $0 $LastChangedDate$" -echo "" -echo "$0 Starting at `date`" -echo "" - -TEST=test -BUILDNAM=jboss-native - -BUILDVER=2.0.0 -APRVER=1.2.8 -TCNVER=1.1.11 - -SSLNUM=0.9.8 -SSLBLD=e -SSLVER=${SSLNUM}${SSLBLD} - -BUILDDIR=`pwd` -BUILD_SO_EXT=so - -disable_openssl=false -posix_tar=true -build_sight=false - -while [ "x" != "x$1" ] -do - case $1 in - --disable-openssl) - disable_openssl=true - ;; - --with-openssl-version=*) - SSLVER=`echo $1 | awk -F = '{ print $2 }'` - SSLNUM=`echo $1 | awk '{ print substr($1,1,5) } '` - ;; - --with-tcnative-version=*) - TCNVER=`echo $1 | awk -F = '{ print $2 }'` - ;; - --with-apr-version=*) - APRVER=`echo $1 | awk -F = '{ print $2 }'` - ;; - --build-version=*) - BUILDVER=`echo $1 | awk -F = '{ print $2 }'` - ;; - esac - shift -done - -BUILDCPU=`uname -m` -case ${BUILDCPU} in - sun4u*) - BUILDCPU=sparcv9 - ;; - i86pc*) - BUILDCPU=x86 - ;; - 9000/800*) - BUILDCPU=parisc2 - ;; - Power*) - BUILDCPU=ppc - # Add the default java location - if [ "x${JAVA_HOME}" = "x" ]; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/ - export JAVA_HOME - fi - ;; -esac - -BUILDSYS="" -case `uname -s` in - Linux*) - BUILDSYS="linux2" - if [ -d ../jbossnative/sight ] ; then - build_sight=true - else - pwd - exit 1 - fi - ;; - SunOS*) - BUILDSYS="solaris" - # Try to use sun studio. - # we need makedepend for make depend (openssl) - PATH=/opt/SUNWspro/bin:/usr/X/bin:/usr/local/bin:$PATH - export PATH - ;; - HP-UX*) - BUILDSYS="hpux" - BUILD_SO_EXT=sl - posix_tar=false - ;; - *) - BUILDSYS=`uname -s` - ;; -esac - -if [ -d /home/shared/$BUILDSYS-$BUILDCPU/bin ]; then - PATH=/home/shared/$BUILDSYS-$BUILDCPU/bin:$PATH - export PATH - echo "PATH changed to $PATH" -fi - -BUILDTAG=${BUILDSYS}-${BUILDCPU} -BUILDLOC=${BUILDDIR}/dist/${BUILDTAG} - -echo "Configuring apr-${APRVER} with --prefix=${BUILDLOC}" -cd srclib/apr-${APRVER} -./configure --prefix=${BUILDLOC} -make -make install -cd ${BUILDDIR} - -if $disable_openssl ; then - echo "openssl dissable" -else - cd srclib/openssl-${SSLVER} - - case ${BUILDTAG} in - solaris-sparcv9*) - ./Configure --prefix=${BUILDLOC} --openssldir=${BUILDLOC}/ssl threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec shared solaris-sparcv9-cc - ;; - solaris-x86*) - ./Configure --prefix=${BUILDLOC} --openssldir=${BUILDLOC}/ssl threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec shared solaris-x86-cc - ;; - hpux-parisc2*) - ./Configure --prefix=${BUILDLOC} --openssldir=${BUILDLOC}/ssl threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec shared hpux-parisc2-cc - ;; - *) - ./config --prefix=${BUILDLOC} --openssldir=${BUILDLOC}/ssl threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec shared - ;; - esac - make depend - make - make install_sw - cd ${BUILDLOC}/lib - ln -s libcrypto.${BUILD_SO_EXT}.${SSLNUM} libcrypto.${BUILD_SO_EXT}.0 - ln -s libssl.${BUILD_SO_EXT}.${SSLNUM} libssl.${BUILD_SO_EXT}.0 - cd ${BUILDDIR} -fi - -# -# Build sight -# -if $disable_openssl ; then - if $build_sight; then - echo "" - echo "Building SIGHT" - (cd ../jbossnative/sight/native - ./buildconf --with-apr=${BUILDDIR}/srclib/apr-${APRVER} - ./configure --with-apr=${BUILDLOC} --prefix=${BUILDLOC}/SIGHT - make clean - make - make install - ) - (cd ../jbossnative/sight - ant - ant jar - ) - # - # Now put the file in their location - # ./sight-1.0.0.jar - #./native/libapr* - #./native/libsight* - mkdir -p ${BUILDLOC}/DIST/native - mv ${BUILDLOC}/SIGHT/lib/libsight* ${BUILDLOC}/DIST/native - mv ${BUILDLOC}/lib/libapr* ${BUILDLOC}/DIST/native - cp ../jbossnative/sight/dist/sight*.jar ${BUILDLOC}/DIST - INSTALL_SIGHT_TGZ=sight-1.0.0-${BUILDTAG} - (cd ${BUILDLOC}/DIST - if $posix_tar; then - tar --owner=root --group=bin -cf - . | gzip -c > ../../../../${INSTALL_SIGHT_TGZ}.tar.gz - else - tar -cf - . | gzip -c > ../../../../${INSTALL_SIGHT_TGZ}.tar.gz - fi - ) - mv ${BUILDLOC}/DIST/native/libapr* ${BUILDLOC}/lib - echo "SIGHT Done at `date`" - echo "" - fi -fi - -echo "Configuring tomcat-native-${TCNVER}" -if [ "x$JAVA_HOME" = "x" ]; then - ADDCONF= -else - ADDCONF="--with-java-home=$JAVA_HOME" -fi - -# XXX: was --enable-layout=generic $1 -echo "Configuring tomcat-native-${TCNVER} with ${ADDCONF} --prefix=${BUILDLOC} --with-apr=${BUILDLOC} ..." -cd srclib/tomcat-native-${TCNVER} -if $disable_openssl ; then - ./configure ${ADDCONF} --prefix=${BUILDLOC} --with-apr=${BUILDLOC} --with-ssl=no --enable-layout=generic -else - ./configure ${ADDCONF} --prefix=${BUILDLOC} --with-apr=${BUILDLOC} --with-ssl=${BUILDLOC} --enable-layout=generic -fi - -make -make install -cd ${BUILDLOC} -mkdir bin/native -cp -r lib/* bin/native/ -cp ${BUILDDIR}/JBossORG-EULA.txt . - -# Remove extra generated files -rm -f bin/apr-1-config -rm -f bin/c_rehash -rm -f bin/native/*.a -rm -f bin/native/*.la -rm -f bin/native/*.exp -rm -f bin/native/*.c -rm -rf bin/native/pkgconfig - -INSTALL_TGZ=${BUILDNAM}-${BUILDVER}-${BUILDTAG} -if $disable_openssl ; then - INSTALL_TGZ=${BUILDNAM}-${BUILDVER}-${BUILDTAG} -else - INSTALL_TGZ=${BUILDNAM}-${BUILDVER}-${BUILDTAG}-ssl -fi - -if $posix_tar; then - tar --owner=root --group=bin -cf - JBossORG-EULA.txt bin/ | gzip -c > ../../../${INSTALL_TGZ}.tar.gz -else - tar -cf - JBossORG-EULA.txt bin/ | gzip -c > ../../../${INSTALL_TGZ}.tar.gz -fi - -cd ${BUILDDIR} -echo "" -echo "$0 Done at `date`" -echo ""