More multi-version support (part 2)

ppapi/generators/idl_c_header.py

 #!/usr/bin/python
 #
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ Generator for C style prototypes and definitions """
 
 import glob
 import os
@@ skipping 149 matching lines @@
       out.Write('#include "%s"\n' % include)
 
     # Generate all interface defines
     out.Write('\n')
     for node in filenode.GetListOf('Interface'):
       idefs = ''
       name = node.GetName()
       macro = node.GetProperty('macro')
       if not macro:
         macro = self.GetMacro(node)
-      label = node.GetLabel()
-      if label:
-        for vers in label.versions:
-          strver = str(vers).replace('.', '_')
-          idefs += self.GetDefine('%s_%s' % (macro, strver),
-                                  '"%s;%s"' % (name, vers))
-          if label.GetRelease(vers) == releases[-1]:
-            idefs += self.GetDefine(macro, '%s_%s' % (macro, strver))
-        idefs += '\n'
+
+      unique = node.GetUniqueReleases(releases)
+      for rel in unique:
+        version = node.GetVersion(rel)
+        strver = str(version).replace('.', '_')
+        idefs += self.GetDefine('%s_%s' % (macro, strver),
+                                '"%s;%s"' % (name, version))
+      idefs += self.GetDefine(macro, '%s_%s' % (macro, strver)) + '\n'
       out.Write(idefs)
 
     # Generate the @file comment
     out.Write('%s\n' % Comment(fileinfo, prefix='*\n @file'))
 
   def GenerateBody(self, out, filenode, releases, options):
     GenerateHeader(out, filenode, releases)
 
   def GenerateTail(self, out, filenode, releases, options):
     gpath = GetOption('guard')
@@ skipping 33 matching lines @@
     failed =1
   else:
     print "Golden file for M13-M15 passed."
 
   return failed
 
 if __name__ == '__main__':
   retval = Main(sys.argv[1:])
   sys.exit(retval)