[Checkins] SVN: Sandbox/adamg/zope.wineggbuilder/trunk/src/zope/wineggbuilder/ I was wrong, sectionName!=packageName

[Adam Groszer]

Log message for revision 113400:
  I was wrong, sectionName!=packageName

Changed:
  U   Sandbox/adamg/zope.wineggbuilder/trunk/src/zope/wineggbuilder/build.py
  U   Sandbox/adamg/zope.wineggbuilder/trunk/src/zope/wineggbuilder/test.ini

-=-
Modified: Sandbox/adamg/zope.wineggbuilder/trunk/src/zope/wineggbuilder/build.py
===================================================================
--- Sandbox/adamg/zope.wineggbuilder/trunk/src/zope/wineggbuilder/build.py	2010-06-12 18:27:02 UTC (rev 113399)
+++ Sandbox/adamg/zope.wineggbuilder/trunk/src/zope/wineggbuilder/build.py	2010-06-13 08:01:34 UTC (rev 113400)
@@ -116,20 +116,23 @@
     urlGetterKlass = base.URLGetter
     svnKlass = base.SVN
 
-    def __init__(self, name, config, options, compilers):
-        self.name = name
+    def __init__(self, sectionName, config, options, compilers):
+        self.sectionNameName = sectionName
         self.options = options
-        self.read(config, compilers)
+        self.read(sectionName, config, compilers)
 
-    def read(self, config, compilers):
-        self.pypiurl = config.get(self.name, 'pypiurl')
-        self.tagurl = config.get(self.name, 'tagurl')
+    def read(self, sectionName, config, compilers):
+        self.name = config.get(sectionName, 'package')
+        self.pypiurl = getOption(config, sectionName, 'pypiurl',
+                                 'http://pypi.python.org/simple/%s/' % self.name)
+        self.tagurl = getOption(config, sectionName, 'tagurl',
+                                'svn://svn.zope.org/repos/main/%s/tags' % self.name)
         if self.tagurl.endswith('/'):
             self.tagurl = self.tagurl[:-1]
-        self.minVersion = getOption(config, self.name, 'minVersion')
-        self.maxVersion = getOption(config, self.name, 'maxVersion')
+        self.minVersion = getOption(config, sectionName, 'minVersion')
+        self.maxVersion = getOption(config, sectionName, 'maxVersion')
         self.targets = []
-        for target in config.get(self.name, 'targets').split():
+        for target in config.get(sectionName, 'targets').split():
             self.targets.append(compilers[target])
 
     def build(self):
@@ -209,9 +212,15 @@
             self.compilers[cmp] = Compiler(cmp, config, options)
 
         self.packages = []
-        for pkg in config.get(base.BUILD_SECTION, 'packages').split():
-            self.packages.append(Package(pkg, config, options, self.compilers))
+        for section in config.sections():
+            if section == base.BUILD_SECTION:
+                continue
+            if section in self.compilers:
+                continue
 
+            self.packages.append(Package(section, config,
+                                         options, self.compilers))
+
     def runCLI(self):
         LOGGER.info('Starting to build')
 

Modified: Sandbox/adamg/zope.wineggbuilder/trunk/src/zope/wineggbuilder/test.ini
===================================================================
--- Sandbox/adamg/zope.wineggbuilder/trunk/src/zope/wineggbuilder/test.ini	2010-06-12 18:27:02 UTC (rev 113399)
+++ Sandbox/adamg/zope.wineggbuilder/trunk/src/zope/wineggbuilder/test.ini	2010-06-13 08:01:34 UTC (rev 113400)
@@ -23,7 +23,8 @@
 fileEnding = py2.6-win-amd64.egg
 
 
-[zope.proxy]
+[zope.proxy_34_to_35]
+package = zope.proxy
 pypiurl = http://pypi.python.org/simple/zope.proxy/
 tagurl = svn://svn.zope.org/repos/main/zope.proxy/tags/
 minVersion = 3.4