[Checkins] SVN: zope.wineggbuilder/trunk/master.cfg take extra care about zc.buildout

[Adam Groszer]

Log message for revision 115988:
  take extra care about zc.buildout

Changed:
  U   zope.wineggbuilder/trunk/master.cfg

-=-
Modified: zope.wineggbuilder/trunk/master.cfg
===================================================================
--- zope.wineggbuilder/trunk/master.cfg	2010-08-28 07:54:15 UTC (rev 115987)
+++ zope.wineggbuilder/trunk/master.cfg	2010-08-28 12:30:35 UTC (rev 115988)
@@ -301,6 +301,9 @@
         for k,v in kw.items():
             setattr(self, k, v)
 
+        self.bits = int(self.name[-2:])
+        self.majorVersion = self.title[7:10]
+
 PLATFORMS = dict(
     py_244_win32 = Platform(
         name='py_244_win32',
@@ -334,6 +337,39 @@
         withcompiler=r'cmd /c c:\Python27_64\setupcompilerandexecute.bat %s'),
 )
 
+CLEAN_PLATFORMS = dict(
+    py_244_win32 = Platform(
+        name='py_244_win32',
+        title='Python 2.4.4 win32',
+        python=r'c:\Python24_32_clean\python.exe',
+        withcompiler=r'cmd /c c:\Python24_32_clean\setupcompilerandexecute.bat %s'),
+    py_254_win32 = Platform(
+        name='py_254_win32',
+        title='Python 2.5.4 win32',
+        python=r'c:\Python25_32_clean\python.exe',
+        withcompiler=r'cmd /c c:\Python25_32_clean\setupcompilerandexecute.bat %s'),
+    py_265_win32 = Platform(
+        name='py_265_win32',
+        title='Python 2.6.5 win32',
+        python=r'c:\Python26_32_clean\python.exe',
+        withcompiler=r'cmd /c c:\Python26_32_clean\setupcompilerandexecute.bat %s'),
+    py_265_win64 = Platform(
+        name='py_265_win64',
+        title='Python 2.6.5 win64',
+        python=r'c:\Python26_64_clean\python.exe',
+        withcompiler=r'cmd /c c:\Python26_64_clean\setupcompilerandexecute.bat %s'),
+    py_270_win32 = Platform(
+        name='py_270_win32',
+        title='Python 2.7.0 win32',
+        python=r'c:\Python27_32_clean\python.exe',
+        withcompiler=r'cmd /c c:\Python27_32_clean\setupcompilerandexecute.bat %s'),
+    py_270_win64 = Platform(
+        name='py_270_win64',
+        title='Python 2.7.0 win64',
+        python=r'c:\Python27_64_clean\python.exe',
+        withcompiler=r'cmd /c c:\Python27_64_clean\setupcompilerandexecute.bat %s'),
+)
+
 # platform definitions
 ######################################
 
@@ -508,6 +544,14 @@
 ######################################
 # zc.buildout
 
+def get_same_platforms(bits, platforms, exclude):
+    data = []
+    for platform in platforms.values():
+        if platform.bits == bits and platform.name != exclude:
+            data.append("set PYTHON%s=%s" % (
+                platform.majorVersion, platform.python))
+    return data
+
 def zc_buildout_dev_builder(name, slavename, platform, locks):
     builddir = name.replace(' ', '_')
     f = factory.BuildFactory()
@@ -539,6 +583,10 @@
     #          name="buildout",
     #          description="buildout",
     #          timeout=3600))
+    #others = get_same_platforms(platform.bits, CLEAN_PLATFORMS, platform.name)
+    #others.append(r"bin\test.exe --exit-with-status -1")
+    #cmd = ' && '.join(others)
+
     cmd = r"bin\test.exe --exit-with-status -1"
     f.addStep(Test(
               #command=[r"bin\test.exe", "--exit-with-status", "-1"],
@@ -556,8 +604,8 @@
     #hour = 02
     #minute = 20
     builders = []
-    for pname in sorted(PLATFORMS.keys()):
-        platform = PLATFORMS[pname]
+    for pname in sorted(CLEAN_PLATFORMS.keys()):
+        platform = CLEAN_PLATFORMS[pname]
         name = "zc_buildout_dev %s" % platform.name
         builders.append(name)
         c['builders'].append(
@@ -567,14 +615,14 @@
             Nightly( "%s_nightly" % name, [name], hour=hour, minute=minute))
         minute += 1
 
-    #c['status'].append(
-    #  MailNotifier(mode="all",
-    #           fromaddr=FROMADDR,
-    #           extraRecipients=["zope-tests at zope.org"],
-    #           sendToInterestedUsers=False,
-    #           builders=builders,
-    #           messageFormatter=message_formatter)
-    #           )
+    c['status'].append(
+      MailNotifier(mode="all",
+               fromaddr=FROMADDR,
+               extraRecipients=["zope-tests at zope.org"],
+               sendToInterestedUsers=False,
+               builders=builders,
+               messageFormatter=message_formatter)
+               )
 
 
 # zc.buildout