diff options
| -rw-r--r-- | cppuhelper/qa/propertysetmixin/makefile.mk | 4 | ||||
| -rwxr-xr-x | i18npool/source/localedata/Makefile | 6 | ||||
| -rw-r--r-- | pyuno/source/loader/makefile.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 16 | ||||
| -rw-r--r-- | solenv/gbuild/ComponentTarget.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/RdbTarget.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 10 |
11 files changed, 33 insertions, 37 deletions
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index ea1c1f9f2d97..02bb6296a165 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -135,7 +135,7 @@ test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) $(MISC)/$(TARGET)/$(TARGET).uno.jar \ '-env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb'\ -env:URE_INTERNAL_LIB_DIR=$(my_file)$(SOLARSHAREDBIN) \ -env:URE_INTERNAL_JAVA_DIR=$(my_file)$(SOLARBINDIR) \ - -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(PWD)/$(DLLDEST) \ - -env:OOO_INBUILD_JAR_DIR=$(my_file)$(PWD)/$(MISC)/$(TARGET) + -env:LO_LIB_DIR=$(my_file)$(PWD)/$(DLLDEST) \ + -env:LO_JAVA_DIR=$(my_file)$(PWD)/$(MISC)/$(TARGET) .END diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile index 51c6c3af6df2..b1fa0a917da7 100755 --- a/i18npool/source/localedata/Makefile +++ b/i18npool/source/localedata/Makefile @@ -31,7 +31,7 @@ all : $(patsubst %.xml,localedata_%.cxx,$(notdir $(wildcard $(SRC_ROOT)/i18npool include $(GBUILDDIR)/gbuild_simple.mk my_file := file://$(if $(filter $(OS_FOR_BUILD),WNT),/) -my_components := component/sax/source/expatwrap/expwrap.inbuild.component +my_components := component/sax/source/expatwrap/expwrap.component localedata_%.cxx : localedata_%_invis.cxx sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@ @@ -40,11 +40,11 @@ localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data) ifeq ($(OS_FOR_BUILD),WNT) $(gb_Helper_execute)saxparser $* `cygpath -m $<` $@ \ $(my_file)`cygpath -m $(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m $(OUTDIR)/bin/types.rdb` \ - -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin` + -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin` else $(gb_Helper_execute)saxparser $* $< $@ \ $(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \ - -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib + -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib endif saxparser.rdb : saxparser.input diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index 15c58d66aa40..4c779ccd1ad0 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -90,5 +90,5 @@ ALLTAR : $(MISC)/pythonloader.component $(MISC)/pythonloader.component .ERRREMOVE : \ $(SOLARENV)/bin/createcomponent.xslt pythonloader.component $(XSLTPROC) --nonet --stringparam uri \ - 'vnd.sun.star.expand:$$BRAND_BASE_DIR/program/$(SHL1TARGETN:f)' \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' \ -o $@ $(SOLARENV)/bin/createcomponent.xslt pythonloader.component diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 71135b267bbf..ab8a7c632c13 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1115,6 +1115,22 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir Value = "${ORIGIN}/.."; End +ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Lib_Dir + ModuleID = gid_Module_Root_Brand; + ProfileID = gid_Brand_Profile_Fundamental_Ini; + Section = "Bootstrap"; + Key = "LO_LIB_DIR"; + Value = "${BRAND_BASE_DIR}/program"; +End + +ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Java_Dir + ModuleID = gid_Module_Root_Brand; + ProfileID = gid_Brand_Profile_Fundamental_Ini; + Section = "Bootstrap"; + Key = "LO_JAVA_DIR"; + Value = "${BRAND_BASE_DIR}/program/classes"; +End + ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions ModuleID = gid_Module_Root_Brand; ProfileID = gid_Brand_Profile_Fundamental_Ini; 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: |