Add support for generating an Eclipse .classpath file (bug fix)

pylib/gyp/generator/eclipse.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """GYP backend that generates Eclipse CDT settings files.
 
 This backend DOES NOT generate Eclipse CDT projects. Instead, it generates XML
 files that can be imported into an Eclipse CDT project. The XML file contains a
 list of include paths and symbols (i.e. defines).
 
@@ skipping 340 matching lines @@
         rel_paths.add(os.path.relpath(path, toplevel_dir))
       else:
         rel_paths.add(path)
 
     for path in sorted(rel_paths):
       entry_element = ET.SubElement(result, 'classpathentry')
       entry_element.set('kind', kind)
       entry_element.set('path', path)
 
   AddElements('lib', GetJavaJars(target_list, target_dicts, toplevel_dir))
-  AddElements('src', GetJavaSourceDirs(target_list, target_dicts))
+  AddElements('src', GetJavaSourceDirs(target_list, target_dicts, toplevel_dir))
   # Include the standard JRE container and a dummy out folder
   AddElements('con', ['org.eclipse.jdt.launching.JRE_CONTAINER'])
   # Include a dummy out folder so that Eclipse doesn't use the default /bin
   # folder in the root of the project.
   AddElements('output', [os.path.join(toplevel_build, '.eclipse-java-build')])
 
   ET.ElementTree(result).write(out_name)
 
 
 def GetJavaJars(target_list, target_dicts, toplevel_dir):
   '''Generates a sequence of all .jars used as inputs.'''
   for target_name in target_list:
     target = target_dicts[target_name]
     for action in target.get('actions', []):
       for input_ in action['inputs']:
         if os.path.splitext(input_)[1] == '.jar' and not input_.startswith('$'):
           if os.path.isabs(input_):
             yield input_
           else:
             yield os.path.join(os.path.dirname(target_name), input_)
 
 
-def GetJavaSourceDirs(target_list, target_dicts):
+def GetJavaSourceDirs(target_list, target_dicts, toplevel_dir):
   '''Generates a sequence of all likely java package root directories.'''
   for target_name in target_list:
     target = target_dicts[target_name]
     for action in target.get('actions', []):
       for input_ in action['inputs']:
         if (os.path.splitext(input_)[1] == '.java' and
             not input_.startswith('$')):
           dir_ = os.path.dirname(os.path.join(os.path.dirname(target_name),
                                               input_))
           # If there is a parent 'src' or 'java' folder, navigate up to it -
           # these are canonical package root names in Chromium.  This will
           # break if 'src' or 'java' exists in the package structure. This
           # could be further improved by inspecting the java file for the
           # package name if this proves to be too fragile in practice.
           parent_search = dir_
           while os.path.basename(parent_search) not in ['src', 'java']:
             parent_search, _ = os.path.split(parent_search)
-            if not parent_search:
+            if not parent_search or parent_search == toplevel_dir:
               # Didn't find a known root, just return the original path
               yield dir_
               break
           else:
             yield parent_search
 
 
 def GenerateOutput(target_list, target_dicts, data, params):
   """Generate an XML settings file that can be imported into a CDT project."""
 
   if params['options'].generator_output:
     raise NotImplementedError("--generator_output not implemented for eclipse")
 
   user_config = params.get('generator_flags', {}).get('config', None)
   if user_config:
     GenerateOutputForConfig(target_list, target_dicts, data, params,
                             user_config)
   else:
     config_names = target_dicts[target_list[0]]['configurations'].keys()
     for config_name in config_names:
       GenerateOutputForConfig(target_list, target_dicts, data, params,
                               config_name)