Update generator for Chrome generation as the default case

Update defaults so that we pull IDL files from api/dev
Update the interface string gereration to replace
interfaces ending with '_Dev' with (Dev) instead.
Allow for overfide of interface string using 'iname' Property
By default assume range=M13,M14 for multi-version chrome.
(NOTE: A new CL will clean this up and sport =min,max)

BUG= http://code.google.com/p/chromium/issues/detail?id=89969
TEST= ./generator.py
R= brettw@chromium.org
Review URL: http://codereview.chromium.org/7753042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98488 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 23 insertions, 7 deletions

diff --git a/ppapi/generators/generator.py b/ppapi/generators/generator.py
index 142bd11..59cc421 100755
--- a/ppapi/generators/generator.py
+++ b/ppapi/generators/generator.py
@@ -26,7 +26,7 @@ if __name__ == '__main__':
 
   # If no arguments are provided, assume we are tring to rebuild the
   # C headers with warnings off.
-  if not args: args = ['--wnone', '--cgen']
+  if not args: args = ['--wnone', '--cgen', '--range=M13,M14']
 
   sys.exit(Main(args))
 
diff --git a/ppapi/generators/idl_c_header.py b/ppapi/generators/idl_c_header.py
index 00933b5..df21c20 100644
--- a/ppapi/generators/idl_c_header.py
+++ b/ppapi/generators/idl_c_header.py
@@ -114,6 +114,17 @@ class HGen(GeneratorByFile):
       out = '#define %s \\\n    %s' % (name, value)
     return '%s\n' % out
 
+  def GetVersionString(self, node):
+    # If an interface name is specified, use that
+    iname = node.GetProperty('iname')
+    if iname: return iname
+
+    # Otherwise, the interface name is the object's name
+    # With '_Dev' replaced by '(Dev)' if it's a Dev interface.
+    name = node.GetName()
+    if len(name) > 4 and name[-4:] == '_Dev':
+      name = '%s(Dev)' % name[:-4]
+    return name
 
   def GetOutFile(self, filenode, options):
     savename = GetOutFileName(filenode, GetOption('dstroot'))
@@ -163,7 +174,7 @@ class HGen(GeneratorByFile):
     out.Write('\n')
     for node in filenode.GetListOf('Interface'):
       idefs = ''
-      name = node.GetName()
+      name = self.GetVersionString(node)
       macro = node.GetProperty('macro')
       if not macro:
         macro = self.GetMacro(node)
diff --git a/ppapi/generators/idl_generator.py b/ppapi/generators/idl_generator.py
index 123d08a..e66efc1 100644
--- a/ppapi/generators/idl_generator.py
+++ b/ppapi/generators/idl_generator.py
@@ -11,8 +11,8 @@ from idl_option import GetOption, Option, ParseOptions
 
 GeneratorList = []
 
-Option('release', 'Which release to generate.', default='M14')
-Option('range', 'Which release ranges in the form of MIN,MAX.', default='')
+Option('release', 'Which release to generate.', default='')
+Option('range', 'Which ranges in the form of MIN,MAX.', default='M13,M14')
 
 
 #
@@ -67,7 +67,7 @@ class Generator(object):
     releasestr = GetOption('release')
 
     # Check for a range option which over-rides a release option
-    if rangestr:
+    if not releasestr and rangestr:
       range_list = rangestr.split(',')
       if len(range_list) != 2:
         self.Error('Failed to generate for %s, incorrect range: "%s"' %
@@ -77,12 +77,17 @@ class Generator(object):
         vmax = range_list[1]
         vmin = ast.releases.index(vmin)
         vmax = ast.releases.index(vmax) + 1
-        ret = self.GenerateRange(ast, ast.releases[vmin:vmax], options)
+        range = ast.releases[vmin:vmax]
+        InfoOut.Log('Generate range %s of %s.' % (range, self.name))
+        ret = self.GenerateRange(ast, range, options)
         if ret < 0:
           self.Error('Failed to generate range %s : %s.' %(vmin, vmax))
+        else:
+          InfoOut.Log('%s wrote %d files.' % (self.name, ret))
     # Otherwise this should be a single release generation
     else:
       if releasestr:
+        InfoOut.Log('Generate release %s of %s.' % (releasestr, self.name))
         ret = self.GenerateRelease(ast, releasestr, options)
         if ret < 0:
           self.Error('Failed to generate release %s.' % releasestr)
diff --git a/ppapi/generators/idl_parser.py b/ppapi/generators/idl_parser.py
index 30e487b..c04d261 100644
--- a/ppapi/generators/idl_parser.py
+++ b/ppapi/generators/idl_parser.py
@@ -968,7 +968,7 @@ def TestNamespaceFiles(filter):
     InfoOut.Log("Passed namespace test.")
   return errs
 
-default_dirs = ['.', 'trusted']
+default_dirs = ['.', 'trusted', 'dev']
 def ParseFiles(filenames):
   parser = IDLParser()
   filenodes = []