Author: mladen.turk(a)jboss.com Date: 2008-01-29 13:39:37 -0500 (Tue, 29 Jan 2008) New Revision: 1309 Removed: trunk/build/windows/cut_path.sh Modified: trunk/build/windows/build.bat Log: Use /D option instead cut_path.sh Modified: trunk/build/windows/build.bat =================================================================== --- trunk/build/windows/build.bat 2008-01-29 15:27:45 UTC (rev 1308) +++ trunk/build/windows/build.bat 2008-01-29 18:39:37 UTC (rev 1309) @@ -22,23 +22,7 @@ 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 -echo Install the source in another location c:\home\my for example -goto cmdEnd -) - @if not "%ECHO%" == "" echo %ECHO% @if "%OS%" == "Windows_NT" setlocal @@ -62,28 +46,41 @@ echo Params : %* echo. +REM Check for cygwin in the PATH +@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 + echo Install the source in another location c:\home\my for example + goto cmdEnd +) + @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% -goto cmdEnd + 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% + goto cmdEnd -:cmdSetTools -@echo Using Tools from %TOOLS_ROOT% -set MSVS8VC=%TOOLS_ROOT%\MSVS8\VC -set MSVS6VC=%TOOLS_ROOT%\MSVS6 -set MSWPSDK=%TOOLS_ROOT%\PSDK6 + :cmdSetTools + @echo Using Tools from %TOOLS_ROOT% + 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%" - +set BUILD_OS=windows set CRT_REDIST= set USE_PLATFORM_SDK= set APR_DECLARE_STATIC= @@ -97,6 +94,7 @@ :checkSTATIC @if /i "%1" == "static" goto makeSTATIC goto checkCPU + :makeSTATIC shift set APR_DECLARE_STATIC=1 @@ -140,18 +138,11 @@ goto cmdBuild :cmdBuild - -echo %INCLUDE% > cut_path.dat -bash cut_path.sh -call cut_path.bat -@for %%i IN (%cut_path%) DO ( +@for /D %%i IN (%INCLUDE%) DO ( @if exist "%%i\PRE64PRA.H" set INCLUDE_PRE64PRA=1 ) -echo %LIB% > cut_path.dat -bash cut_path.sh -call cut_path.bat -@for %%i IN (%cut_path%) DO ( +@for /D %%i IN (%LIB%) DO ( @if exist "%%i\bufferoverflowu.lib" set INCLUDE_BUFFEROVERFLOWU=1 ) Deleted: trunk/build/windows/cut_path.sh =================================================================== --- trunk/build/windows/cut_path.sh 2008-01-29 15:27:45 UTC (rev 1308) +++ trunk/build/windows/cut_path.sh 2008-01-29 18:39:37 UTC (rev 1309) @@ -1,35 +0,0 @@ -#!/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