[jbossnative-commits] JBoss Native SVN: r1303 - trunk/build/windows.
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