New LO_{LIB,JAVA}_DIR make special inbuild component handling superfluous.

7 files changed, 11 insertions, 31 deletions

diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 47b9f0f2b616..f84072666cd1 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -43,16 +43,8 @@ $(call gb_ComponentTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),CMP,1)
 	rm -f $(call gb_ComponentTarget_get_outdir_target,$*) \
 		$(call gb_ComponentTarget_get_target,$*) \
-		$(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \
-		$(call gb_ComponentTarget_get_inbuild_target,$*) \
 
 
-# creates 2 componentfiles: the first is for the installation set,
-# the second is for using the component during the build.
-# bit of a hack, hopefully inbuild can be removed when solver layout is fixed.
-$(call gb_ComponentTarget_get_inbuild_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET)
-	$(call gb_ComponentTarget__command,$@,$<,$*)
-
 $(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET)
 	$(call gb_ComponentTarget__command,$@,$<,$*)
 
@@ -65,12 +57,8 @@ $(call gb_ComponentTarget_get_outdir_target,%) :
 define gb_ComponentTarget_ComponentTarget
 $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
 $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
-$(call gb_ComponentTarget_get_inbuild_target,$(1)) : COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
-$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
 $(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
-$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1))
 $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)),$(1))
 
 endef
 
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index d7911cfb5b5c..8cc3d9901ba9 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -73,7 +73,7 @@ $(if $(strip $(UNO_SERVICES)),\
 		$(foreach rdb,$(UNO_SERVICES),\
 			$(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \
 $(if $(URE),\
-	$(foreach dir,URE_INTERNAL_LIB_DIR BRAND_BASE_DIR,\
+	$(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
 		-env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR))))
 endef
 
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 54d6a238e30b..6a108ba7e1a3 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -164,10 +164,9 @@ endef
 
 # possible directories for jar files containing UNO services 
 gb_Jar_COMPONENTPREFIXES := \
-    OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/classes/ \
+    OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \
     URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
     OXT:./ \
-    INTERN:vnd.sun.star.expand:\dOOO_INBUILD_JAVA_DIR/
 
 # get component prefix from layer name ("OOO", "URE", "OXT", "INTERN")
 gb_Jar__get_componentprefix = \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 39afc5aa42ab..3e352280ebc1 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -81,8 +81,7 @@ define gb_Library_set_componentfile
 $(call gb_ComponentTarget_ComponentTarget,$(or $(strip $(3)),$(strip $(2))),$(call gb_Library__get_componentprefix,$(1)),\
 	$(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter $(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1))),$(2))
 $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \
-	$(call gb_ComponentTarget_get_outdir_target,$(2)) \
-	$(call gb_ComponentTarget_get_outdir_inbuild_target,$(2))
+	$(call gb_ComponentTarget_get_outdir_target,$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(or $(strip $(3)),$(strip $(2))))
 
 endef
@@ -97,8 +96,8 @@ gb_Library__get_layer_componentprefix = \
 		$(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/ \
+    NONE:vnd.sun.star.expand:\dLO_LIB_DIR/ \
+    OOO:vnd.sun.star.expand:\dLO_LIB_DIR/ \
     URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
 
 define gb_Library__forward_to_Linktarget
diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 12d1a4c1aa88..83a9c3319e91 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -41,10 +41,8 @@ $(call gb_RdbTarget_get_target,%) :
 		$(gb_AWK) -- \
 			' BEGIN { RS=">"; } \
 			/^<\?xml version.*/ { next; } \
-			/.*[^\r\n\t\s].*/ { \
-				gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); \
-				print $$0 ">"; \
-			}' $(call gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS)) \
+			/.*[^\r\n\t\s].*/ { print $$0 ">"; }' \
+            $(call gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS)) \
 			>> $@ && \
 		echo '</components>' >> $@)
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 2fcac95027eb..afd79ba48aa6 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -29,7 +29,6 @@
 # outdir target pattern
 
 gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
-gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component
 gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
 gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
 gb_Extension_get_outdir_target = $(OUTDIR)/bin/$(1).oxt
@@ -71,7 +70,6 @@ gb_AsmObject_get_target = $(WORKDIR)/AsmObject/$(1).o
 gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
 gb_GenCObject_get_target = $(WORKDIR)/GenCObject/$(1).o
 gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
-gb_ComponentTarget_get_inbuild_target = $(WORKDIR)/ComponentTarget/$(1).inbuild.component
 gb_ComponentsTarget_get_target = $(WORKDIR)/ComponentsTarget/$(1).components
 gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
 gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 45f85c75cec9..2a05d2265868 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1358,13 +1358,11 @@ CPPUNIT_CFLAGS =
 
 COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/
 COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/
-COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/
-COMPONENTPREFIX_BASIS_JAVA = \
-    vnd.sun.star.expand:$$BRAND_BASE_DIR/program/classes/
+COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/
+COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$LO_JAVA_DIR/
 COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule:
-COMPONENTPREFIX_INBUILD_NATIVE = \
-    vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/
-COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$OOO_INBUILD_JAR_DIR/
+COMPONENTPREFIX_INBUILD_NATIVE = vnd.sun.star.expand:$$LO_LIB_DIR/
+COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$LO_JAVA_DIR/
 COMPONENTPREFIX_EXTENSION = ./
 
 # workaround for strange dmake bug: