merge origin/master

4 files changed, 19 insertions, 41 deletions

diff --git a/ure/Makefile b/ure/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/ure/Makefile
+++ b/ure/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/ure/README b/ure/README
new file mode 100644
index 000000000000..f99174ab6530
--- /dev/null
+++ b/ure/README
@@ -0,0 +1,10 @@
+Contains the UNO Runtime Environment (URE).
+
+Beginnings of standalone UNO distribution.
+
+See also:
+[http://udk.openoffice.org/]
+
+You may also want to read the README located at:
+[git:ure/source/README]
+
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index 5566d4a2012d..3b952318998e 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -28,10 +28,11 @@
 $(eval $(call gb_Rdb_Rdb,ure/services))
 
 $(eval $(call gb_Rdb_add_components,ure/services,\
-    io/source/acceptor/acceptor \
+	$(if $(filter IOS,$(OS)),, \
+        io/source/acceptor/acceptor \
+        io/source/connector/connector) \
     binaryurp/source/binaryurp \
     stoc/util/bootstrap \
-    io/source/connector/connector \
     stoc/source/inspect/introspection \
     stoc/source/invocation_adapterfactory/invocadapt \
     stoc/source/invocation/invocation \
@@ -47,9 +48,9 @@ $(eval $(call gb_Rdb_add_components,ure/services,\
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Rdb_add_components,ure/services,\
+    javaunohelper/util/juh \
     stoc/source/javaloader/javaloader \
     stoc/source/javavm/javavm \
-    juh \
 ))
 endif
 
diff --git a/ure/source/README b/ure/source/README
index 1463e04fdbbb..1da0610ce716 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -68,7 +68,7 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/libjvmaccessgcc3.so.3  [private; Linux x86 only]
 /opt/openoffice.org/ure/lib/libjvmaccessC52.so.3  [private; Solaris only]
 /opt/openoffice.org/ure/lib/libjvmfwk.so.3  [private]
-/opt/openoffice.org/ure/lib/sunjavaplugin.so  [private]
+/opt/openoffice.org/ure/lib/libsunjavaplugin.so  [private]
 /opt/openoffice.org/ure/lib/JREProperties.class  [private]
 /opt/openoffice.org/ure/lib/jvmfwk3rc  [private]
 /opt/openoffice.org/ure/lib/libgcc3_uno.so  [private; Linux x86 only]
@@ -129,7 +129,7 @@ Program Files\URE\bin\store3.dll  [private]
 Program Files\URE\bin\xmlreader.dll  [private]
 Program Files\URE\bin\jvmaccess3MSC.dll  [private]
 Program Files\URE\bin\jvmfwk3.dll  [private]
-Program Files\URE\bin\sunjavaplugin.dll  [private]
+Program Files\URE\bin\libsunjavaplugin.dll  [private]
 Program Files\URE\bin\JREProperties.class  [private]
 Program Files\URE\bin\jvmfwk3.ini  [private]
 Program Files\URE\bin\msci_uno.dll  [private]
@@ -234,7 +234,7 @@ rpm --relocate on Linux.  The URE is designed so that multiple instances of the
 URE can coexist on a single system in different locations.
 
 On Windows, the path to the installed URE is stored in the registry under the
-path "HKEY_CLASSES_ROOT\Software\OpenOffice.org\URE" and key "Path".
+path "HKEY_CLASSES_ROOT\Software\LibreOffice\URE" and key "Path".
 
 
 UNO Deployment Variables