changeset 22452:b6fd47c5dc0b

Add ability to define a source target folder for distribution deployments.
author Christian Humer <christian.humer@oracle.com>
date Fri, 21 Aug 2015 13:18:40 +0200
parents 2229c0e4fe21
children d6bbd5d8d81e
files mx.jvmci/mx_jvmci.py
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Fri Aug 21 12:13:43 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Fri Aug 21 13:18:40 2015 +0200
@@ -100,16 +100,22 @@
     def targetDir(self):
         mx.nyi('targetDir', self)
 
-    def _copyToJdk(self, jdkDir, target):
+    def sourceTargetDir(self):
+        return 'src'
+
+    def _copyToJdk(self, jdkDir, target, sourceTarget):
         targetDir = join(jdkDir, target)
         dist = self.dist()
         mx.logv('Deploying {} to {}'.format(dist.name, targetDir))
         copyToJdk(dist.path, targetDir)
-        if dist.sourcesPath:
-            copyToJdk(dist.sourcesPath, jdkDir)
+
+        if dist.sourcesPath and sourceTarget is not None:
+            sourceTargetDir = join(jdkDir, sourceTarget)
+            copyToJdk(dist.sourcesPath, sourceTargetDir)
+            mx.logv('Deploying source {} to {}'.format(dist.name, sourceTargetDir))
 
     def deploy(self, jdkDir):
-        self._copyToJdk(jdkDir, self.targetDir())
+        self._copyToJdk(jdkDir, self.targetDir(), self.sourceTargetDir())
 
 class ExtJDKDeployedDist(JarJDKDeployedDist):
     def __init__(self, name, partOfHotSpot=False):