Merge branch 'windows_service_fix' of git://github.com/Ratio2/buildbot

buildbot · Mar 16, 2013 · 525f82a · 525f82a
2 parents 1343114 + 986bfee
commit 525f82a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/master/contrib/windows/buildbot_service.py b/master/contrib/windows/buildbot_service.py
@@ -143,6 +143,9 @@ def _checkConfig(self):
             if not os.path.isfile(python_exe):
                 # for ppl who build Python itself from source.
                 python_exe = os.path.join(sys.prefix, "PCBuild", "python.exe")
+            if not os.path.isfile(python_exe):
+                # virtualenv support
+                python_exe = os.path.join(sys.prefix, "Scripts", "python.exe")
             if not os.path.isfile(python_exe):
                 self.error("Can not find python.exe to spawn subprocess")
                 return False
@@ -226,7 +229,7 @@ def SvcDoRun(self):
             self.info("Starting BuildBot in directory '%s'" % (bbdir, ))
             hstop = self.hWaitStop
 
-            cmd = '%s --spawn %d start %s' % (self.runner_prefix, hstop, bbdir)
+            cmd = '%s --spawn %d start --nodaemon %s' % (self.runner_prefix, hstop, bbdir)
             #print "cmd is", cmd
             h, t, output = self.createProcess(cmd)
             child_infos.append((bbdir, h, t, output))
@@ -545,7 +548,7 @@ def HandleCommandLine():
         # child-process.
         # First arg is the handle to wait on
         # Fourth arg is the config directory to use for the buildbot/slave
-        _RunChild(DetermineRunner(sys.argv[4]))
+        _RunChild(DetermineRunner(sys.argv[5]))
     else:
         win32serviceutil.HandleCommandLine(BBService,
                                            customOptionHandler=CustomInstall)

diff --git a/slave/contrib/windows/buildbot_service.py b/slave/contrib/windows/buildbot_service.py
@@ -143,6 +143,9 @@ def _checkConfig(self):
             if not os.path.isfile(python_exe):
                 # for ppl who build Python itself from source.
                 python_exe = os.path.join(sys.prefix, "PCBuild", "python.exe")
+            if not os.path.isfile(python_exe):
+                # virtualenv support
+                python_exe = os.path.join(sys.prefix, "Scripts", "python.exe")
             if not os.path.isfile(python_exe):
                 self.error("Can not find python.exe to spawn subprocess")
                 return False
@@ -226,7 +229,7 @@ def SvcDoRun(self):
             self.info("Starting BuildBot in directory '%s'" % (bbdir, ))
             hstop = self.hWaitStop
 
-            cmd = '%s --spawn %d start %s' % (self.runner_prefix, hstop, bbdir)
+            cmd = '%s --spawn %d start --nodaemon %s' % (self.runner_prefix, hstop, bbdir)
             #print "cmd is", cmd
             h, t, output = self.createProcess(cmd)
             child_infos.append((bbdir, h, t, output))
@@ -545,7 +548,7 @@ def HandleCommandLine():
         # child-process.
         # First arg is the handle to wait on
         # Fourth arg is the config directory to use for the buildbot/slave
-        _RunChild(DetermineRunner(sys.argv[4]))
+        _RunChild(DetermineRunner(sys.argv[5]))
     else:
         win32serviceutil.HandleCommandLine(BBService,
                                            customOptionHandler=CustomInstall)