.gitignore | 1 - Makefile.in | 3 +-- Repository.mk | 1 - configure.ac | 6 ++---- sal/Library_sal.mk | 1 - scp2/source/ooo/ure.scp | 2 +- ure/Module_ure.mk | 1 - ure/Package_builddir_install.mk | 18 ------------------ ure/source/unorc.in | 23 ----------------------- 9 files changed, 4 insertions(+), 52 deletions(-)
New commits: commit 332f6a5f997677a3468c47a7b7d5b7c448809293 Author: Tor Lillqvist <t...@collabora.com> Date: Wed Sep 17 17:39:10 2014 +0300 The URE unorc is now set up in instsetoo_native/CustomTarget_setup.mk So no need to expand it at configure time in ure/source/unorc, and no need to handle the related builddir!=srcdir complications. Change-Id: Ifa34d25fab9ad2da13ed039bf6c5921b0fb58703 diff --git a/.gitignore b/.gitignore index a273e0b..b7ebd03 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,6 @@ /config_build.mk /configure /lo.xcent -/ure/source/unorc /Makefile /NEWS /TODO diff --git a/Makefile.in b/Makefile.in index a2271c0..9f5dd1a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -169,8 +169,7 @@ distclean : clean compilerplugins-clean $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ $(BUILDDIR)/ios/lo.xcconfig \ $(BUILDDIR)/lo.xcent \ - $(BUILDDIR)/sysui/desktop/macosx/Info.plist \ - $(BUILDDIR)/ure/source/unorc + $(BUILDDIR)/sysui/desktop/macosx/Info.plist find $(SRCDIR)/solenv/gdb -name "*.pyc" -exec rm {} \; # diff --git a/Repository.mk b/Repository.mk index 707a0c1..69ef8ec 100644 --- a/Repository.mk +++ b/Repository.mk @@ -733,7 +733,6 @@ endif $(eval $(call gb_Helper_register_packages_for_install,ure,\ ure_install \ - ure_builddir_install \ $(if $(ENABLE_JAVA),\ jvmfwk_javavendors \ jvmfwk_jreproperties \ diff --git a/configure.ac b/configure.ac index c423df9..23a1f20 100644 --- a/configure.ac +++ b/configure.ac @@ -4443,8 +4443,7 @@ if test "$cross_compiling" = "yes"; then instsetoo_native/util/openoffice.lst.in \ config_host/*.in \ sysui/desktop/macosx/Info.plist.in \ - ios/lo.xcconfig.in \ - ure/source/unorc.in) \ + ios/lo.xcconfig.in) \ | (cd CONF-FOR-BUILD && tar xf -) cp configure CONF-FOR-BUILD test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null @@ -12770,8 +12769,7 @@ AC_CONFIG_FILES([config_host.mk lo.xcent instsetoo_native/util/openoffice.lst sysui/desktop/macosx/Info.plist - ios/lo.xcconfig - ure/source/unorc]) + ios/lo.xcconfig]) AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_eot.h]) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 77d4176..e5c02c2 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,sal,\ # need the "ure-link" symlink to exist in INSTDIR so it's possible to link sal # FIXME: this creates cyclic dependency between ure and sal modules $(eval $(call gb_Library_use_package,sal,ure_install)) -$(eval $(call gb_Library_use_package,sal,ure_builddir_install)) $(eval $(call gb_Library_use_libraries,sal,\ $(if $(filter $(OS),ANDROID), \ diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk index 4d8c2c0..88cbc71 100644 --- a/ure/Module_ure.mk +++ b/ure/Module_ure.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,ure)) $(eval $(call gb_Module_add_targets,ure,\ Package_install \ - Package_builddir_install \ Rdb_ure \ )) diff --git a/ure/Package_builddir_install.mk b/ure/Package_builddir_install.mk deleted file mode 100644 index 49defbc..0000000 --- a/ure/Package_builddir_install.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -*- 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,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/source/unorc.in b/ure/source/unorc.in deleted file mode 100644 index bc0ecbe..0000000 --- a/ure/source/unorc.in +++ /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=${BRAND_BASE_DIR}/@LIBO_URE_LIB_FOLDER@ -URE_INTERNAL_JAVA_DIR=${BRAND_BASE_DIR}/@LIBO_URE_SHARE_JAVA_FOLDER@ -URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES} -UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES} -UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES} commit 5e648ef800a4cf853289e50744aa266ac4651fd1 Author: Tor Lillqvist <t...@collabora.com> Date: Wed Sep 17 16:47:25 2014 +0300 Fix incorrect pathname in comment Change-Id: Icd5bbba4e20fb5fbd24fede1318a2dd21a673601 diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 01e2cbd..bb60cc3 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -148,7 +148,7 @@ End // 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/unorc, +// 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. _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits