Mercurial > hg > truffle
changeset 13525:7cbd4f2194aa
mx: omit weird logic to copy bootstrap jdk, just do cp -R
author | Bernhard Urban <bernhard.urban@jku.at> |
---|---|
date | Tue, 07 Jan 2014 21:46:56 +0100 |
parents | dfb843a0a76d |
children | 8602fcb6ceb3 |
files | mx/mx_graal.py |
diffstat | 1 files changed, 1 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/mx_graal.py Tue Jan 07 22:40:02 2014 +0200 +++ b/mx/mx_graal.py Tue Jan 07 21:46:56 2014 +0100 @@ -295,28 +295,9 @@ jdk = join(_jdksDir(), build) if create: srcJdk = mx.java().jdk - jdkContentsDirectories = ['bin', 'include', 'jre', 'lib'] - jdkContentsFiles = ['ASSEMBLY_EXCEPTION', 'COPYRIGHT', 'LICENSE', 'javafx-src.zip', 'README.html', 'release', 'src.zip', 'THIRDPARTYLICENSEREADME-JAVAFX.txt', 'THIRDPARTYLICENSEREADME.txt', 'THIRD_PARTY_README'] - if exists(join(srcJdk, 'db')): - jdkContentsDirectories.append('db') - if mx.get_os() != 'windows' and exists(join(srcJdk, 'man')): - jdkContentsDirectories.append('man') if not exists(jdk): mx.log('Creating ' + jdk + ' from ' + srcJdk) - os.makedirs(jdk) - 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) - if exists(src): - dst = join(jdk, f) - shutil.copyfile(src, dst) - elif mx._opts.verbose: - mx.log('Host JDK file is missing: ' + src) + shutil.copytree(srcJdk, jdk) # Make a copy of the default VM so that this JDK can be # reliably used as the bootstrap for a HotSpot build.