# HG changeset patch
# User Stefan Anzinger <stefan.anzinger@oracle.com>
# Date 1439806255 -7200
# Node ID 9c55f608b79e19647fb7a45afec3280b07bc47fa
# Parent  f45c8b5add132a0fbbac2d73227531d232379307
Generate jvmci.make with all defined dependencies/bootclasspath regardless availability in the current enviornment

diff -r f45c8b5add13 -r 9c55f608b79e make/jvmci.make
--- a/make/jvmci.make	Mon Aug 17 11:21:37 2015 +0200
+++ b/make/jvmci.make	Mon Aug 17 12:10:55 2015 +0200
@@ -118,7 +118,7 @@
 
 
 
-JDK_BOOTCLASSPATH = $(ABS_BOOTDIR)/jre/lib/resources.jar:$(ABS_BOOTDIR)/jre/lib/rt.jar:$(ABS_BOOTDIR)/jre/lib/jsse.jar:$(ABS_BOOTDIR)/jre/lib/jce.jar:$(ABS_BOOTDIR)/jre/lib/charsets.jar:$(ABS_BOOTDIR)/jre/lib/jfr.jar
+JDK_BOOTCLASSPATH = $(ABS_BOOTDIR)/jre/lib/resources.jar:$(ABS_BOOTDIR)/jre/lib/rt.jar:$(ABS_BOOTDIR)/jre/lib/sunrsasign.jar:$(ABS_BOOTDIR)/jre/lib/jsse.jar:$(ABS_BOOTDIR)/jre/lib/jce.jar:$(ABS_BOOTDIR)/jre/lib/charsets.jar:$(ABS_BOOTDIR)/jre/lib/jfr.jar:$(ABS_BOOTDIR)/jre/classes
 
 JVMCI_SERVICE_SRC += $(shell find jvmci/jdk.internal.jvmci.service/src -type f 2> /dev/null)
 
diff -r f45c8b5add13 -r 9c55f608b79e mx.jvmci/mx_jvmci.py
--- a/mx.jvmci/mx_jvmci.py	Mon Aug 17 11:21:37 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Mon Aug 17 12:10:55 2015 +0200
@@ -1661,7 +1661,7 @@
     'deoptalot' : [deoptalot, '[n]'],
     'longtests' : [longtests, ''],
     'jol' : [jol, ''],
-    'makefile' : [mx_jvmci_makefile.build_makefile, 'build makefiles for JDK build'],
+    'makefile' : [mx_jvmci_makefile.build_makefile, 'build makefiles for JDK build', None, {'keepUnsatisfiedDependencies': True}],
 })
 
 mx.add_argument('--vmcwd', dest='vm_cwd', help='current directory will be changed to <path> before the VM is executed', default=None, metavar='<path>')
diff -r f45c8b5add13 -r 9c55f608b79e mx.jvmci/mx_jvmci_makefile.py
--- a/mx.jvmci/mx_jvmci_makefile.py	Mon Aug 17 11:21:37 2015 +0200
+++ b/mx.jvmci/mx_jvmci_makefile.py	Mon Aug 17 12:10:55 2015 +0200
@@ -72,8 +72,12 @@
 def _get_dependency_check(p):
     jarFinders = []
     for dep in p.deps:
-        if (dep.isJreLibrary() or dep.isJdkLibrary()) and dep.optional:
-            jar = dep.classpath_repr(False)
+        jar = None
+        if dep.isJreLibrary() and dep.optional:
+            jar = dep.jar
+        if dep.isJdkLibrary() and dep.optional:
+            jar = dep.path
+        if jar:
             jarFinders.append("$(shell find $(ABS_BOOTDIR)/ -name '%s'; echo $$?)" % jar)
     return "ifeq ({},'{}')".format("".join(jarFinders), "0" * len(jarFinders)) if len(jarFinders) > 0 else None
 
@@ -94,7 +98,7 @@
     for p in projects:
         projectDir = path_dist_relative(p.dir)
         annotationProcessorDeps.update(p.declaredAnnotationProcessors)
-        depCheck =  _get_dependency_check(p)
+        depCheck = _get_dependency_check(p)
         if depCheck:
             sources.append(depCheck)
         for src in [projectDir + '/' + d for d in p.srcDirs]:
@@ -139,7 +143,7 @@
 
 def do_build_makefile(mf, selectedDists):
     jdk = mx.get_jdk()
-    bootClassPath = jdk.bootclasspath()
+    bootClassPath = jdk.bootclasspath(filtered=False)
     bootClassPath = bootClassPath.replace(os.path.realpath(jdk.home), "$(ABS_BOOTDIR)")
     jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH"