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

5 files changed, 23 insertions, 39 deletions

diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 3787bec50d79..c0a85f83c6be 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -33,8 +33,6 @@ Options:
         is.
 -c      Create the autoloader's dir if it does not exist. This option only
         makes sense if both -a and -i are used.
--f      Do not create subdirs in the autoloader's dir. This option is only
-        used during build.
 -h      Show this help text.
 -i dir  The dir where libreoffice is installed. Defaults to whatever -a is.
 -p dir  The dir where pretty printers are placed.
@@ -54,16 +52,12 @@ EOT
 }
 
 make_autoload() {
-    local dir="${DESTDIR}${autoloaddir}"
-    ${flat} || dir="${dir}/$2"
-    local lib="${dir}/$3"
+    local lib="${DESTDIR}${autoloaddir}/$2/$3"
     local merged="$4"
 
-    if ! ${flat}; then
-        local resolved="$(readlink "${DESTDIR}${installdir}/$2/$3")"
-        [ -n "$resolved" ] && lib=$resolved
-        dir="${lib%/*}"
-    fi
+    local resolved="$(readlink "${DESTDIR}${installdir}/$2/$3")"
+    [ -n "$resolved" ] && lib=$resolved
+    local dir="${lib%/*}"
 
     if ${create}; then
         mkdir -p "${dir}" || die "cannot create dir '${dir}'"
@@ -89,18 +83,12 @@ pythondir="${GDBDIR}"
 # Create autoload dir if it does not exist. This only makes sense when
 # installing into system gdb dir, so $autoloaddir must be absolute path.
 create=false
-# This option is only here to enable using the script during build of
-# solenv/gdb . We must (or, better, want to :) avoid using the
-# installation subpaths (like ure-link), because all libs in solver
-# are in the same dir.
-flat=false
 
 #  b de g  jklmno qrstuvwxyzABCDEFGHIJK MNOPQRSTUVWXYZ0123456789
 while getopts :a:cfhi:p:L opt; do
     case ${opt} in
         a) autoloaddir="${OPTARG}" ;;
         c) create=true ;;
-        f) flat=true ;;
         h) usage; exit ;;
         i) installdir="${OPTARG}" ;;
         p) pythondir="${OPTARG}" ;;
@@ -138,16 +126,16 @@ fi
 if [[ -n "${MERGELIBS}" ]]; then
     make_autoload merged program libmergedlo."$DYLIB" merge svl tl basegfx `[[ ${MERGELIBS} == "ALL" ]] && echo sw`
     if [[ ${MERGELIBS} == "ALL" ]]; then
-        make_autoload urelibs ure/lib liburelibs."$DYLIB" merge cppu sal
+        make_autoload urelibs program liburelibs."$DYLIB" merge cppu sal
     else
-        make_autoload cppu ure/lib libuno_cppu."$DYLIB".3
-        make_autoload sal ure/lib libuno_sal."$DYLIB".3
+        make_autoload cppu program libuno_cppu."$DYLIB".3
+        make_autoload sal program libuno_sal."$DYLIB".3
         make_autoload sw program libswlo."$DYLIB"
     fi
 else
     make_autoload basegfx program libbasegfxlo."$DYLIB"
-    make_autoload cppu ure/lib libuno_cppu."$DYLIB".3
-    make_autoload sal ure/lib libuno_sal."$DYLIB".3
+    make_autoload cppu program libuno_cppu."$DYLIB".3
+    make_autoload sal program libuno_sal."$DYLIB".3
     make_autoload svl program libsvllo."$DYLIB"
     make_autoload sw program libswlo."$DYLIB"
     make_autoload tl program libtllo."$DYLIB"
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 7a2ac8d30a1e..282b02a93e9a 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -58,7 +58,7 @@ else
 	$(file >>$@,$(foreach lib,$(gb_Library_MODULE_$*),$(call gb_AutoInstall__gen_lib,$(lib))))
 endif
 	$(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\
-		echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../ure-link/lib/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;)
+		echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../program/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;)
 	$(foreach exe,$(gb_Executable_MODULE_$*),\
 		echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst .,_,$(subst -,_,$(exe))),$(call gb_Executable_get_filename,$(exe)))" >> $@;)
 	$(foreach jar,$(gb_Jar_MODULE_$*),\
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 2c20e2920a40..ee133cb85b06 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -7,13 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-gb_Pagein_UREPATH := ../ure-link/lib/
-
 gb_Pagein__is_library = $(filter $(1),$(gb_Library_KNOWNLIBS))
 
-gb_Pagein__get_libdir = $(if $(filter URELIB,$(call gb_Library_get_layer,$(1))),$(call gb_Pagein_UREPATH))
-
-gb_Pagein__make_library_path = $(call gb_Pagein__get_libdir,$(1))$(call gb_Library_get_runtime_filename,$(1))
+gb_Pagein__make_library_path = $(call gb_Library_get_runtime_filename,$(1))
 
 gb_Pagein__make_path = \
 $(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1)),$(1))
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index b68c68ef7e3b..78698db645bf 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -103,9 +103,9 @@ endef
 
 gb_LinkTarget__RPATHS := \
 	URELIB:\dORIGIN \
-	UREBIN:\dORIGIN/../ure-link/lib \
-	OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
-	SDKBIN:\dORIGIN/../../ure-link/lib \
+	UREBIN:\dORIGIN \
+	OOO:\dORIGIN \
+	SDKBIN:\dORIGIN/../../program \
 	OXT: \
 	NONE:\dORIGIN/../Library \
 
@@ -143,7 +143,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		-Wl$(COMMA)-zrecord \
 		$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
 		-o $(1) \
-	$(if $(SOVERSIONSCRIPT),&& ln -sf ../../ure-link/lib/$(notdir $(1)) $(ILIBTARGET)))
+	$(if $(SOVERSIONSCRIPT),&& ln -sf ../../program/$(notdir $(1)) $(ILIBTARGET)))
 	$(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\
 		$(READELF) -d $(1) | grep SONAME > $(WORKDIR)/LinkTarget/$(2).exports.tmp; \
 		$(NM) --dynamic --extern-only --defined-only --format=posix $(1) \
@@ -215,7 +215,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
 define gb_Library__get_rpath
-$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' -L$(INSTDIR)/ure/lib -L$(INSTDIR)/program))
+$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' -L$(INSTDIR)/program))
 endef
 
 define gb_Library_get_rpath
@@ -245,7 +245,7 @@ gb_Executable_LAYER := \
 
 
 define gb_Executable__get_rpath
-$(strip -Wl,-z,origin $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') -L$(INSTDIR)/ure/lib -L$(INSTDIR)/program)
+$(strip -Wl,-z,origin $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') -L$(INSTDIR)/program)
 endef
 
 define gb_Executable_get_rpath
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 25487cba94a1..bf10e998f5e6 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -98,9 +98,9 @@ endef
 
 gb_LinkTarget__RPATHS := \
 	URELIB:\dORIGIN \
-	UREBIN:\dORIGIN/../ure-link/lib \
-	OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
-	SDKBIN:\dORIGIN/../../ure-link/lib \
+	UREBIN:\dORIGIN \
+	OOO:\dORIGIN \
+	SDKBIN:\dORIGIN/../../program \
 	OXT: \
 	NONE:\dORIGIN/../Library \
 
@@ -142,7 +142,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		-Wl$(COMMA)--no-as-needed \
 		$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
 		-o $(1) \
-	$(if $(SOVERSIONSCRIPT),&& ln -sf ../../ure-link/lib/$(notdir $(1)) $(ILIBTARGET)))
+	$(if $(SOVERSIONSCRIPT),&& ln -sf ../../program/$(notdir $(1)) $(ILIBTARGET)))
 	$(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\
 		$(READELF) -d $(1) | grep SONAME > $(WORKDIR)/LinkTarget/$(2).exports.tmp; \
 		$(NM) --dynamic --extern-only --defined-only --format=posix $(1) \
@@ -209,7 +209,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
 define gb_Library__get_rpath
-$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' -Wl,-rpath-link,$(INSTDIR)/ure/lib -Wl,-rpath-link,$(INSTDIR)/program))
+$(if $(1),$(strip -Wl,-z,origin '-Wl,-rpath,$(1)' -Wl,-rpath-link,$(INSTDIR)/program))
 endef
 
 define gb_Library_get_rpath
@@ -239,7 +239,7 @@ gb_Executable_LAYER := \
 
 
 define gb_Executable__get_rpath
-$(strip -Wl,-z,origin $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') -Wl,-rpath-link,$(INSTDIR)/ure/lib -Wl,-rpath-link,$(INSTDIR)/program)
+$(strip -Wl,-z,origin $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') -Wl,-rpath-link,$(INSTDIR)/program)
 endef
 
 define gb_Executable_get_rpath