Fold InternalUnoApi_embindtest into UnoApi_udkapi

80d3f33876 "Library_embindtest should use
comprehensive InternalUnoApi_embindtest" was an attempt at making type
information about that library available at runtime.  Which worked for cases
where code directly called one of the types' cppu_detail_getUnoType function.
But it would still fail for cases where code indirectly wants to obtain one of
the types' information by type name---which is what upcoming code will do that
changes the Embind'ing of UNO sequences.

So InternalUnoApi_embindtest would need to become a UnoApi_embindtest whose
instdir/program/types/embindtest.rdb would be available at runtime.  But I'm too
dumb to convince gbuild to create that new UnoApi_embindtest.  So instead just
tack the embindtest UNOIDL entities onto the existing UnoApi_udkapi for the
EMSCRIPTEN-ENABLE_DBGUTIL case.  (Which requires that the single embindtest.idl
is split into individual per-entity files, sigh.)

Change-Id: Ie189b17213ac5b2de7a61ac5f97a143fa097337f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164057
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>

static/StaticLibrary_unoembind.mk

@@ -22,12 +22,6 @@ $(eval $(call gb_StaticLibrary_use_api,unoembind,\
     udkapi \
 ))
 
-ifneq ($(ENABLE_DBGUTIL),)
-$(eval $(call gb_StaticLibrary_use_internal_api,unoembind, \
-    embindtest \
-))
-endif
-
 $(call gb_StaticLibrary_get_target,unoembind): $(call gb_CustomTarget_get_target,static/unoembind)
 
 # vim: set noet sw=4 ts=4:

udkapi/UnoApi_udkapi.mk

@@ -520,6 +520,16 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,com/sun/star/util,\
 	XVeto \
 ))
 
+ifeq ($(OS)-$(ENABLE_DBGUTIL),EMSCRIPTEN-TRUE)
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,org/libreoffice/embindtest, \
+    Struct \
+    XTest \
+))
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,org/libreoffice/embindtest, \
+    Test \
+))
+endif
+
 $(eval $(call gb_UnoApi_set_reference_rdbfile,udkapi,$(SRCDIR)/udkapi/type_reference/udkapi.idl))
 
 # vim: set noet sw=4 ts=4:

udkapi/org/libreoffice/embindtest/Struct.idl

@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+module org { module libreoffice { module embindtest {
+
+struct Struct {
+    long m1;
+    double m2;
+    string m3;
+};
+
+}; }; };
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

udkapi/org/libreoffice/embindtest/Test.idl

@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+module org { module libreoffice { module embindtest {
+
+singleton Test: XTest;
+
+}; }; };
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

udkapi/org/libreoffice/embindtest/XTest.idl

@@ -9,12 +9,6 @@
 
 module org { module libreoffice { module embindtest {
 
-struct Struct {
-    long m1;
-    double m2;
-    string m3;
-};
-
 interface XTest {
     boolean getBoolean();
     boolean isBoolean([in] boolean value);
@@ -72,8 +66,6 @@ interface XTest {
     boolean isSequenceStruct([in] sequence<Struct> value);
 };
 
-singleton Test: XTest;
-
 }; }; };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

unotest/InternalUnoApi_embindtest.mk

@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*-
-#
-# 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_InternalUnoApi_InternalUnoApi,embindtest,unotest/source/embindtest/embindtest.idl))
-
-$(eval $(call gb_InternalUnoApi_use_api,embindtest, \
-    udkapi \
-))
-
-# vim: set noet sw=4 ts=4:

unotest/Library_embindtest.mk

@@ -19,8 +19,4 @@ $(eval $(call gb_Library_use_api,embindtest, \
     udkapi \
 ))
 
-$(eval $(call gb_Library_use_internal_comprehensive_api,embindtest, \
-    embindtest \
-))
-
 # vim: set noet sw=4 ts=4:

unotest/Module_unotest.mk

@@ -33,7 +33,6 @@ endif
 
 ifeq ($(OS)-$(ENABLE_DBGUTIL),EMSCRIPTEN-TRUE)
 $(eval $(call gb_Module_add_targets,unotest, \
-    InternalUnoApi_embindtest \
     Library_embindtest \
 ))
 endif