.NET Bindings: Move built .NET libraries into instdir

This commit adds Package targets for the net_basetypes, net_uretypes
and net_oootypes libraries to install them into instdir/program/dotnet.
Also adds a LIBO_SHARE_DOTNET_FOLDER variable mirroring the
LIBO_SHARE_JAVA_FOLDER variable.

Change-Id: I28cdb2dac799bd72d11c3e550bba1a946db8b49c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170098
Tested-by: Jenkins
Reviewed-by: Hossein <hossein@libreoffice.org>

10 files changed, 65 insertions, 0 deletions

diff --git a/Repository.mk b/Repository.mk
index f4e11b0193a5..e372bc4b6fc8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -894,6 +894,11 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
 	instsetoo_native_setup_ure \
     $(call gb_CondExeUno,uno_sh) \
 	ure_install \
+	$(if $(ENABLE_DOTNET),\
+		net_basetypes \
+		net_uretypes \
+		net_oootypes \
+	) \
 	$(if $(ENABLE_JAVA),\
 		jvmfwk_jvmfwk3_ini \
 		jvmfwk_javavendors \
diff --git a/config_host.mk.in b/config_host.mk.in
index b9c357aaf19b..6d4e5036c70a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -422,6 +422,7 @@ export LIBO_LIB_FOLDER_FOR_BUILD=@LIBO_LIB_FOLDER_FOR_BUILD@
 export LIBO_LIB_PYUNO_FOLDER=@LIBO_LIB_PYUNO_FOLDER@
 export LIBO_SHARE_FOLDER=@LIBO_SHARE_FOLDER@
 export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@
+LIBO_SHARE_DOTNET_FOLDER=@LIBO_SHARE_DOTNET_FOLDER@
 export LIBO_SHARE_JAVA_FOLDER=@LIBO_SHARE_JAVA_FOLDER@
 export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@
 export LIBO_SHARE_READMES_FOLDER=@LIBO_SHARE_READMES_FOLDER@
diff --git a/config_host/config_folders.h.in b/config_host/config_folders.h.in
index 13051984f385..0ca882139fd0 100644
--- a/config_host/config_folders.h.in
+++ b/config_host/config_folders.h.in
@@ -26,6 +26,9 @@
 /* where help files are */
 #undef LIBO_SHARE_HELP_FOLDER
 
+/* where dotnet libraries are */
+#undef LIBO_SHARE_DOTNET_FOLDER
+
 /* where java jars are */
 #undef LIBO_SHARE_JAVA_FOLDER
 
diff --git a/configure.ac b/configure.ac
index 9bed7d626149..63785dac52f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3990,6 +3990,7 @@ if test $_os = Darwin; then
     LIBO_LIB_PYUNO_FOLDER=Resources
     LIBO_SHARE_FOLDER=Resources
     LIBO_SHARE_HELP_FOLDER=Resources/help
+    LIBO_SHARE_DOTNET_FOLDER=Resources/dotnet
     LIBO_SHARE_JAVA_FOLDER=Resources/java
     LIBO_SHARE_PRESETS_FOLDER=Resources/presets
     LIBO_SHARE_READMES_FOLDER=Resources/readmes
@@ -4008,6 +4009,7 @@ elif test $_os = WINNT; then
     LIBO_LIB_PYUNO_FOLDER=program
     LIBO_SHARE_FOLDER=share
     LIBO_SHARE_HELP_FOLDER=help
+    LIBO_SHARE_DOTNET_FOLDER=program/dotnet
     LIBO_SHARE_JAVA_FOLDER=program/classes
     LIBO_SHARE_PRESETS_FOLDER=presets
     LIBO_SHARE_READMES_FOLDER=readmes
@@ -4026,6 +4028,7 @@ else
     LIBO_LIB_PYUNO_FOLDER=program
     LIBO_SHARE_FOLDER=share
     LIBO_SHARE_HELP_FOLDER=help
+    LIBO_SHARE_DOTNET_FOLDER=program/dotnet
     LIBO_SHARE_JAVA_FOLDER=program/classes
     LIBO_SHARE_PRESETS_FOLDER=presets
     LIBO_SHARE_READMES_FOLDER=readmes
@@ -4048,6 +4051,7 @@ AC_DEFINE_UNQUOTED(LIBO_LIB_FOLDER,"$LIBO_LIB_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_LIB_PYUNO_FOLDER,"$LIBO_LIB_PYUNO_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_SHARE_FOLDER,"$LIBO_SHARE_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_SHARE_HELP_FOLDER,"$LIBO_SHARE_HELP_FOLDER")
+AC_DEFINE_UNQUOTED(LIBO_SHARE_DOTNET_FOLDER,"$LIBO_SHARE_DOTNET_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_SHARE_JAVA_FOLDER,"$LIBO_SHARE_JAVA_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_SHARE_PRESETS_FOLDER,"$LIBO_SHARE_PRESETS_FOLDER")
 AC_DEFINE_UNQUOTED(LIBO_SHARE_RESOURCE_FOLDER,"$LIBO_SHARE_RESOURCE_FOLDER")
@@ -4065,6 +4069,7 @@ AC_SUBST(LIBO_LIB_FOLDER)
 AC_SUBST(LIBO_LIB_PYUNO_FOLDER)
 AC_SUBST(LIBO_SHARE_FOLDER)
 AC_SUBST(LIBO_SHARE_HELP_FOLDER)
+AC_SUBST(LIBO_SHARE_DOTNET_FOLDER)
 AC_SUBST(LIBO_SHARE_JAVA_FOLDER)
 AC_SUBST(LIBO_SHARE_PRESETS_FOLDER)
 AC_SUBST(LIBO_SHARE_READMES_FOLDER)
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index b78899a2c10b..2f91878e1ed1 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -64,6 +64,7 @@ $(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,fu
                 'userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini' \
                 $(if $(filter WNT,$(OS)),'winreg:CURRENT_USER ') \
                 'user:!$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu' \
+		&& echo 'LO_DOTNET_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_DOTNET_FOLDER)' \
 		&& echo 'LO_JAVA_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)' \
 		&& echo 'LO_LIB_DIR=$${BRAND_BASE_DIR}/$(LIBO_LIB_FOLDER)' \
 		&& echo 'BAK_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):TMP_EXTENSIONS}' \
diff --git a/net_ure/Module_net_ure.mk b/net_ure/Module_net_ure.mk
index 982a030e8aae..98e3a80505e3 100644
--- a/net_ure/Module_net_ure.mk
+++ b/net_ure/Module_net_ure.mk
@@ -15,6 +15,9 @@ $(eval $(call gb_Module_add_targets,net_ure,\
 	DotnetLibrary_net_basetypes \
 	DotnetLibrary_net_uretypes \
 	DotnetLibrary_net_oootypes \
+	Package_net_basetypes \
+	Package_net_uretypes \
+	Package_net_oootypes \
 ))
 endif
 
diff --git a/net_ure/Package_net_basetypes.mk b/net_ure/Package_net_basetypes.mk
new file mode 100644
index 000000000000..84effa459b7a
--- /dev/null
+++ b/net_ure/Package_net_basetypes.mk
@@ -0,0 +1,13 @@
+# -*- 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_Package_Package,net_basetypes,$(gb_DotnetLibrary_workdir)/net_basetypes))
+
+$(eval $(call gb_Package_add_files,net_basetypes,$(LIBO_SHARE_DOTNET_FOLDER),net_basetypes.dll))
+
+# vim: set noet sw=4 ts=4:
diff --git a/net_ure/Package_net_oootypes.mk b/net_ure/Package_net_oootypes.mk
new file mode 100644
index 000000000000..e8e6ca811c60
--- /dev/null
+++ b/net_ure/Package_net_oootypes.mk
@@ -0,0 +1,13 @@
+# -*- 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_Package_Package,net_oootypes,$(gb_DotnetLibrary_workdir)/net_oootypes))
+
+$(eval $(call gb_Package_add_files,net_oootypes,$(LIBO_SHARE_DOTNET_FOLDER),net_oootypes.dll))
+
+# vim: set noet sw=4 ts=4:
diff --git a/net_ure/Package_net_uretypes.mk b/net_ure/Package_net_uretypes.mk
new file mode 100644
index 000000000000..e39d1f51f26e
--- /dev/null
+++ b/net_ure/Package_net_uretypes.mk
@@ -0,0 +1,13 @@
+# -*- 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_Package_Package,net_uretypes,$(gb_DotnetLibrary_workdir)/net_uretypes))
+
+$(eval $(call gb_Package_add_files,net_uretypes,$(LIBO_SHARE_DOTNET_FOLDER),net_uretypes.dll))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5da3647c2ced..10d6b44a2785 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -621,6 +621,14 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Lib_Dir
     Value = "${BRAND_BASE_DIR}/" LIBO_LIB_FOLDER;
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Dotnet_Dir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "LO_DOTNET_DIR";
+    Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_DOTNET_FOLDER;
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Java_Dir
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;