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