[zorg] r229693 - [sanitizer-windows bot] Follow-up to r229537: fix compiler-rt path and CMake invocation

[Timur Iskhodzhanov]

Author: timurrrr
Date: Wed Feb 18 10:19:54 2015
New Revision: 229693

URL: http://llvm.org/viewvc/llvm-project?rev=229693&view=rev
Log:
[sanitizer-windows bot] Follow-up to r229537: fix compiler-rt path and CMake invocation

Modified:
    zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py

Modified: zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py?rev=229693&r1=229692&r2=229693&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py (original)
+++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py Wed Feb 18 10:19:54 2015
@@ -24,7 +24,7 @@ def getSource(f,llvmTopDir='llvm'):
                   mode='update',
                   baseURL='http://llvm.org/svn/llvm-project/compiler-rt/',
                   defaultBranch='trunk',
-                  workdir='%s/tools/compiler-rt' % llvmTopDir))
+                  workdir='%s/projects/compiler-rt' % llvmTopDir))
     return f
 
 def getSanitizerWindowsBuildFactory(
@@ -61,17 +61,12 @@ def getSanitizerWindowsBuildFactory(
                 doStepIf=cleanBuildRequested
                 ))
 
-    f.addStep(ShellCommand(name='cmakegen',
+    f.addStep(ShellCommand(name='cmake',
                            command=[cmake, "-G", "Ninja", "../llvm",
                                     "-DCMAKE_BUILD_TYPE="+config,
                                     "-DLLVM_ENABLE_ASSERTIONS=ON"]
                                    + extra_cmake_args,
-                           workdir=build_dir))
-
-    f.addStep(ShellCommand(name='cmake',
-                           command=['cmakegen.bat'],
                            haltOnFailure=True,
-                           description='cmake gen',
                            workdir=build_dir))
 
     # Build compiler-rt first to speed up detection of Windows-specific