Fold URE: Linux ure/lib/* -> program/

The ../../../program/ links in the URE jar Class-Paths are a temporary kludge
(and juh.jar had lacked adaption for Mac OS X).

Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d

4 files changed, 9 insertions, 40 deletions

diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 725077766304..7571e5684ac0 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -21,8 +21,4 @@ else
 $(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link,ure))
 endif
 
-$(eval $(call gb_Package_add_files,ure_install,$(LIBO_URE_ETC_FOLDER),\
-	$(call gb_Helper_get_rcfile,jvmfwk3) \
-))
-
 # vim:set noet sw=4 ts=4:
diff --git a/ure/source/jvmfwk3.ini b/ure/source/jvmfwk3.ini
deleted file mode 100644
index 18a2bb5f88e4..000000000000
--- a/ure/source/jvmfwk3.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Bootstrap]
-UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../misc/javavendors.xml
-UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}
-UNO_JAVA_JFW_USER_DATA=${URE_OVERRIDE_JAVA_JFW_USER_DATA}
-UNO_JAVA_JFW_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS}
diff --git a/ure/source/jvmfwk3rc b/ure/source/jvmfwk3rc
deleted file mode 100644
index 01b21ce0a23d..000000000000
--- a/ure/source/jvmfwk3rc
+++ /dev/null
@@ -1,22 +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]
-UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../share/misc/javavendors.xml
-UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}
-UNO_JAVA_JFW_USER_DATA=${URE_OVERRIDE_JAVA_JFW_USER_DATA}
-UNO_JAVA_JFW_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS}
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index f239ab9f75ef..a5b8ae9903e3 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -55,7 +55,7 @@ test-javanative: out.pln/runner.jar out.pln/javanative.jar \
             out.pln/types.rdb out.pln/services.rdb
 	URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
             URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb \
-            $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib java \
+            $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/program java \
             -jar out.pln/runner.jar file://$(URE_HOME)/ure-link/share/java/ \
             file://$(PWD)/out.pln/javanative.jar
 
@@ -121,14 +121,14 @@ out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \
 
 
 out.pln/cpputypes.cppumaker.flag: | out.pln
-	LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/cppumaker \
+	LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/cppumaker \
             -O./out.pln/include/cpputypes \
             '-Tcom.sun.star.beans.Introspection;com.sun.star.beans.theIntrospection;com.sun.star.bridge.BridgeFactory;com.sun.star.bridge.UnoUrlResolver;com.sun.star.connection.Acceptor;com.sun.star.connection.Connector;com.sun.star.io.Pipe;com.sun.star.io.TextInputStream;com.sun.star.io.TextOutputStream;com.sun.star.java.JavaVirtualMachine;com.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.loader.Java;com.sun.star.loader.SharedLibrary;com.sun.star.reflection.ProxyFactory;com.sun.star.registry.ImplementationRegistration;com.sun.star.registry.SimpleRegistry;com.sun.star.registry.XRegistryKey;com.sun.star.script.Converter;com.sun.star.script.Invocation;com.sun.star.security.AccessController;com.sun.star.security.Policy;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.NamingService;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.uri.ExternalUriReferenceTranslator;com.sun.star.uri.UriReferenceFactory;com.sun.star.uri.VndSunStarPkgUrlReferenceFactory;com.sun.star.util.theMacroExpander' \
             $(URE_HOME)/ure-link/share/misc/types.rdb
 	touch $@
 
 out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln
-	LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/cppumaker \
+	LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/cppumaker \
             -O./out.pln/include/types $< \
             -X$(URE_HOME)/ure-link/share/misc/types.rdb
 	touch $@
@@ -247,7 +247,7 @@ out.pln/types.mf: types.mf.template | out.pln
 
 out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class
 	rm -rf out.pln/class/types
-	LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/javamaker \
+	LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/javamaker \
             -O./out.pln/class/types $< \
             -X$(URE_HOME)/ure-link/share/misc/types.rdb
 	touch $@
@@ -257,7 +257,7 @@ out.pln/types.rdb: out.pln/types.urd | out.pln
 	$(URE_HOME)/program/regmerge $@ /UCR $<
 
 out.pln/types.urd: types.idl | out.pln
-	LD_LIBRARY_PATH=$(URE_HOME)/ure-link/lib $(SDK_HOME)/bin/idlc -O$(@D) \
+	LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/idlc -O$(@D) \
             -I$(SDK_HOME)/idl -cid -we $<
 
 
@@ -267,16 +267,16 @@ out.pln/services.rdb: services.rdb.in | out.pln/cpptest.uno.so \
 
 
 out.pln/lib/libuno_cppu.so: | out.pln/lib
-	ln -fs $(URE_HOME)/ure-link/lib/libuno_cppu.so.3 $@
+	ln -fs $(URE_HOME)/program/libuno_cppu.so.3 $@
 
 out.pln/lib/libuno_cppuhelpergcc3.so: | out.pln/lib
-	ln -fs $(URE_HOME)/ure-link/lib/libuno_cppuhelpergcc3.so.3 $@
+	ln -fs $(URE_HOME)/program/libuno_cppuhelpergcc3.so.3 $@
 
 out.pln/lib/libuno_sal.so: | out.pln/lib
-	ln -fs $(URE_HOME)/ure-link/lib/libuno_sal.so.3 $@
+	ln -fs $(URE_HOME)/program/libuno_sal.so.3 $@
 
 out.pln/lib/libuno_salhelpergcc3.so: | out.pln/lib
-	ln -fs $(URE_HOME)/ure-link/lib/libuno_salhelpergcc3.so.3 $@
+	ln -fs $(URE_HOME)/program/libuno_salhelpergcc3.so.3 $@
 
 
 out.pln: