January 2008 - jbossnative-commits

JBoss Native SVN: r1308 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-01-29 10:27:45 -0500 (Tue, 29 Jan 2008) New Revision: 1308 Added: trunk/build/windows/cut_path.sh Modified: trunk/build/windows/build.bat Log: Improve the detection of bufferoverflowu.lib. Modified: trunk/build/windows/build.bat =================================================================== --- trunk/build/windows/build.bat 2008-01-28 17:32:15 UTC (rev 1307) +++ trunk/build/windows/build.bat 2008-01-29 15:27:45 UTC (rev 1308) @@ -141,11 +141,17 @@ :cmdBuild -@for /F %%i IN ('echo %INCLUDE%') DO ( +echo %INCLUDE% > cut_path.dat +bash cut_path.sh +call cut_path.bat +@for %%i IN (%cut_path%) DO ( @if exist "%%i\PRE64PRA.H" set INCLUDE_PRE64PRA=1 ) -@for /F %%i IN ('echo %LIB%') DO ( +echo %LIB% > cut_path.dat +bash cut_path.sh +call cut_path.bat +@for %%i IN (%cut_path%) DO ( @if exist "%%i\bufferoverflowu.lib" set INCLUDE_BUFFEROVERFLOWU=1 ) Added: trunk/build/windows/cut_path.sh =================================================================== --- trunk/build/windows/cut_path.sh (rev 0) +++ trunk/build/windows/cut_path.sh 2008-01-29 15:27:45 UTC (rev 1308) @@ -0,0 +1,35 @@ +#!/bin/sh +# Copyright(c) 2008 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 Jean-Frederic Clere +# + +# +# Helper to cut a windoze path like value in the "" list. +c="" +for a in `cat cut_path.dat | sed 's: :|:g' | sed 's:;: :g'` +do + b=`echo $a | sed 's:|: :g'` + echo $b + c=${c}`echo "\"$b\" "` +done +echo "set cut_path=$c" > cut_path.bat +chmod a+x cut_path.bat

16 years, 11 months

3
2
0 / 0

JBoss Native SVN: r1307 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-01-28 12:32:15 -0500 (Mon, 28 Jan 2008) New Revision: 1307 Modified: trunk/build/windows/build.bat Log: Arrange the ordre of the logic. Add a hint for the sdk parameter (doesn't help because rc.exe from the sdk package is a 64 bit utility). Modified: trunk/build/windows/build.bat =================================================================== --- trunk/build/windows/build.bat 2008-01-28 14:31:44 UTC (rev 1306) +++ trunk/build/windows/build.bat 2008-01-28 17:32:15 UTC (rev 1307) @@ -22,6 +22,16 @@ REM @author Mladen Turk REM +REM First check for cygwin. +@if "%CYGWIN_INSTALL_DIR%" == "" set CYGWIN_INSTALL_DIR=C:\cygwin +@if exist "%CYGWIN_INSTALL_DIR%\" goto cmdFoundCygwin +echo CYGWIN_INSTALL_DIR points to invalid directory %CYGWIN_INSTALL_DIR% +goto cmdEnd + +:cmdFoundCygwin +set PATH=%CYGWIN_INSTALL_DIR%\bin;%PATH% + +REM Then for an acceptable location. bash check_path.sh @if ERRORLEVEL 1 ( echo Can't run inside cygwin install path @@ -74,14 +84,6 @@ echo "MSVS6VC: %MSVS6VC%" echo "MSWPSDK: %MSWPSDK%" -@if "%CYGWIN_INSTALL_DIR%" == "" set CYGWIN_INSTALL_DIR=C:\cygwin -@if exist "%CYGWIN_INSTALL_DIR%\" goto cmdFoundCygwin -echo CYGWIN_INSTALL_DIR points to invalid directory %CYGWIN_INSTALL_DIR% -goto cmdEnd - -:cmdFoundCygwin -set PATH=%CYGWIN_INSTALL_DIR%\bin;%PATH% - set CRT_REDIST= set USE_PLATFORM_SDK= set APR_DECLARE_STATIC= @@ -106,6 +108,7 @@ @if /i "%BUILD_CPU%" == "amd64" goto cpuAMD64 @if /i "%BUILD_CPU%" == "ia64" goto cpuIA64 echo Usage: %PROGNAME% CPU where CPU is i686 amd64 or ia64 +echo or : %PROGNAME% sdk CPU if you are cross compiling goto cmdEnd :cpuX86

16 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-01-28 09:31:44 -0500 (Mon, 28 Jan 2008) New Revision: 1306 Modified: trunk/build/unix/buildbin.jboss-native.windows.sh Log: Allow spaces in the location name (default m$ visual C location). Modified: trunk/build/unix/buildbin.jboss-native.windows.sh =================================================================== --- trunk/build/unix/buildbin.jboss-native.windows.sh 2008-01-28 13:35:40 UTC (rev 1305) +++ trunk/build/unix/buildbin.jboss-native.windows.sh 2008-01-28 14:31:44 UTC (rev 1306) @@ -92,6 +92,6 @@ cp ${prefix_loc}/bin/jboss*.* ${output_loc}/bin 2>/dev/null if [ -n "${CRT_REDIST}" ] ; then - crt_redist_loc=`cygpath -u ${CRT_REDIST}` - cp `cygpath -u ${CRT_REDIST}`/*.dll ${output_loc}/bin/native + crt_redist_loc=`cygpath -u "${CRT_REDIST}"` + cp "${crt_redist_loc}"/*.dll ${output_loc}/bin/native fi

16 years, 11 months

1
0
0 / 0

JBoss Native SVN: r1305 - trunk/build.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-01-28 08:35:40 -0500 (Mon, 28 Jan 2008) New Revision: 1305 Modified: trunk/build/NMAKEcommon.inc Log: Add MT is not defined or empty. Modified: trunk/build/NMAKEcommon.inc =================================================================== --- trunk/build/NMAKEcommon.inc 2008-01-28 10:10:08 UTC (rev 1304) +++ trunk/build/NMAKEcommon.inc 2008-01-28 13:35:40 UTC (rev 1305) @@ -67,6 +67,10 @@ RC = rc.exe !ENDIF +!IF !DEFINED(MT) || "$(MT)" == "" +MT = mt.exe +!ENDIF + # Read the PROCESSOR_ARCHITECTURE environment value for a CPU type !IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" == "x86" || "$(BUILD_CPU)" == "i686"

16 years, 11 months

1
0
0 / 0

JBoss Native SVN: r1304 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-01-28 05:10:08 -0500 (Mon, 28 Jan 2008) New Revision: 1304 Added: trunk/build/windows/check_path.sh Modified: trunk/build/windows/build.bat Log: Prevent running the script inside cygwin install path... It would failed. Modified: trunk/build/windows/build.bat =================================================================== --- trunk/build/windows/build.bat 2008-01-25 15:38:23 UTC (rev 1303) +++ trunk/build/windows/build.bat 2008-01-28 10:10:08 UTC (rev 1304) @@ -22,6 +22,13 @@ REM @author Mladen Turk REM +bash check_path.sh +@if ERRORLEVEL 1 ( +echo Can't run inside cygwin install path +echo Install the source in another location c:\home\my for example +goto cmdEnd +) + @if not "%ECHO%" == "" echo %ECHO% @if "%OS%" == "Windows_NT" setlocal Added: trunk/build/windows/check_path.sh =================================================================== --- trunk/build/windows/check_path.sh (rev 0) +++ trunk/build/windows/check_path.sh 2008-01-28 10:10:08 UTC (rev 1304) @@ -0,0 +1,19 @@ +mountpoint=$CYGDRIVE_MOUNT +if test -z "$mountpoint"; then + mountpoint=`mount -p | tail -1 | awk ' { print $1 } '` + if test -z "$mountpoint"; then + print "Cannot determine cygwin mount points. Exiting" + exit 1 + fi +fi +localdir=`pwd` +case ${localdir} in + ${mountpoint}*) + exit 0 + ;; + *) + echo "cygwin is ${mountpoint} and we are in ${localdir}" + exit 1 + ;; +esac +exit 0

16 years, 11 months

1
0
0 / 0

JBoss Native SVN: r1303 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-01-25 10:38:23 -0500 (Fri, 25 Jan 2008) New Revision: 1303 Modified: trunk/build/windows/build.bat Log: Allow spaces in the path and local configuration file. Modified: trunk/build/windows/build.bat =================================================================== --- trunk/build/windows/build.bat 2008-01-25 14:15:00 UTC (rev 1302) +++ trunk/build/windows/build.bat 2008-01-25 15:38:23 UTC (rev 1303) @@ -33,6 +33,7 @@ goto cmdEnd ) +set LOCAL_DIR=%CD% pushd %DIRNAME%.. set BUILD_HOME=%CD% popd @@ -44,6 +45,11 @@ echo Params : %* echo. +@if exist "%LOCAL_DIR%\conf.%COMPUTERNAME%.bat" ( + echo "Using %COMPUTERNAME% specific configuration" + call "%LOCAL_DIR%\conf.%COMPUTERNAME%" +) else ( +echo "Using default configuration" @if "%TOOLS_ROOT%" == "" set TOOLS_ROOT=C:\opt @if exist "%TOOLS_ROOT%\" goto cmdSetTools echo TOOLS_ROOT points to invalid directory %TOOLS_ROOT% @@ -54,8 +60,13 @@ set MSVS8VC=%TOOLS_ROOT%\MSVS8\VC set MSVS6VC=%TOOLS_ROOT%\MSVS6 set MSWPSDK=%TOOLS_ROOT%\PSDK6 +) set BUILD_OS=windows +echo "MSVS8VC: %MSVS8VC%" +echo "MSVS6VC: %MSVS6VC%" +echo "MSWPSDK: %MSWPSDK%" + @if "%CYGWIN_INSTALL_DIR%" == "" set CYGWIN_INSTALL_DIR=C:\cygwin @if exist "%CYGWIN_INSTALL_DIR%\" goto cmdFoundCygwin echo CYGWIN_INSTALL_DIR points to invalid directory %CYGWIN_INSTALL_DIR% @@ -92,28 +103,28 @@ :cpuX86 @if "%USE_PLATFORM_SDK%" == "1" ( - call %MSVS6VC%\vs6vars + call "%MSVS6VC%\vs6vars" ) else ( - call %MSVS8VC%\bin\vcvars32 + call "%MSVS8VC%\bin\vcvars32" set CRT_REDIST=%MSVS8VC%\redist\x86\Microsoft.VC80.CRT ) goto cmdBuild :cpuAMD64 @if "%USE_PLATFORM_SDK%" == "1" ( - call %MSWPSDK%\SetEnv /X64 /RETAIL + call "%MSWPSDK%\SetEnv" /X64 /RETAIL ) else ( - call %MSVS8VC%\bin\amd64\vcvarsamd64 + call "%MSVS8VC%\bin\amd64\vcvarsamd64" set CRT_REDIST=%MSVS8VC%\redist\amd64\Microsoft.VC80.CRT ) goto cmdBuild :cpuIA64 @if "%USE_PLATFORM_SDK%" == "1" ( - call %MSWPSDK%\SetEnv /SRV64 /RETAIL + call "%MSWPSDK%\SetEnv" /SRV64 /RETAIL ) else ( REM Update to correct IA64 paths - call %MSVS8VC%\bin\amd64\vcvarsamd64 + call "%MSVS8VC%\bin\amd64\vcvarsamd64" set CRT_REDIST=%MSVS8VC%\redist\amd64\Microsoft.VC80.CRT ) goto cmdBuild

16 years, 11 months

1
0
0 / 0

JBoss Native SVN: r1302 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-01-25 09:15:00 -0500 (Fri, 25 Jan 2008) New Revision: 1302 Added: trunk/build/windows/conf.bat Log: Add a configuration file. Added: trunk/build/windows/conf.bat =================================================================== --- trunk/build/windows/conf.bat (rev 0) +++ trunk/build/windows/conf.bat 2008-01-25 14:15:00 UTC (rev 1302) @@ -0,0 +1,28 @@ +@echo off +REM Copyright(c) 2008 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 Jean-Frederic Clere +REM + +set TOOLS_ROOT=C:\opt +set MSVS8VC=%TOOLS_ROOT%\MSVS8\VC +set MSVS6VC=%TOOLS_ROOT%\MSVS6 +set MSWPSDK=%TOOLS_ROOT%\PSDK6

16 years, 11 months

1
0
0 / 0

JBoss Native SVN: r1301 - trunk/build.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-01-25 05:39:28 -0500 (Fri, 25 Jan 2008) New Revision: 1301 Modified: trunk/build/NMAKEcommon.inc Log: Fix environment var for setting CPU Modified: trunk/build/NMAKEcommon.inc =================================================================== --- trunk/build/NMAKEcommon.inc 2008-01-24 14:15:20 UTC (rev 1300) +++ trunk/build/NMAKEcommon.inc 2008-01-25 10:39:28 UTC (rev 1301) @@ -69,13 +69,13 @@ # Read the PROCESSOR_ARCHITECTURE environment value for a CPU type -!IF "$(BUILDCPU)" == "i386" || "$(BUILDCPU)" == "x86" || "$(BUILDCPU)" == "i686" +!IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" == "x86" || "$(BUILD_CPU)" == "i686" CPU=I386 !ENDIF -!IF "$(BUILDCPU)" == "amd64" || "$(BUILDCPU)" == "x86_64" +!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" CPU=AMD64 !ENDIF -!IF "$(BUILDCPU)" == "ia64" +!IF "$(BUILD_CPU)" == "ia64" CPU=IA64 !ENDIF

16 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-01-24 09:15:20 -0500 (Thu, 24 Jan 2008) New Revision: 1300 Modified: trunk/build/unix/buildsrc.jboss-native.sh Log: Test return code of svn... Modified: trunk/build/unix/buildsrc.jboss-native.sh =================================================================== --- trunk/build/unix/buildsrc.jboss-native.sh 2008-01-24 12:19:06 UTC (rev 1299) +++ trunk/build/unix/buildsrc.jboss-native.sh 2008-01-24 14:15:20 UTC (rev 1300) @@ -47,6 +47,10 @@ native_svn=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/$... fi svn export --native-eol=${NATIVEEOL} ${native_tag_opt} ${native_svn}/jni/native ${native_dist}/srclib/tomcat-native-${native_ext} +if [ $? -ne 0 ]; then + echo "svn export ${native_tag_opt} failed" + exit 1 +fi # Generate configure. apr_sources=${native_dist}/srclib/`ls ${native_dist}/srclib | grep apr-1`

16 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-01-24 07:19:06 -0500 (Thu, 24 Jan 2008) New Revision: 1299 Modified: trunk/build/unix/package.list Log: Commit to run the production of the binaries. Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2008-01-23 13:38:36 UTC (rev 1298) +++ trunk/build/unix/package.list 2008-01-24 12:19:06 UTC (rev 1299) @@ -2,8 +2,8 @@ # add new versions of package after existing ones. jboss-native|2.0.1|TOMCAT_NATIVE_1_1_11|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3 jboss-native|2.0.2|TOMCAT_NATIVE_1_1_11|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3 -jboss-native|2.0.3|TOMCAT_NATIVE_1_1_11|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3 jboss-native|2.0.3-dev|trunk|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3 +jboss-native|2.0.3|TOMCAT_NATIVE_1_1_12|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3 # SIGHT jboss-sight|1.0.0|trunk|1.2.9|1.2.8|1.2.1 jboss-sight|1.0.1|trunk|1.2.8|1.2.8|1.2.1

16 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 2008