solenv/qa/python/gbuildtoide.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ed11f8eb344fb70d17a76f15365f181a662bcc98
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Thu Nov 24 11:21:32 2016 +0100
gbuildtoide: builddir is not necessarily same as srcdir
Change-Id: Ied9f9abcc75f2edcd518ac247907f573aa21f35e
Reviewed-on: https://gerrit.libreoffice.org/32405
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 8ff87ba..7b2a2c4 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -98,20 +98,23 @@ class CheckGbuildToIdeModules(unittest.TestCase):
self.tempwork = tempfile.mkdtemp()
self.tempsrc = tempfile.mkdtemp()
self.srcdir = os.environ['SRCDIR']
+ self.builddir = os.environ['BUILDDIR']
if os.environ['OS'] == 'WNT':
self.tempworkmixed = self.tempwork.replace('\\','/')
self.tempsrcmixed = self.tempsrc.replace('\\','/')
self.srcdirnative = self.srcdir.replace('/','\\')
+ self.builddirnative = self.builddir.replace('/','\\')
else:
self.tempworkmixed = self.tempwork
self.tempsrcmixed = self.tempsrc
self.srcdirnative = self.srcdir
- shutil.copyfile(os.path.join(self.srcdirnative, 'config_host.mk'),
os.path.join(self.tempsrc, 'config_host.mk'))
- shutil.copyfile(os.path.join(self.srcdirnative,
'config_host_lang.mk'), os.path.join(self.tempsrc, 'config_host_lang.mk'))
+ self.builddirnative = self.builddir
+ 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,
'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.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('/', '!')))
shutil.copytree(os.path.join(self.srcdirnative, 'solenv'),
os.path.join(self.tempsrc, 'solenv'))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
