Undo basis/brand split: move dynamic libraries from basis to brand.

10 files changed, 17 insertions, 42 deletions

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index fa2e0c64b995..2a43dfd5df50 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -80,7 +80,8 @@ my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 my $dllre = '\.so$';
 
 my %replaceable = (
-    $program_dir => "($dllre|\\.rdb)",
+    $brand_program_dir => "$dllre",
+    $program_dir => "\\.rdb",
     $ure_lib_dir => "($dllre|\\.so\\.3\$)",
     $program_dir . '/resource' => '\.res$',
     $program_dir . '/classes' => '\.jar$',
@@ -338,7 +339,7 @@ sub link_pagein_files()
 {
     print "pagein case:";
     my $src  = "$OOO_BUILD/solver/$TARGET/bin";
-    my $dest = "$OOO_INSTALL/" . $program_dir;
+    my $dest = "$OOO_INSTALL/" . $brand_program_dir;
     for my $c ('calc', 'draw', 'impress', 'writer', 'common') {
 	do_link ($src, $dest, "pagein-$c", "pagein-$c");
     }
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 343f9538c57f..1374be010894 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -33,15 +33,14 @@ sub action($$$)
     my %action =
         ('app/UREBIN/URELIB' => '@executable_path/../lib',
          'app/OOO/URELIB' => '@executable_path/../ure-link/lib',
-         'app/OOO/OOO' => '@executable_path',
          'app/SDK/URELIB' => '@executable_path/../../ure-link/lib',
          'app/BRAND/URELIB' => '@executable_path/../basis-link/ure-link/lib',
-         'app/BRAND/OOO' => '@executable_path/../basis-link/program',
+         'app/BRAND/OOO' => '@executable_path',
          'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
          'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
          'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__',
          'shl/URELIB/URELIB' => '@loader_path',
-         'shl/OOO/URELIB' => '@loader_path/../ure-link/lib',
+         'shl/OOO/URELIB' => '@loader_path/../basis-link/ure-link/lib',
          'shl/OOO/OOO' => '@loader_path',
          'shl/LOADER/LOADER' => '@loader_path',
          'shl/OXT/URELIB' => '@executable_path/urelibs',
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index db6d961ef27e..dd6c1ccf1dae 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -33,7 +33,6 @@
 #  gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib
 #  gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library
 # defined by platform
-#  gb_Library_COMPONENTPREFIXES
 #  gb_Library_DEFS
 #  gb_Library_DLLFILENAMES
 #  gb_Library_FILENAMES
@@ -93,9 +92,13 @@ gb_Library__get_componentprefix = \
 
 gb_Library__get_layer_componentprefix = \
 	$(patsubst $(1):%,%,$(or \
-		$(filter $(1):%,$(gb_Library_COMPONENTPREFIXES)), \
+		$(filter $(1):%,$(gb_Library__COMPONENTPREFIXES)), \
 		$(call gb_Output_error,no ComponentTarget native prefix for layer '$(1)')))
 
+gb_Library__COMPONENTPREFIXES := \
+    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+    OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
+    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
 
 define gb_Library__forward_to_Linktarget
 gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Library_get_linktargetname,$$(1)),$$(2),$$(3))
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index f9c903c06d71..e9653eda5d1f 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -426,10 +426,6 @@ endef
 # ComponentTarget
 
 gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-	NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
 # UnoApiTarget
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index aa560a3a0296..01ff9d0613a2 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -273,10 +273,11 @@ gb_LinkTarget__RPATHS := \
 	OOO:@__________________________________________________OOO/ \
 	BRAND: \
 	SDKBIN: \
-	NONE: \
+	NONE:@__VIA_LIBRARY_PATH__@ \
 
 define gb_LinkTarget__get_installname
-$(if $(2),-install_name '$(2)$(1)',)
+$(if $(2),-install_name '$(2)$(1)',$(error
+    cannot determine -install_name for $(2)))
 endef
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
@@ -514,10 +515,6 @@ endef
 # ComponentTarget
 
 gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-	NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
 # UnoApiTarget
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index bab6eef60f55..313dae8153c2 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -189,8 +189,8 @@ endef
 gb_LinkTarget__RPATHS := \
 	URELIB:\dORIGIN \
 	UREBIN:\dORIGIN/../lib:\dORIGIN \
-	OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
-	BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
+	OOO:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
+	BRAND:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
 	SDKBIN:\dORIGIN/../../ure-link/lib \
 	NONE:\dORIGIN/../lib:\dORIGIN \
 
@@ -397,10 +397,6 @@ endef
 # ComponentTarget
 
 gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
 # UnoApiTarget
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 06a75a2ae007..22e3835c7d59 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -277,8 +277,8 @@ endef
 gb_LinkTarget__RPATHS := \
 	URELIB:\dORIGIN \
 	UREBIN:\dORIGIN/../lib:\dORIGIN \
-	OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
-	BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
+	OOO:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
+	BRAND:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
 	SDKBIN:\dORIGIN/../../ure-link/lib \
 	NONE:\dORIGIN/../lib:\dORIGIN \
 
@@ -483,10 +483,6 @@ endef
 # ComponentTarget
 
 gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
 # UnoApiTarget
 
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 3dd705748f22..3ada7c3a0984 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -745,11 +745,6 @@ endif
 # See comment for svidl.exe
 gb_XSLTPROCPRECOMMAND :=
 
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 934588a218bf..3b4b856fee2d 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -667,10 +667,6 @@ endif
 # ComponentTarget
 
 gb_XSLTPROCPRECOMMAND := $(gb_Helper_set_ld_path)
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-	NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
 # UnoApiTarget
 
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 0b534297120d..661861b9b8b7 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1386,11 +1386,7 @@ CPPUNIT_CFLAGS =
 
 COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/
 COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/
-.IF "$(OS)" == "WNT"
 COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/
-.ELSE
-COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/
-.END
 COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/
 COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule:
 COMPONENTPREFIX_INBUILD_NATIVE = \