# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1400579779 -7200
# Node ID 7a6f6a7ef886bf7f576273fa68f4147beeeb6801
# Parent  fb530b9fa474689c4b00213d26dbb2831e941ee6
Add JRE library support to mx projectgraph.

diff -r fb530b9fa474 -r 7a6f6a7ef886 mxtool/mx.py
--- a/mxtool/mx.py	Tue May 20 13:13:28 2014 +0200
+++ b/mxtool/mx.py	Tue May 20 11:56:19 2014 +0200
@@ -1232,7 +1232,7 @@
                     entryPath = zi.filename
                     yield zf, entryPath
 
-def sorted_deps(projectNames=None, includeLibs=False, includeAnnotationProcessors=False):
+def sorted_deps(projectNames=None, includeLibs=False, includeJreLibs=False, includeAnnotationProcessors=False):
     """
     Gets projects and libraries sorted such that dependencies
     are before the projects that depend on them. Unless 'includeLibs' is
@@ -1240,12 +1240,12 @@
     """
     projects = projects_from_names(projectNames)
 
-    return sorted_project_deps(projects, includeLibs=includeLibs, includeAnnotationProcessors=includeAnnotationProcessors)
-
-def sorted_project_deps(projects, includeLibs=False, includeAnnotationProcessors=False):
+    return sorted_project_deps(projects, includeLibs=includeLibs, includeJreLibs=includeJreLibs, includeAnnotationProcessors=includeAnnotationProcessors)
+
+def sorted_project_deps(projects, includeLibs=False, includeJreLibs=False, includeAnnotationProcessors=False):
     deps = []
     for p in projects:
-        p.all_deps(deps, includeLibs=includeLibs, includeAnnotationProcessors=includeAnnotationProcessors)
+        p.all_deps(deps, includeLibs=includeLibs, includeJreLibs=includeJreLibs, includeAnnotationProcessors=includeAnnotationProcessors)
     return deps
 
 def _handle_missing_java_home():
@@ -2941,7 +2941,7 @@
         igv.close('properties')
         igv.open('graph', {'name' : 'dependencies'})
         igv.open('nodes')
-        for p in sorted_deps(includeLibs=True):
+        for p in sorted_deps(includeLibs=True, includeJreLibs=True):
             ident = len(ids)
             ids[p.name] = str(ident)
             igv.open('node', {'id' : str(ident)})