changeset 13522:44ecb4c8ed1f

mx: also copy files from bootstrap jdk
author Bernhard Urban <bernhard.urban@jku.at>
date Tue, 07 Jan 2014 14:48:45 +0200
parents 56452e07874f
children 137142009b0b
files mx/mx_graal.py
diffstat 1 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Tue Jan 07 14:41:52 2014 +0100
+++ b/mx/mx_graal.py	Tue Jan 07 14:48:45 2014 +0200
@@ -295,20 +295,29 @@
     jdk = join(_jdksDir(), build)
     if create:
         srcJdk = mx.java().jdk
-        jdkContents = ['bin', 'include', 'jre', 'lib']
+        jdkContentsDirectories = ['bin', 'include', 'jre', 'lib']
+        jdkContentsFiles = ['COPYRIGHT', 'LICENSE', 'README.html', 'release', 'src.zip', 'THIRDPARTYLICENSEREADME-JAVAFX.txt', 'THIRDPARTYLICENSEREADME.txt']
         if exists(join(srcJdk, 'db')):
-            jdkContents.append('db')
+            jdkContentsDirectories.append('db')
         if mx.get_os() != 'windows' and exists(join(srcJdk, 'man')):
-            jdkContents.append('man')
+            jdkContentsDirectories.append('man')
+        if exists(join(srcJdk, 'javafx-src.zip')):
+            jdkContentsFiles.append('javafx-src.zip')
         if not exists(jdk):
             mx.log('Creating ' + jdk + ' from ' + srcJdk)
             os.makedirs(jdk)
-            for d in jdkContents:
+            for d in jdkContentsDirectories:
                 src = join(srcJdk, d)
                 dst = join(jdk, d)
                 if not exists(src):
                     mx.abort('Host JDK directory is missing: ' + src)
                 shutil.copytree(src, dst)
+            for f in jdkContentsFiles:
+                src = join(srcJdk, f)
+                dst = join(jdk, f)
+                if not exists(src):
+                    mx.abort('Host JDK file is missing: ' + src)
+                shutil.copyfile(src, dst)
 
             # Make a copy of the default VM so that this JDK can be
             # reliably used as the bootstrap for a HotSpot build.