Kaydet (Commit) fe471fec authored tarafından Christian Lohmaier's avatar Christian Lohmaier Kaydeden (comit) Björn Michaelsen

gbuildtoide: builddir is not necessarily same as srcdir

Change-Id: Ied9f9abcc75f2edcd518ac247907f573aa21f35e
Reviewed-on: https://gerrit.libreoffice.org/31158Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
üst 8d43bc6c
...@@ -98,20 +98,23 @@ class CheckGbuildToJsonModules(unittest.TestCase): ...@@ -98,20 +98,23 @@ class CheckGbuildToJsonModules(unittest.TestCase):
self.tempwork = tempfile.mkdtemp(prefix='gbuild') self.tempwork = tempfile.mkdtemp(prefix='gbuild')
self.tempsrc = tempfile.mkdtemp(prefix='gbuild') self.tempsrc = tempfile.mkdtemp(prefix='gbuild')
self.srcdir = os.environ['SRCDIR'] self.srcdir = os.environ['SRCDIR']
self.builddir = os.environ['BUILDDIR']
if os.environ['OS'] == 'WNT': if os.environ['OS'] == 'WNT':
self.tempworkmixed = self.tempwork.replace('\\','/') self.tempworkmixed = self.tempwork.replace('\\','/')
self.tempsrcmixed = self.tempsrc.replace('\\','/') self.tempsrcmixed = self.tempsrc.replace('\\','/')
self.srcdirnative = self.srcdir.replace('/','\\') self.srcdirnative = self.srcdir.replace('/','\\')
self.builddirnative = self.builddir.replace('/','\\')
else: else:
self.tempworkmixed = self.tempwork self.tempworkmixed = self.tempwork
self.tempsrcmixed = self.tempsrc self.tempsrcmixed = self.tempsrc
self.srcdirnative = self.srcdir self.srcdirnative = self.srcdir
shutil.copyfile(os.path.join(self.srcdirnative, 'config_host.mk'), os.path.join(self.tempsrc, 'config_host.mk')) self.builddirnative = self.builddir
shutil.copyfile(os.path.join(self.srcdirnative, 'config_host_lang.mk'), os.path.join(self.tempsrc, 'config_host_lang.mk')) shutil.copyfile(os.path.join(self.builddirnative, 'config_host.mk'), os.path.join(self.tempsrc, 'config_host.mk'))
shutil.copyfile(os.path.join(self.builddirnative, 'config_host_lang.mk'), os.path.join(self.tempsrc, 'config_host_lang.mk'))
shutil.copytree(os.path.join(self.builddirnative, 'config_host'), os.path.join(self.tempsrc, 'config_host'))
shutil.copyfile(os.path.join(self.srcdirnative, 'Repository.mk'), os.path.join(self.tempsrc, 'Repository.mk')) shutil.copyfile(os.path.join(self.srcdirnative, 'Repository.mk'), os.path.join(self.tempsrc, 'Repository.mk'))
shutil.copyfile(os.path.join(self.srcdirnative, 'RepositoryExternal.mk'), os.path.join(self.tempsrc, 'RepositoryExternal.mk')) shutil.copyfile(os.path.join(self.srcdirnative, 'RepositoryExternal.mk'), os.path.join(self.tempsrc, 'RepositoryExternal.mk'))
shutil.copyfile(os.path.join(self.srcdirnative, 'RepositoryFixes.mk'), os.path.join(self.tempsrc, 'RepositoryFixes.mk')) shutil.copyfile(os.path.join(self.srcdirnative, 'RepositoryFixes.mk'), os.path.join(self.tempsrc, 'RepositoryFixes.mk'))
shutil.copytree(os.path.join(self.srcdirnative, 'config_host'), os.path.join(self.tempsrc, 'config_host'))
#print('copytree from _%s_ to _%s_' % (os.path.join(self.srcdirnative, 'solenv').replace('\\', '#').replace('/', '!'), os.path.join(self.tempsrc, 'solenv').replace('\\', '#').replace('/', '!'))) #print('copytree from _%s_ to _%s_' % (os.path.join(self.srcdirnative, 'solenv').replace('\\', '#').replace('/', '!'), os.path.join(self.tempsrc, 'solenv').replace('\\', '#').replace('/', '!')))
shutil.copytree(os.path.join(self.srcdirnative, 'solenv'), os.path.join(self.tempsrc, 'solenv')) shutil.copytree(os.path.join(self.srcdirnative, 'solenv'), os.path.join(self.tempsrc, 'solenv'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment