Kaydet (Commit) 5cfcd680 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen

add gbuildtoide support for exes

Change-Id: I320ee341651dd0c92de5176c10aa5290afea1d38
üst 4ea6f3c3
...@@ -1001,7 +1001,8 @@ $(eval $(call gb_Helper_register_uiconfigs,\ ...@@ -1001,7 +1001,8 @@ $(eval $(call gb_Helper_register_uiconfigs,\
)) ))
ifeq ($(gb_GBUILDSELFTEST),t) ifeq ($(gb_GBUILDSELFTEST),t)
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,gbuildselftestdep gbuildselftest)) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, gbuildselftestdep gbuildselftest))
$(eval $(call gb_Helper_register_executables,NONE, gbuildselftestexe))
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -41,9 +41,9 @@ printf '}\n' >> $(WORKDIR)/GbuildToIde/$(2) ...@@ -41,9 +41,9 @@ printf '}\n' >> $(WORKDIR)/GbuildToIde/$(2)
endef endef
define gb_Postprocess_register_target define gb_Postprocess_register_target
gbuildtoide : $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(3))) gbuildtoide : $(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3)))
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,$(3))): $(gb_Helper_MISCDUMMY) foo $(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))): $(gb_Helper_MISCDUMMY) foo
endef endef
endif endif
......
...@@ -34,7 +34,6 @@ class CheckGbuildToIde(unittest.TestCase): ...@@ -34,7 +34,6 @@ class CheckGbuildToIde(unittest.TestCase):
gbuildlibs = [] gbuildlibs = []
for jsonfilename in jsonfiles: for jsonfilename in jsonfiles:
with open(os.path.join(tempwork, '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)) gbuildlibs.append(json.load(f))
foundlibs = set() foundlibs = set()
for lib in gbuildlibs: for lib in gbuildlibs:
...@@ -53,6 +52,19 @@ class CheckGbuildToIde(unittest.TestCase): ...@@ -53,6 +52,19 @@ class CheckGbuildToIde(unittest.TestCase):
self.assertTrue(False) self.assertTrue(False)
self.assertEqual(foundlibs, set(['gbuildselftest', 'gbuildselftestdep'])) self.assertEqual(foundlibs, set(['gbuildselftest', 'gbuildselftestdep']))
self.assertEqual(len(foundlibs), 2) self.assertEqual(len(foundlibs), 2)
jsonfiles = os.listdir(os.path.join(tempwork, 'GbuildToIde', 'Executable'))
gbuildexes = []
for jsonfilename in jsonfiles:
with open(os.path.join(tempwork, 'GbuildToIde', 'Executable', jsonfilename), 'r') as f:
gbuildexes.append(json.load(f))
foundexes = set()
for exe in gbuildexes:
if exe['LINKTARGET'].find('gbuildselftestexe') != -1:
foundexes.add('gbuildselftestexe')
else:
self.assertTrue(False)
self.assertEqual(foundexes, set(['gbuildselftestexe']))
self.assertEqual(len(foundexes), 1)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Executable_Executable,gbuildselftestexe))
$(eval $(call gb_Executable_add_exception_objects,gbuildselftestexe,\
solenv/qa/python/selftest/selftestexeobject \
))
# vim: set noet sw=4 ts=4:
...@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,gbuildtoidetest)) ...@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,gbuildtoidetest))
$(eval $(call gb_Module_add_targets,gbuildtoidetest,\ $(eval $(call gb_Module_add_targets,gbuildtoidetest,\
Library_gbuildselftestdep \ Library_gbuildselftestdep \
Library_gbuildselftest \ Library_gbuildselftest \
Executable_gbuildselftestexe \
)) ))
# vim: set shiftwidth=4 tabstop=4 noexpandtab: # vim: set shiftwidth=4 tabstop=4 noexpandtab:
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