Author: rhuijben
Date: Thu Nov 19 09:45:37 2015
New Revision: 1715136
URL: http://svn.apache.org/viewvc?rev=1715136&view=rev
Log:
Serf windows bot: Determine architecture dynamically
Modified:
serf/tools/buildbot/windows/serftest-build.cmd
serf/tools/buildbot/windows/serftest-test.cmd
Modified: serf/tools/buildbot/windows/serftest-build.cmd
URL:
http://svn.apache.org/viewvc/serf/tools/buildbot/windows/serftest-build.cmd?rev=1715136&r1=1715135&r2=1715136&view=diff
==============================================================================
--- serf/tools/buildbot/windows/serftest-build.cmd (original)
+++ serf/tools/buildbot/windows/serftest-build.cmd Thu Nov 19 09:45:37 2015
@@ -32,7 +32,14 @@ IF NOT EXIST "%INSTALL%\" MKDIR "%INSTAL
PATH %PATH%;%BB%\deps\release\bin;%BB%\deps\build\scons\scripts
SET PYTHONPATH=%BB%\deps\build\scons\Lib\site-packages\scons
-SET SA=PREFIX=%INSTALL% OPENSSL=%INTDIR% ZLIB=%INTDIR% ZLIB=%INTDIR%
APR=%INTDIR% APU=%INTDIR% SOURCE_LAYOUT=no TARGET_ARCH=win32 MSVC_VERSION=10.0
APR_STATIC=yes
+SET LIB|find /i "\AMD64" > nul:
+IF ERRORLEVEL 1 (
+ SET SERF_ARCH=win32
+) ELSE (
+ SET SERF_ARCH=x64
+)
+
+SET SA=PREFIX=%INSTALL% OPENSSL=%INTDIR% ZLIB=%INTDIR% ZLIB=%INTDIR%
APR=%INTDIR% APU=%INTDIR% SOURCE_LAYOUT=no TARGET_ARCH=%SERF_ARCH%
MSVC_VERSION=10.0 APR_STATIC=yes
echo scons %SA%
CALL scons.bat %SA%
Modified: serf/tools/buildbot/windows/serftest-test.cmd
URL:
http://svn.apache.org/viewvc/serf/tools/buildbot/windows/serftest-test.cmd?rev=1715136&r1=1715135&r2=1715136&view=diff
==============================================================================
--- serf/tools/buildbot/windows/serftest-test.cmd (original)
+++ serf/tools/buildbot/windows/serftest-test.cmd Thu Nov 19 09:45:37 2015
@@ -32,7 +32,14 @@ IF NOT EXIST "%INSTALL%\" MKDIR "%INSTAL
PATH %INTDIR%\bin;%PATH%;%BB%\deps\build\scons\scripts
SET PYTHONPATH=%BB%\deps\build\scons\Lib\site-packages\scons
-SET SA=PREFIX=%INSTALL% OPENSSL=%INTDIR% ZLIB=%INTDIR% ZLIB=%INTDIR%
APR=%INTDIR% APU=%INTDIR% SOURCE_LAYOUT=no TARGET_ARCH=win32 MSVC_VERSION=10.0
APR_STATIC=yes
+SET LIB|find /i "\AMD64" > nul:
+IF ERRORLEVEL 1 (
+ SET SERF_ARCH=win32
+) ELSE (
+ SET SERF_ARCH=x64
+)
+
+SET SA=PREFIX=%INSTALL% OPENSSL=%INTDIR% ZLIB=%INTDIR% ZLIB=%INTDIR%
APR=%INTDIR% APU=%INTDIR% SOURCE_LAYOUT=no TARGET_ARCH=%SERF_ARCH%
MSVC_VERSION=10.0 APR_STATIC=yes
echo scons %SA% DEBUG=yes check
CALL scons.bat %SA% DEBUG=yes check
