few windows build fixes

This commit is contained in:
Aleksandar Fabijanic 2008-06-30 17:02:20 +00:00
parent 7ad83b7d4d
commit 04f61f101b
2 changed files with 35 additions and 24 deletions

View File

@ -118,7 +118,7 @@ if %RELEASE_STATIC%==1 (echo release_static)
rem root level components rem root level components
for /f %%G in ('findstr /R /V "./." components') do ( for /f %%G in ('findstr /R /V "./." components') do (
if exist %%G ( if exist %%G\%%G_%VS_VERSION%.sln (
cd %%G cd %%G
echo. echo.
echo ========== Building %%G ========== echo ========== Building %%G ==========
@ -135,13 +135,15 @@ for /f %%G in ('findstr /R "./." components') do (
if exist %%G ( if exist %%G (
cd %%G cd %%G
for /f "tokens=1,2 delims=/" %%Q in ("%%G") do ( for /f "tokens=1,2 delims=/" %%Q in ("%%G") do (
if exist %%R_%VS_VERSION%.sln (
echo. echo.
echo ========== Building %%R ========== echo ========== Building %%G ==========
if %DEBUG_SHARED%==1 (devenv /useenv /%ACTION% debug_shared %%R_%VS_VERSION%.sln) if %DEBUG_SHARED%==1 (devenv /useenv /%ACTION% debug_shared %%R_%VS_VERSION%.sln)
if %RELEASE_SHARED%==1 (devenv /useenv /%ACTION% release_shared %%R_%VS_VERSION%.sln) if %RELEASE_SHARED%==1 (devenv /useenv /%ACTION% release_shared %%R_%VS_VERSION%.sln)
if %DEBUG_STATIC%==1 (devenv /useenv /%ACTION% debug_static %%R_%VS_VERSION%.sln) if %DEBUG_STATIC%==1 (devenv /useenv /%ACTION% debug_static %%R_%VS_VERSION%.sln)
if %RELEASE_STATIC%==1 (devenv /useenv /%ACTION% release_static %%R_%VS_VERSION%.sln) if %RELEASE_STATIC%==1 (devenv /useenv /%ACTION% release_static %%R_%VS_VERSION%.sln)
) )
)
cd %POCOBASE% cd %POCOBASE%
) )
) )
@ -151,8 +153,8 @@ if "%SAMPLES%"=="no" goto :EOF
rem root level component samples rem root level component samples
for /f %%G in ('findstr /R /V "./." components') do ( for /f %%G in ('findstr /R /V "./." components') do (
if exist %%G/samples ( if exist %%G\samples\samples_%VS_VERSION%.sln (
cd %%G/samples cd %%G\samples
echo. echo.
echo ========== Building %%G/samples ========== echo ========== Building %%G/samples ==========
if %DEBUG_SHARED%==1 devenv /useenv /%ACTION% debug_shared samples_%VS_VERSION%.sln if %DEBUG_SHARED%==1 devenv /useenv /%ACTION% debug_shared samples_%VS_VERSION%.sln
@ -165,8 +167,8 @@ for /f %%G in ('findstr /R /V "./." components') do (
rem lower level component samples rem lower level component samples
for /f %%G in ('findstr /R "./." components') do ( for /f %%G in ('findstr /R "./." components') do (
if exist %%G/samples ( if exist %%G\samples\samples_%VS_VERSION%.sln (
cd %%G/samples cd %%G\samples
echo. echo.
echo ========== Building %%G/samples ========== echo ========== Building %%G/samples ==========
if %DEBUG_SHARED%==1 devenv /useenv /%ACTION% debug_shared samples_%VS_VERSION%.sln if %DEBUG_SHARED%==1 devenv /useenv /%ACTION% debug_shared samples_%VS_VERSION%.sln

21
dist/buildwin.cmd vendored
View File

@ -110,9 +110,15 @@ set DEBUG_SHARED=1
set RELEASE_STATIC=1 set RELEASE_STATIC=1
set RELEASE_SHARED=1))))) set RELEASE_SHARED=1)))))
echo Building:
if %DEBUG_SHARED%==1 (echo debug_shared)
if %RELEASE_SHARED%==1 (echo release_shared)
if %DEBUG_STATIC%==1 (echo debug_static)
if %RELEASE_STATIC%==1 (echo release_static)
rem root level components rem root level components
for /f %%G in ('findstr /R /V "./." components') do ( for /f %%G in ('findstr /R /V "./." components') do (
if exist %%G ( if exist %%G\%%G_%VS_VERSION%.sln (
cd %%G cd %%G
echo. echo.
echo ========== Building %%G ========== echo ========== Building %%G ==========
@ -129,23 +135,26 @@ for /f %%G in ('findstr /R "./." components') do (
if exist %%G ( if exist %%G (
cd %%G cd %%G
for /f "tokens=1,2 delims=/" %%Q in ("%%G") do ( for /f "tokens=1,2 delims=/" %%Q in ("%%G") do (
if exist %%R_%VS_VERSION%.sln (
echo. echo.
echo ========== Building %%R ========== echo ========== Building %%G ==========
if %DEBUG_SHARED%==1 (devenv /useenv /%ACTION% debug_shared %%R_%VS_VERSION%.sln) if %DEBUG_SHARED%==1 (devenv /useenv /%ACTION% debug_shared %%R_%VS_VERSION%.sln)
if %RELEASE_SHARED%==1 (devenv /useenv /%ACTION% release_shared %%R_%VS_VERSION%.sln) if %RELEASE_SHARED%==1 (devenv /useenv /%ACTION% release_shared %%R_%VS_VERSION%.sln)
if %DEBUG_STATIC%==1 (devenv /useenv /%ACTION% debug_static %%R_%VS_VERSION%.sln) if %DEBUG_STATIC%==1 (devenv /useenv /%ACTION% debug_static %%R_%VS_VERSION%.sln)
if %RELEASE_STATIC%==1 (devenv /useenv /%ACTION% release_static %%R_%VS_VERSION%.sln) if %RELEASE_STATIC%==1 (devenv /useenv /%ACTION% release_static %%R_%VS_VERSION%.sln)
) )
)
cd %POCOBASE% cd %POCOBASE%
) )
) )
if "%SAMPLES%"=="no" goto :EOF if "%SAMPLES%"=="no" goto :EOF
rem root level component samples rem root level component samples
for /f %%G in ('findstr /R /V "./." components') do ( for /f %%G in ('findstr /R /V "./." components') do (
if exist %%G/samples ( if exist %%G\samples\samples_%VS_VERSION%.sln (
cd %%G/samples cd %%G\samples
echo. echo.
echo ========== Building %%G/samples ========== echo ========== Building %%G/samples ==========
if %DEBUG_SHARED%==1 devenv /useenv /%ACTION% debug_shared samples_%VS_VERSION%.sln if %DEBUG_SHARED%==1 devenv /useenv /%ACTION% debug_shared samples_%VS_VERSION%.sln
@ -158,8 +167,8 @@ for /f %%G in ('findstr /R /V "./." components') do (
rem lower level component samples rem lower level component samples
for /f %%G in ('findstr /R "./." components') do ( for /f %%G in ('findstr /R "./." components') do (
if exist %%G/samples ( if exist %%G\samples\samples_%VS_VERSION%.sln (
cd %%G/samples cd %%G\samples
echo. echo.
echo ========== Building %%G/samples ========== echo ========== Building %%G/samples ==========
if %DEBUG_SHARED%==1 devenv /useenv /%ACTION% debug_shared samples_%VS_VERSION%.sln if %DEBUG_SHARED%==1 devenv /useenv /%ACTION% debug_shared samples_%VS_VERSION%.sln