[Libreoffice-commits] core.git: 3 commits - solenv/gbuild solenv/qa

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_GbuildToIde.mk |   49 +++++++++++++--------------
 solenv/qa/python/gbuildtoide.py              |    8 ++--
 2 files changed, 30 insertions(+), 27 deletions(-)

New commits:
commit fcb7ee7aad1c798157bc84e418742a42cb625ae6
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Oct 13 23:24:44 2016 +0200

    use tempdir for test
    
    Change-Id: Ie218f87dc2f1c1b6031cc08f2027cfcf392c6c21

diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 6184f91..71c6775 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -21,17 +21,19 @@ import unittest
 import json
 import os
 import os.path
+import tempfile
 
 
 class CheckGbuildToIde(unittest.TestCase):
 
     def test_gbuildtoide(self):
+        tempwork = tempfile.mkdtemp()
         os.chdir(os.path.join(os.environ['SRCDIR'], 'solenv', 'qa', 'python', 'selftest'))
-        subprocess.check_call(['make', 'gbuildtoide'])
-        jsonfiles = os.listdir(os.path.join(os.environ['WORKDIR'], 'GbuildToIde', 'Library'))
+        subprocess.check_call(['make', 'gbuildtoide', 'WORKDIR=%s' % tempwork])
+        jsonfiles = os.listdir(os.path.join(tempwork, 'GbuildToIde', 'Library'))
         gbuildlibs = []
         for jsonfilename in jsonfiles:
-            with open(os.path.join(os.environ['WORKDIR'], 'GbuildToIde', 'Library', jsonfilename), 'r') as f:
+            with open(os.path.join(tempwork, 'GbuildToIde', 'Library', jsonfilename), 'r') as f:
                 print('loading %s' % jsonfilename)
                 gbuildlibs.append(json.load(f))
         foundlibs = set()
commit 2eb6605c1dcf5ea8e0521a8162d20dfe6399ec88
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Oct 13 23:15:47 2016 +0200

    gbuildtoide does not need deps
    
    Change-Id: I806b8f445fad02e7dceff6263828fe9d8667341e

diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk b/solenv/gbuild/extensions/post_GbuildToIde.mk
index 2316b41..8d20e52 100644
--- a/solenv/gbuild/extensions/post_GbuildToIde.mk
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -8,6 +8,8 @@
 
 ifneq ($(filter gbuildtoide,$(MAKECMDGOALS)),)
 
+gb_FULLDEPS:=
+
 gbuildtoide:
 	true
 
commit 6f345e1e6e2d7f6fdbd746dfd0c91843a5ff2d10
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Oct 13 23:15:20 2016 +0200

    remove needless cascaded defines
    
    Change-Id: Ie76dd70a6a0960ee49df6e31a171761fdaf88f53

diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk b/solenv/gbuild/extensions/post_GbuildToIde.mk
index 1c242a40..2316b41 100644
--- a/solenv/gbuild/extensions/post_GbuildToIde.mk
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -15,35 +15,34 @@ gbuildtoide:
 foo:
 	true
 
+define gb_LinkTarget__command
+mkdir -p $(WORKDIR)/GbuildToIde/Library
+printf '{"LINKTARGET": "%s"' '$(2)' > $(WORKDIR)/GbuildToIde/$(2)
+printf ', "ILIBTARGET": "%s"' '$(ILIBTARGET)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "COBJECTS": "%s"' '$(COBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "CXXOBJECTS": "%s"' '$(CXXOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "YACCOBJECTS": "%s"' '$(YACCOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "OBJCOBJECTS": "%s"' '$(OBJCOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "OBJCXXOBJECTS": "%s"' '$(OBJCXXOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "ASMOBJECTS": "%s"' '$(ASMOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "GENCOBJECTS": "%s"' '$(GENCOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "GENCXXOBJECTS": "%s"' '$(GENCXXOBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "CFLAGS": "%s"' '$(T_CFLAGS) $(T_CFLAGS_APPEND)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "CXXFLAGS": "%s"' '$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "OBJCFLAGS": "%s"' '$(T_OBJCFLAGS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "OBJCXXFLAGS": "%s"' '$(T_OBJCXXFLAGS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "DEFS": "%s"' '$(DEFS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "INCLUDE": "%s"' '$(INCLUDE)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "LINKED_LIBS": "%s"' '$(LINKED_LIBS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf ', "LINKED_STATIC_LIBS": "%s"' '$(LINKED_STATIC_LIBS)' >> $(WORKDIR)/GbuildToIde/$(2)
+printf '}\n' >> $(WORKDIR)/GbuildToIde/$(2)
+endef
+
 define gb_Postprocess_register_target
 gbuildtoide : $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(3)))
 
-
 $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(3))): $(gb_Helper_MISCDUMMY) foo
 
-define gb_LinkTarget__command
-	mkdir -p $(WORKDIR)/GbuildToIde/Library
-	printf '{"LINKTARGET": "%s"' '$$(2)' > $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "ILIBTARGET": "%s"' '$$(ILIBTARGET)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "COBJECTS": "%s"' '$$(COBJECTS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "CXXOBJECTS": "%s"' '$$(CXXOBJECTS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "YACCOBJECTS": "%s"' '$$(YACCOBJECTS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "OBJCOBJECTS": "%s"' '$$(OBJCOBJECTS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "OBJCXXOBJECTS": "%s"' '$$(OBJCXXOBJECTS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "ASMOBJECTS": "%s"' '$$(ASMOBJECTS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "GENCOBJECTS": "%s"' '$$(GENCOBJECTS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "GENCXXOBJECTS": "%s"' '$$(GENCXXOBJECTS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "CFLAGS": "%s"' '$$(T_CFLAGS) $$(T_CFLAGS_APPEND)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "CXXFLAGS": "%s"' '$$(T_CXXFLAGS) $$(T_CXXFLAGS_APPEND)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "OBJCFLAGS": "%s"' '$$(T_OBJCFLAGS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "OBJCXXFLAGS": "%s"' '$$(T_OBJCXXFLAGS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "DEFS": "%s"' '$$(DEFS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "INCLUDE": "%s"' '$$(INCLUDE)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "LINKED_LIBS": "%s"' '$$(LINKED_LIBS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf ', "LINKED_STATIC_LIBS": "%s"' '$$(LINKED_STATIC_LIBS)' >> $(WORKDIR)/GbuildToIde/$$(2)
-	printf '}\n' >> $(WORKDIR)/GbuildToIde/$$(2)
-endef
-
 endef
 
 endif