Kaydet (Commit) 7d5b30b4 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Use instsetoo_native-generated uno ini-file for both instdir and instsets

Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656
üst f02cef96
......@@ -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 \
......
......@@ -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:
......@@ -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:
# -*- 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:
......@@ -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";