instsetoo_native/CustomTarget_setup.mk | 43 +++++++++++++++++++++------------
instsetoo_native/Package_setup.mk | 4 +++
ure/Package_builddir_install.mk | 2 +
ure/Package_install.mk | 1
ure/source/uno.ini | 23 -----------------
5 files changed, 34 insertions(+), 39 deletions(-)
New commits:
commit d1a734cef0ed5d655774c2f8ac7a2203f8c0a385
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 16 16:46:01 2014 +0200
Create instdir uno ini-file from instsetoo_native
...like is done for most other ini-files too, with entries indentical to the
ones in scp2/source/ooo/ure.scp. (And sort ini-files lexicographically
again in
instsetoo_native/*.mk, broken with recent louno rename).
Leave ure/source/unorc.in and ure/Pacakge_builddir_install.mk around for the
cross-compilation case only.
Change-Id: Ic07e036ef126db1aee2c0f6b726c2b86c2536c53
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 662b3bd..ec69b17 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -12,21 +12,23 @@ $(eval $(call
gb_CustomTarget_CustomTarget,instsetoo_native/setup))
$(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
+ $(call gb_Helper_get_rcfile,louno) \
$(if $(ENABLE_OOENV),ooenv) \
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call
gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
$(call gb_Helper_get_rcfile,setup) \
$(call gb_Helper_get_rcfile,soffice) \
- $(call gb_Helper_get_rcfile,louno) \
+ $(call gb_Helper_get_rcfile,uno) \
$(call gb_Helper_get_rcfile,version) \
))
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,bootstrap) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,fundamental) \
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,louno) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,pythonloader.uno) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,louno) \
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,uno) \
: $(SRCDIR)/instsetoo_native/CustomTarget_setup.mk
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,bootstrap) :
@@ -70,6 +72,24 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_MORE_TYPES=<$$ORIGIN/types>* $${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call
gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_TYPES}' \
) > $@
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,louno) :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ ( \
+ echo '[Bootstrap]' \
+ && echo
'PKG_BundledUnoFile=$$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call
gb_Helper_get_rcfile,uno)' \
+ && echo
'PKG_SharedUnoFile=$$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call
gb_Helper_get_rcfile,uno)' \
+ && echo
'PKG_UserUnoFile=$$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call
gb_Helper_get_rcfile,uno)' \
+ && echo
'BAK_EXTENSIONS=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/bak' \
+ && echo
'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/$(LIBO_SHARE_FOLDER)/extensions' \
+ && echo
'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/bundled' \
+ && echo
'TMP_EXTENSIONS=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/tmp' \
+ && echo
'SHARED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/shared' \
+ && echo
'UNO_SHARED_PACKAGES=$$BRAND_BASE_DIR/$(LIBO_SHARE_FOLDER)/uno_packages' \
+ && echo 'UNO_SHARED_PACKAGES_CACHE=$$UNO_SHARED_PACKAGES/cache'
\
+ && echo
'UNO_USER_PACKAGES=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/uno_packages' \
+ && echo 'UNO_USER_PACKAGES_CACHE=$$UNO_USER_PACKAGES/cache' \
+ ) > $@
+
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
@@ -131,22 +151,15 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call
gb_Helper_get_rcfile,fundamental)' \
) > $@
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,louno) :
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,uno) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
echo '[Bootstrap]' \
- && echo
'PKG_BundledUnoFile=$$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call
gb_Helper_get_rcfile,uno)' \
- && echo
'PKG_SharedUnoFile=$$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call
gb_Helper_get_rcfile,uno)' \
- && echo
'PKG_UserUnoFile=$$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/$(call
gb_Helper_get_rcfile,uno)' \
- && echo
'BAK_EXTENSIONS=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/bak' \
- && echo
'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/$(LIBO_SHARE_FOLDER)/extensions' \
- && echo
'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/bundled' \
- && echo
'TMP_EXTENSIONS=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/tmp' \
- && echo
'SHARED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/extensions/shared' \
- && echo
'UNO_SHARED_PACKAGES=$$BRAND_BASE_DIR/$(LIBO_SHARE_FOLDER)/uno_packages' \
- && echo 'UNO_SHARED_PACKAGES_CACHE=$$UNO_SHARED_PACKAGES/cache'
\
- && echo
'UNO_USER_PACKAGES=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/uno_packages' \
- && echo 'UNO_USER_PACKAGES_CACHE=$$UNO_USER_PACKAGES/cache' \
+ && echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter
MACOSX,$(OS)),/../../Frameworks)' \
+ && echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out
MACOSX WNT,$(OS)),/share)/java' \
+ && echo 'URE_INTERNAL_JAVA_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \
+ && echo 'UNO_TYPES=$${ORIGIN}/$(if $(filter-out
MACOSX,$(OS)),$(if $(filter-out WNT,$(OS)),../share/)misc/)types.rdb
$${URE_MORE_TYPES}' \
+ && echo 'UNO_SERVICES=$${ORIGIN}/../$(if $(filter-out
WNT,$(OS)),share/)misc/services.rdb $${URE_MORE_SERVICES}' \
) > $@
.PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,version)
diff --git a/instsetoo_native/Package_setup.mk
b/instsetoo_native/Package_setup.mk
index 1f41c3d..9d44533 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -22,4 +22,8 @@ $(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/ure/Package_builddir_install.mk b/ure/Package_builddir_install.mk
index c109bd4..49defbc 100644
--- a/ure/Package_builddir_install.mk
+++ b/ure/Package_builddir_install.mk
@@ -9,8 +9,10 @@
$(eval $(call gb_Package_Package,ure_builddir_install,$(BUILDDIR)/ure/source))
+ifneq ($(CROSS_COMPILING),)
$(eval $(call
gb_Package_add_files,ure_builddir_install,$(LIBO_URE_ETC_FOLDER),\
$(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),$(call
gb_Helper_get_rcfile,uno)) \
))
+endif
# vim:set noet sw=4 ts=4:
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 9834c63..16acfed 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -24,7 +24,6 @@ endif
$(eval $(call gb_Package_add_files,ure_install,$(LIBO_URE_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,jvmfwk3) \
- $(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),,$(call
gb_Helper_get_rcfile,uno)) \
))
# vim:set noet sw=4 ts=4:
diff --git a/ure/source/uno.ini b/ure/source/uno.ini
deleted file mode 100644
index 6c04cae..0000000
--- a/ure/source/uno.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-[Bootstrap]
-URE_INTERNAL_LIB_DIR=${ORIGIN}
-URE_INTERNAL_JAVA_DIR=${ORIGIN}/../java
-URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
-UNO_TYPES=${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}
-UNO_SERVICES=${ORIGIN}/../misc/services.rdb ${URE_MORE_SERVICES}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
