From 7d5b30b419fb49232f3476d9fb8899fe3754d96d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 18 Sep 2014 18:07:41 +0200 Subject: Use instsetoo_native-generated uno ini-file for both instdir and instsets Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656 --- Repository.mk | 1 + instsetoo_native/Module_instsetoo_native.mk | 1 + instsetoo_native/Package_setup.mk | 4 -- instsetoo_native/Package_setup_ure.mk | 16 ++++++ scp2/source/ooo/ure.scp | 81 ----------------------------- testtools/CustomTarget_uno_test.mk | 2 +- 6 files changed, 19 insertions(+), 86 deletions(-) create mode 100644 instsetoo_native/Package_setup_ure.mk diff --git a/Repository.mk b/Repository.mk index 69ef8ec0bc04..7b86d588c68c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -732,6 +732,7 @@ $(eval $(call gb_Helper_register_jars,NONE,\ endif $(eval $(call gb_Helper_register_packages_for_install,ure,\ + instsetoo_native_setup_ure \ ure_install \ $(if $(ENABLE_JAVA),\ jvmfwk_javavendors \ diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk index ea540ebc6a1b..15662503d3cc 100644 --- a/instsetoo_native/Module_instsetoo_native.mk +++ b/instsetoo_native/Module_instsetoo_native.mk @@ -20,6 +20,7 @@ endif $(eval $(call gb_Module_add_targets,instsetoo_native,\ CustomTarget_setup \ Package_setup \ + Package_setup_ure \ )) # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 9d44533ba19f..1f41c3d62a7c 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -22,8 +22,4 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\ $(call gb_Helper_get_rcfile,version) \ )) -$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_URE_ETC_FOLDER), \ - $(call gb_Helper_get_rcfile,uno) \ -)) - # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/Package_setup_ure.mk b/instsetoo_native/Package_setup_ure.mk new file mode 100644 index 000000000000..a0c7216fc1d0 --- /dev/null +++ b/instsetoo_native/Package_setup_ure.mk @@ -0,0 +1,16 @@ +# -*- 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,instsetoo_native_setup_ure,$(call gb_CustomTarget_get_workdir,instsetoo_native/setup))) + +$(eval $(call gb_Package_add_files,instsetoo_native_setup_ure,$(LIBO_URE_ETC_FOLDER), \ + $(call gb_Helper_get_rcfile,uno) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index bb60cc36d919..18a15d7a7a06 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -146,87 +146,6 @@ End // Private Dynamic Libraries: -// We set up the URE unorc/uno.ini in scp2 because then it is easy to -// get the platform differences into it compared to constructing it in -// Makefiles etc. On OS X it goes into .app/Contents/Resources/ure/etc/unorc, -// on other Unix into .../ure/lib/unorc and on Windows into -// .../ure/bin/unorc. The latter two locations are factored out as -// SCP2_URE_DL_DIR. - -// FIXME: remove this completely? -// currently getting 'destination' at file not unique error on WNT -// but needs handling of MACOSX then... -#ifndef WNT -Profile gid_Profile_Dl_Uno_Ini - ModuleID = gid_Module_Root_Ure_Hidden; -#if defined MACOSX - Dir = gid_Brand_Dir_Share_Ure_Etc; -#else - Dir = SCP2_URE_DL_DIR; -#endif - Name = PROFILENAME(uno); -End - -ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir - ModuleID = gid_Module_Root_Ure_Hidden; - ProfileID = gid_Profile_Dl_Uno_Ini; - Section = "Bootstrap"; - Key = "URE_INTERNAL_LIB_DIR"; -#if defined MACOSX - Value = "${ORIGIN}/../../../Frameworks"; -#else - Value = "${ORIGIN}"; -#endif -End - -ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir - ModuleID = gid_Module_Root_Ure_Hidden; - ProfileID = gid_Profile_Dl_Uno_Ini; - Section = "Bootstrap"; - Key = "URE_INTERNAL_JAVA_DIR"; -#if defined MACOSX - Value = "${ORIGIN}/../../java"; -#elif defined WNT - Value = "${ORIGIN}/../java"; -#else - Value = "${ORIGIN}/../share/java"; -#endif -End - -ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Classpath - ModuleID = gid_Module_Root_Ure_Hidden; - ProfileID = gid_Profile_Dl_Uno_Ini; - Section = "Bootstrap"; - Key = "URE_INTERNAL_JAVA_CLASSPATH"; - Value = "${URE_MORE_JAVA_TYPES}"; -End - -ProfileItem gid_Profileitem_Dl_Uno_Uno_Types - ModuleID = gid_Module_Root_Ure_Hidden; - ProfileID = gid_Profile_Dl_Uno_Ini; - Section = "Bootstrap"; - Key = "UNO_TYPES"; -#if defined WNT - Value = "${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}"; -#else - Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}"; -#endif -End - -ProfileItem gid_Profileitem_Dl_Uno_Uno_Services - ModuleID = gid_Module_Root_Ure_Hidden; - ProfileID = gid_Profile_Dl_Uno_Ini; - Section = "Bootstrap"; - Key = "UNO_SERVICES"; -#if defined WNT - Value = "${ORIGIN}/../misc/services.rdb ${URE_MORE_SERVICES}"; -#else - Value = "${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}"; -#endif -End -#endif - - #if defined _MSC_VER File gid_File_Dl_Cli_Ure_Assembly TXT_FILE_BODY; diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk index 016eda3640d1..4b960e46ecb3 100644 --- a/testtools/CustomTarget_uno_test.mk +++ b/testtools/CustomTarget_uno_test.mk @@ -15,7 +15,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test)) $(call gb_CustomTarget_get_target,testtools/uno_test) : \ $(call gb_Executable_get_runtime_dependencies,uno) \ $(call gb_InternalUnoApi_get_target,bridgetest) \ - $(call gb_Package_get_target,instsetoo_native_setup) \ + $(call gb_Package_get_target,instsetoo_native_setup_ure) \ $(call gb_Rdb_get_target,uno_services) \ $(call gb_Rdb_get_target,ure/services) \ $(call gb_UnoApi_get_target,udkapi) -- cgit v1.2.3