ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

.NET Bindings: Move built .NET libraries into instdir

Browse Source 
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>
This commit is contained in:
RMZeroFour
2024-08-03 11:28:46 +02:00
committed by Hossein
parent 2ddeef9ff5
commit eca8414763
10 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Repository.mk
+5
View File
@@ -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 \
config_host.mk.in
+1
View File
@@ -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@
config_host/config_folders.h.in
+3
View File
@@ -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
configure.ac
+5
View File
@@ -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)
instsetoo_native/CustomTarget_setup.mk
+1
View File
@@ -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}' \
net_ure/Module_net_ure.mk
+3
View File
@@ -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
net_ure/Package_net_basetypes.mk
+13
View File
@@ -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:
net_ure/Package_net_oootypes.mk
+13
View File
@@ -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:
net_ure/Package_net_uretypes.mk
+13
View File
@@ -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:
scp2/source/ooo/common_brand.scp
+8
View File
@@ -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;