From 8c94ca7b1dcef07b3c98ff901173359bca6744c0 Mon Sep 17 00:00:00 2001
From: Dan Savilonis <djs@n-cube.org>
Date: Fri, 25 Jun 2010 22:28:16 -0400
Subject: [PATCH] Install buildslave.bat wrapper for win32

---
 contrib/windows/buildslave.bat | 22 ++++++++++++++++++++++
 slave/setup.py                 |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 contrib/windows/buildslave.bat

diff --git a/contrib/windows/buildslave.bat b/contrib/windows/buildslave.bat
new file mode 100644
index 00000000000..16647863002
--- /dev/null
+++ b/contrib/windows/buildslave.bat
@@ -0,0 +1,22 @@
+@echo off
+REM This file is used to run buildslave when installed into a python installation or deployed in virtualenv
+
+setlocal
+set BB_BUILDSLAVE="%~dp0buildslave" 
+
+IF EXIST "%~dp0..\python.exe" (
+  REM Normal system install of python (buildslave.bat is in scripts dir, just below python.exe)
+  set BB_PYTHON="%~dp0..\python"
+) ELSE IF EXIST "%~dp0python.exe" (
+  REM virtualenv install (buildslave.bat is in same dir as python.exe)
+  set BB_PYTHON="%~dp0python"
+) ELSE (
+  REM Not found nearby. Use system version and hope for the best
+  echo Warning! Unable to find python.exe near buildslave.bat. Using python on PATH, which might be a mismatch.
+  echo.
+  set BB_PYTHON=python
+)
+
+%BB_PYTHON% %BB_BUILDSLAVE% %*
+
+exit /b %ERRORLEVEL%
diff --git a/slave/setup.py b/slave/setup.py
index 999a5c966ab..10c072a1d51 100644
--- a/slave/setup.py
+++ b/slave/setup.py
@@ -18,8 +18,8 @@
 
 scripts = ["bin/buildslave"]
 # TODO: windows stuff??
-#if sys.platform == "win32":
-#    scripts.append("contrib/windows/buildslave.bat")
+if sys.platform == "win32":
+    scripts.append("../contrib/windows/buildslave.bat")
 #    scripts.append("contrib/windows/buildslave_service.py")
 
 setup_args = {