9:55 a.m.
Author: jfrederic.clere(a)jboss.com
Date: 2013-01-11 03:55:48 -0500 (Fri, 11 Jan 2013)
New Revision: 2983
Added:
trunk/build/windows/buildnew.bat
Modified:
trunk/build/daemon/buildnat.bat
Log:
Use the new build:
'c:\cmsc\setenv.bat /x86' or 'c:\cmsc\setenv.bat /x64'
Modified: trunk/build/daemon/buildnat.bat
===================================================================
--- trunk/build/daemon/buildnat.bat 2013-01-11 07:54:20 UTC (rev 2982)
+++ trunk/build/daemon/buildnat.bat 2013-01-11 08:55:48 UTC (rev 2983)
@@ -47,9 +47,9 @@
pushd %BUILD_HOME%\windows
REM static dll tcnative-1.dll
-call build.bat sdk static x86 jboss-native -ssl -cache -static
-call build.bat sdk static x64 jboss-native -ssl -cache -static
-call build.bat sdk static i64 jboss-native -ssl -cache -static
+call buildnew.bat sdk static x86 jboss-native -ssl -cache -static
+call buildnew.bat sdk static x64 jboss-native -ssl -cache -static
+REM call build.bat sdk static i64 jboss-native -ssl -cache -static
REM Uncomment for building sight
REM call build.bat sdk x86 jboss-sight -cache
REM call build.bat sdk x64 jboss-sight -cache
Added: trunk/build/windows/buildnew.bat
===================================================================
--- trunk/build/windows/buildnew.bat (rev 0)
+++ trunk/build/windows/buildnew.bat 2013-01-11 08:55:48 UTC (rev 2983)
@@ -0,0 +1,158 @@
+@echo off
+REM Copyright(c) 2013 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 @author Jean-Frederic Clere
+REM
+
+
+@if not "%ECHO%" == "" echo %ECHO%
+@if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+set "DIRNAME=%~dp0%"
+set "PROGNAME=%~nx0%"
+) else (
+echo Detected uncompatible Windows version.
+goto cmdEnd
+)
+
+set LOCAL_DIR=%CD%
+pushd %DIRNAME%..
+set BUILD_HOME=%CD%
+popd
+
+echo.
+echo Running : %PROGNAME% $LastChangedDate: 2009-01-22 12:01:27 +0100 (Thu, 22 Jan 2009)
$
+echo.
+echo Started : %DATE% %TIME%
+echo Params : %*
+echo.
+
+set ENV_BAT=%BUILD_HOME%\env.%1.%2.bat
+echo Writting conf in %ENV_BAT%
+echo REM Generated by %PROGNAME% %DATE% %TIME% > %ENV_BAT%
+echo REM Params : %* >> %ENV_BAT%
+
+REM Check for cygwin in the PATH
+@if "%CYGWIN_INSTALL_DIR%" == "" (
+ set CYGWIN_INSTALL_DIR=C:\cygwin
+ echo set CYGWIN_INSTALL_DIR=C:\cygwin >> %ENV_BAT%
+)
+@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%
+echo set PATH=%CYGWIN_INSTALL_DIR%\bin;%PATH% >> %ENV_BAT%
+
+REM Then for an acceptable location.
+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
+)
+
+set BUILD_OS=windows
+set CRT_REDIST=
+set USE_PLATFORM_SDK=
+set APR_DECLARE_STATIC=
+set INCLUDE_PRE64PRA=
+set INCLUDE_BUFFEROVERFLOWU=
+
+echo set BUILD_OS=windows >> %ENV_BAT%
+echo set CRT_REDIST= >> %ENV_BAT%
+echo set USE_PLATFORM_SDK= >> %ENV_BAT%
+echo set APR_DECLARE_STATIC= >> %ENV_BAT%
+echo set INCLUDE_PRE64PRA= >> %ENV_BAT%
+echo set INCLUDE_BUFFEROVERFLOWU= >> %ENV_BAT%
+
+@if not "%1" == "sdk" goto checkSTATIC
+shift
+set USE_PLATFORM_SDK=1
+echo set USE_PLATFORM_SDK=1 >> %ENV_BAT%
+
+:checkSTATIC
+@if /i "%1" == "static" goto makeSTATIC
+goto checkCPU
+
+:makeSTATIC
+shift
+set APR_DECLARE_STATIC=1
+echo set APR_DECLARE_STATIC=1 >> %ENV_BAT%
+
+:checkCPU
+set BUILD_CPU=%1
+echo set BUILD_CPU=%1 >> %ENV_BAT%
+shift
+@if /i "%BUILD_CPU%" == "i686" goto cpuX86
+@if /i "%BUILD_CPU%" == "x86" goto cpuX86
+@if /i "%BUILD_CPU%" == "amd64" goto cpuX64
+@if /i "%BUILD_CPU%" == "emt64" goto cpuX64
+@if /i "%BUILD_CPU%" == "x86_64" goto cpuX64
+@if /i "%BUILD_CPU%" == "x64" goto cpuX64
+echo Usage: %PROGNAME% CPU where CPU is x86 x64 or ia64
+echo or : %PROGNAME% sdk CPU if you are cross compiling
+goto cmdEnd
+
+:cpuX86
+set BUILD_CPU=x86
+echo set BUILD_CPU=x86 >> %ENV_BAT%
+call "c:\cmsc\setenv.bat" /x86
+echo call "c:\cmsc\setenv.bat" /x86 >> %ENV_BAT%
+goto cmdBuild
+
+:cpuX64
+set BUILD_CPU=x64
+echo set BUILD_CPU=x64 >> %ENV_BAT%
+call "c:\cmsc\setenv.bat" /x64
+echo call "c:\cmsc\setenv.bat" /x64 >> %ENV_BAT%
+goto cmdBuild
+
+:cmdBuild
+@for /D %%i IN (%INCLUDE%) DO (
+ @if exist "%%i\PRE64PRA.H" (
+ set INCLUDE_PRE64PRA=1
+ echo set INCLUDE_PRE64PRA=1 >> %ENV_BAT%
+ )
+)
+
+@for /D %%i IN (%LIB%) DO (
+ @if exist "%%i\bufferoverflowu.lib" (
+ set INCLUDE_BUFFEROVERFLOWU=1
+ echo set INCLUDE_BUFFEROVERFLOWU=1 >> %ENV_BAT%
+ )
+)
+
+set INIT=%LOCAL_DIR%
+echo set INIT=%LOCAL_DIR% >> %ENV_BAT%
+pushd %BUILD_HOME%\unix
+bash build.sh %1 %2 %3 %4 %5
+@if ERRORLEVEL 1 (
+ echo build.sh failed
+ popd
+ EXIT 1
+)
+popd
+
+:cmdEnd