Mercurial > hg > graal-jvmci-8
changeset 22143:616739e61fb6
changed JDKDeployedDist.postJdkInstall to be an overridable method
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 08 Jul 2015 15:11:28 +0200 |
| parents | 8704244e4f6a |
| children | 2d03fccbbfa9 |
| files | mx.jvmci/mx_jvmci.py |
| diffstat | 1 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py Wed Jul 08 10:36:16 2015 +0200 +++ b/mx.jvmci/mx_jvmci.py Wed Jul 08 15:11:28 2015 +0200 @@ -89,11 +89,15 @@ self.usesJVMCIClassLoader = usesJVMCIClassLoader self.partOfHotSpot = partOfHotSpot # true when this distribution is delivered with HotSpot - # A hook called after the jar(s) for this dist have been deployed into a JDK. If not None, - # this hook is called with these arguments: - # jdkDir: the root directory of the JDK - # targetDir: the directory into which the jar(s) were installed - self.postJdkInstall = None + def onPostJdkInstall(self, jdkDir, targetDir): + ''' + Called after the jar(s) for this dist have been deployed to 'targetDir' which + is in the JDK at 'jdkDir'. + ''' + pass + + def dist(self): + return mx.distribution(self.name) """ List of distributions that are deployed into a JDK by mx. @@ -610,8 +614,7 @@ if deployableDist.usesJVMCIClassLoader: # deploy service files _updateJVMCIFiles(jdkDir) - if deployableDist.postJdkInstall: - deployableDist.postJdkInstall(jdkDir, targetDir) + deployableDist.onPostJdkInstall(jdkDir, targetDir) def _check_for_obsolete_jvmci_files(): jdks = _jdksDir() @@ -763,7 +766,7 @@ return if opts2.java and not opts2.projects and not opts2.only: - # Only check deployed JVMCI files on a full build + # Only check deployed JVMCI files on a full build _check_for_obsolete_jvmci_files() builds = [_vmbuild]