diff options
Diffstat (limited to 'solenv/gbuild')
25 files changed, 70 insertions, 75 deletions
diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk index 7039a2ea8021..e8a2a19e3070 100644 --- a/solenv/gbuild/AllLangPackage.mk +++ b/solenv/gbuild/AllLangPackage.mk @@ -10,7 +10,7 @@ # AllLangPackage class # Handles creation of a bunch of packages with content dependent on -# language. The package files are placed into $(gb_INSTROOT). +# language. The package files are placed into $(INSTROOT). gb_AllLangPackage_LANGS := $(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US) @@ -44,7 +44,7 @@ endef # gb_AllLangPackage__AllLangPackage_lang group package srcdir define gb_AllLangPackage__AllLangPackage_onelang $(call gb_Package_Package_internal,$(2),$(3)) -$(call gb_Package_set_outdir,$(2),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,$(2),$(INSTROOT)) $(call gb_AllLangPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2)) $(call gb_AllLangPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2)) diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 0265bbadd9a6..d11b5d943a73 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -458,7 +458,7 @@ $(call gb_AllLangResTarget_get_target,%) : $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && touch $@) -gb_ResTarget_get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/resource/$(1).res +gb_ResTarget_get_install_target = $(INSTROOT)/$(gb_PROGRAMDIRNAME)/resource/$(1).res define gb_AllLangResTarget_AllLangResTarget $(foreach lang,$(gb_AllLangResTarget_LANGS),\ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index aeda7e3e0fae..1f9390fe5fb0 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -59,8 +59,8 @@ $(if $(URE),\ "-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_Helper_make_url,$(item)))") \ $(if $(strip $(UNO_SERVICES)),\ "-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \ - -env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \ - -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)) \ + -env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \ + -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(gb_PROGRAMDIRNAME)) \ --protector $(call gb_Library_get_target,unoexceptionprotector) unoexceptionprotector \ --protector $(call gb_Library_get_target,unobootstrapprotector) unobootstrapprotector \ ) $(ARGS) diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index a1e4d614430b..1803bf469a7b 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -213,8 +213,8 @@ $(call gb_Package_Package_internal,$(call gb_Dictionary_get_packagename,$(1)),$( $(call gb_Package_Package_internal,$(call gb_Dictionary_get_packagename,$(1)_generated),$(WORKDIR)) $(call gb_PackageSet_PackageSet_internal,$(call gb_Dictionary_get_packagesetname,$(1))) -$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)),$(gb_INSTROOT)) -$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)_generated),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)),$(INSTROOT)) +$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)_generated),$(INSTROOT)) $(call gb_PackageSet_add_package,$(call gb_Dictionary_get_packagesetname,$(1)),$(call gb_Dictionary_get_packagename,$(1))) ifeq (,$(gb_Dictionary_ALL_LANGS)) diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index ef632dd33cc6..2fd5c1d7444a 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -23,11 +23,17 @@ # gb_Executable_Executable_platform gb_Executable_LAYER_DIRS := \ - UREBIN:$(gb_INSTROOT)/$(LIBO_URE_BIN_FOLDER) \ - OOO:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME) \ + UREBIN:$(INSTROOT)/$(LIBO_URE_BIN_FOLDER) \ + OOO:$(INSTROOT)/$(LIBO_BIN_FOLDER) \ SDKBIN:$(INSTDIR)/$(gb_Package_SDKDIRNAME)/bin \ NONE:$(gb_Executable_BINDIR) \ +gb_Executable_LAYER_DIRS_FOR_BUILD := \ + UREBIN:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_BIN_FOLDER_FOR_BUILD) \ + OOO:$(INSTROOT_FOR_BUILD)/$(LIBO_BIN_FOLDER_FOR_BUILD) \ + SDKBIN:$(INSTDIR_FOR_BUILD)/$(gb_Package_SDKDIRNAME)/bin \ + NONE:$(gb_Executable_BINDIR_FOR_BUILD) \ + $(dir $(call gb_Executable_get_runtime_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) @@ -45,8 +51,11 @@ $(call gb_Executable_get_clean_target,%) : $(AUXTARGETS)) gb_Executable__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS))) +gb_Executable__get_dir_for_layer_for_build = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS_FOR_BUILD))) gb_Executable__get_dir_for_exe = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1))) +gb_Executable__get_dir_for_exe_for_build = $(call gb_Executable__get_dir_for_layer_for_build,$(call gb_Executable_get_layer,$(1))) gb_Executable_get_install_target = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1)) +gb_Executable_get_install_target_for_build = $(call gb_Executable__get_dir_for_exe_for_build,$(1))/$(call gb_Executable_get_filename,$(1)) define gb_Executable_Executable $(call gb_Postprocess_register_target,AllExecutables,Executable,$(1)) diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index c52ffff334ac..19fea8d6e728 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -211,14 +211,14 @@ endef # # This function is very similar to gb_ExternalPackage_add_file, except # that it also allows to deliver the library to its proper place in -# $(gb_INSTROOT). +# $(INSTROOT). # # The last argument is the name under which the library was registered. # It is used to determine layer, if the library is not in layer OOO. # # gb_ExternalPackage_add_library_for_install package dest src library? define gb_ExternalPackage_add_library_for_install -$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(gb_INSTROOT)/$(gb_Package_PROGRAMDIRNAME))/$(notdir $(2)),$(3)) +$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(INSTROOT)/$(gb_Package_PROGRAMDIRNAME))/$(notdir $(2)),$(3)) endef @@ -234,11 +234,11 @@ endef # # This function works just like to gb_ExternalPackage_add_file, except # that it also allows to deliver the jar to its proper place in -# $(gb_INSTROOT). +# $(INSTROOT). # # gb_ExternalPackage_add_jar_for_install package dest src define gb_ExternalPackage_add_jar_for_install -$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(gb_INSTROOT)/$(gb_Package_PROGRAMDIRNAME)/classes/$(notdir $(2)),$(3)) +$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(INSTROOT)/$(gb_Package_PROGRAMDIRNAME)/classes/$(notdir $(2)),$(3)) endef diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index ecf9cf9becdd..0feab816a39c 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -53,8 +53,8 @@ define gb_Gallery__make_env_args $(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \ "-env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\ $(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \ --env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \ --env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)) +-env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \ +-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(gb_PROGRAMDIRNAME)) endef define gb_Gallery__command @@ -140,7 +140,7 @@ $(call gb_Gallery__Gallery_impl,$(1),$(call gb_Gallery_get_packagename,$(1)),$(2 # setup the files package - we install all of these too $(call gb_Package_Package_internal,$(call gb_Gallery_get_files_packagename,$(1)),$(SRCDIR)/$(2)) -$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(INSTROOT)) $(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(call gb_Gallery_get_files_packagename,$(1))) $(call gb_Gallery_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_Gallery_get_files_packagename,$(1))) @@ -155,7 +155,7 @@ gb_Gallery_basedir = $(patsubst %/,%,$(dir $(SRCDIR)/$(1))) # gb_Gallery__Gallery_impl gallery package basedir name define gb_Gallery__Gallery_impl $(call gb_Package_Package_internal,$(2),$(call gb_Gallery_get_workdir,$(1))) -$(call gb_Package_set_outdir,$(2),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,$(2),$(INSTROOT)) $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdg,$(1).sdg) $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdv,$(1).sdv) $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).thm,$(1).thm) diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 06002c433754..a194d0b20dd0 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -594,7 +594,7 @@ $(call gb_HelpLinkTarget_HelpLinkTarget,$(1),$(2),$(3),$(4)) $(call gb_HelpIndexTarget_HelpIndexTarget,$(1),$(2),$(3),$(4)) $(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4)) $(call gb_Package_Package_internal,$(5),$(4)) -$(call gb_Package_set_outdir,$(5),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,$(5),$(INSTROOT)) $(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) $(call gb_HelpLinkTarget_get_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1)) diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 155fa928def0..cef34e86ffae 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -37,7 +37,7 @@ $(call gb_Jar_get_workdir,$(1))/META-INF/MANIFEST.MF endef gb_Jar__get_layer = $(strip $(foreach group,$(gb_Jar_VALIDGROUPS),$(if $(filter $(1),$(gb_Jar_$(group))),$(group)))) -gb_Jar__get_dir_for_layer = $(patsubst $(1):%,$(gb_INSTROOT)/%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS))) +gb_Jar__get_dir_for_layer = $(patsubst $(1):%,$(INSTROOT)/%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS))) gb_Jar_get_install_target = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_layer,$(1)))/$(1).jar # creates classset and META-INF folders if they don't exist diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index ad3d5250d3dc..3d01c5c5e361 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -57,7 +57,7 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_URE_LIB_FOLDER) $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(eval $(call gb_JunitTest_JunitTest_platform,$(1))) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index a09f48aac4b6..e0ad137a1cfd 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -30,9 +30,9 @@ # gb_Library_Library_platform gb_Library_LAYER_DIRS := \ - URELIB:$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER) \ - OOO:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME) \ - SHLXTHDL:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/shlxthdl \ + URELIB:$(INSTROOT)/$(LIBO_URE_LIB_FOLDER) \ + OOO:$(INSTROOT)/$(gb_PROGRAMDIRNAME) \ + SHLXTHDL:$(INSTROOT)/$(gb_PROGRAMDIRNAME)/shlxthdl \ OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \ NONE:$(gb_Library_DLLDIR) \ @@ -71,9 +71,9 @@ endef define gb_Library__Library_impl_copy $(call gb_Package_Package,Library_Copy_$(1),$(gb_Package_PRESTAGEDIR)) -$(call gb_Package_set_outdir,Library_Copy_$(1),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,Library_Copy_$(1),$(INSTROOT)) $(call gb_Package_add_file,Library_Copy_$(1),$(2),$(2)) -$(OUTDIR)/lib/$(notdir $(2)) : $(gb_INSTROOT)/$(2) +$(OUTDIR)/lib/$(notdir $(2)) : $(INSTROOT)/$(2) endef # Note: there may be targets in 3 different directories: the library itself, diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk index 9753a41a746d..93e218bf1ca5 100644 --- a/solenv/gbuild/Pagein.mk +++ b/solenv/gbuild/Pagein.mk @@ -18,7 +18,7 @@ gb_Pagein__make_library_path = $(call gb_Pagein__get_libdir,$(1))$(call gb_Libra gb_Pagein__make_path = \ $(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1)),$(1)) -gb_Pagein__get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/pagein-$(1) +gb_Pagein__get_install_target = $(INSTROOT)/$(gb_PROGRAMDIRNAME)/pagein-$(1) define gb_Pagein__command $(call gb_Output_announce,$(2),$(true),PAG,5) diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index fb1b3d62b9ca..45d217f78ef7 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -42,7 +42,7 @@ $(call gb_PythonTest_get_target,%) : $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ $(DEFS) \ TEST_LIB=$(call gb_Library_get_target,test) \ - URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(gb_DEVINSTALLROOT)/$(LIBO_ETC_FOLDER)/fundamental) \ + URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(INSTROOT)/$(LIBO_ETC_FOLDER)/fundamental) \ PYTHONPATH="$(PYPATH)" \ UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \ TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \ @@ -58,7 +58,7 @@ $(call gb_PythonTest_get_target,%) : # always use udkapi and URE services define gb_PythonTest_PythonTest -$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/$(LIBO_LIB_PYUNO_FOLDER)$(if $(filter-out $(LIBO_LIB_PYUNO_FOLDER),$(LIBO_LIB_FOLDER)),$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/$(LIBO_LIB_FOLDER)) +$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_LIB_PYUNO_FOLDER)$(if $(filter-out $(LIBO_LIB_PYUNO_FOLDER),$(LIBO_LIB_FOLDER)),$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_LIB_FOLDER)) $(call gb_PythonTest_get_target,$(1)) : MODULES := $(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1)))) diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk index a428bb36a502..a4d310447e04 100644 --- a/solenv/gbuild/Pyuno.mk +++ b/solenv/gbuild/Pyuno.mk @@ -33,7 +33,7 @@ gb_Pyuno_get_packagename = Pyuno/$(1) # gb_Pyuno_Pyuno component define gb_Pyuno_Pyuno $(call gb_Package_Package_internal,$(call gb_Pyuno_get_packagename,$(1)),$(2)) -$(call gb_Package_set_outdir,$(call gb_Pyuno_get_packagename,$(1)),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,$(call gb_Pyuno_get_packagename,$(1)),$(INSTROOT)) $(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_Pyuno_get_packagename,$(1))) $(call gb_Pyuno_get_target,$(1)) :| $(dir $(call gb_Pyuno_get_target,$(1))).dir diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index b3dcaff109d3..3a39897fcd5f 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -gb_Rdb__get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb +gb_Rdb__get_install_target = $(INSTROOT)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb define gb_Rdb__command $(call gb_Helper_abbreviate_dirs,\ @@ -45,9 +45,9 @@ endef # FIXME this needs some layer-like thing for the special case in URE define gb_Rdb_Rdb_install -$(call gb_Rdb__Rdb_impl,$(1),$(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1)))) +$(call gb_Rdb__Rdb_impl,$(1),$(if $(2),$(INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1)))) $(call gb_Helper_install_final, \ - $(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))), \ + $(if $(2),$(INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))), \ $(call gb_Rdb_get_target,$(1))) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index a0287a3fe33f..6cf9434177b6 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -47,8 +47,12 @@ gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1) gb_Executable_get_target = $(gb_Executable__get_linktarget_target) -# FIXME broken +ifneq ($(CROSS_COMPILING),) +# Can we assume this is used only for executables registered for "NONE"? +gb_Executable_get_target_for_build = $(call gb_Executable_get_install_target_for_build,$(1)) +else gb_Executable_get_target_for_build = $(gb_Executable__get_linktarget_target) +endif # FIXME: cleanup? gb_Library_get_target = $(gb_Library__get_linktarget_target) diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 50fbfb318908..e2c17672d103 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -209,8 +209,8 @@ $(call gb_PackageSet_PackageSet_internal,$(call gb_UIConfig_get_packagesetname,$ $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)),$(SRCDIR)) $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)_generated),$(WORKDIR)) -$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)),$(gb_INSTROOT)) -$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)_generated),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)),$(INSTROOT)) +$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)_generated),$(INSTROOT)) $(call gb_PackageSet_add_package,$(call gb_UIConfig_get_packagesetname,$(1)),$(call gb_UIConfig_get_packagename,$(1))) $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir @@ -230,7 +230,7 @@ endef define gb_UIConfig__UIConfig_for_lang $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR)) -$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(INSTROOT)) $(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2))) $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2))) diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 79da2d90c021..455cbec814a6 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -38,7 +38,7 @@ endef define gb_UnoApi_install $(if $(2),,$(call gb_Output_error,gb_UnoApi_install: missing install name.)) $(call gb_Helper_install,$(call gb_UnoApi_get_target,$(1)), \ - $(gb_INSTROOT)/$(2), \ + $(INSTROOT)/$(2), \ $(call gb_UnoApiTarget_get_target,$(1))) endef diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index bb661b3e57e5..8d4f7ebd3835 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -28,9 +28,6 @@ endif gb_COMPILERDEFAULTOPTFLAGS := -O3 -gb_INSTROOT := $(INSTDIR) -gb_DEVINSTALLROOT := $(gb_INSTROOT) - include $(GBUILDDIR)/platform/com_GCC_defs.mk # Darwin mktemp -t expects a prefix, not a pattern diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index faba1705e0a6..7cb29836a8a3 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -181,7 +181,7 @@ else gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH endif -gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER):$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)" +gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)" # $(1): list of directory pathnames to append at the end of the ld path define gb_Helper_extend_ld_path diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 026e77559ec9..61e452737e84 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -17,9 +17,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_INSTROOT := $(INSTDIR) -gb_DEVINSTALLROOT := $(gb_INSTROOT) - # Convert path to file URL. define gb_Helper_make_url file:///$(strip $(1)) @@ -424,14 +421,14 @@ else ifneq ($(gb_JunitTest_DEBUGRUN),) gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER) else -gb_JunitTest_SOFFICEARG:=path:$(gb_DEVINSTALLROOT)/program/soffice +gb_JunitTest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice endif endif define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ - -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(gb_DEVINSTALLROOT)/program/soffice.exe}" \ + -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe}" \ -Dorg.openoffice.test.arg.env=PATH="$$$$PATH" \ -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) @@ -577,6 +574,6 @@ gb_UIMenubarTarget_UIMenubarTarget_platform := # Python gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program" -gb_Python_INSTALLED_EXECUTABLE := $(gb_DEVINSTALLROOT)/program/python.exe +gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 287a8ebc4ae3..be5a01980e23 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -17,9 +17,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_INSTROOT := $(INSTDIR)/$(PRODUCTNAME).app/Contents -gb_DEVINSTALLROOT := $(gb_INSTROOT) - gb_SDKDIR := $(MACOSX_SDK_PATH) include $(GBUILDDIR)/platform/com_GCC_defs.mk @@ -300,7 +297,7 @@ else ifneq ($(gb_JunitTest_DEBUGRUN),) gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER) else -gb_JunitTest_SOFFICEARG:=path:$(gb_DEVINSTALLROOT)/MacOS/soffice +gb_JunitTest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice endif endif @@ -315,9 +312,9 @@ endef # PythonTest class -gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(gb_DEVINSTALLROOT)/$(LIBO_URE_LIB_FOLDER) +gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(INSTROOT)/$(LIBO_URE_LIB_FOLDER) ifneq ($(LIBO_LIB_FOLDER),$(LIBO_URE_LIB_FOLDER)) -gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(gb_DEVINSTALLROOT)/$(LIBO_LIB_FOLDER) +gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(INSTROOT)/$(LIBO_LIB_FOLDER) endif gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib @@ -326,7 +323,7 @@ gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib define gb_Module_DEBUGRUNCOMMAND OFFICESCRIPT=$$($(gb_MKTEMP)) && \ printf '%s\n' "set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)" > $${OFFICESCRIPT} && \ -gdb -x $${OFFICESCRIPT} $(gb_DEVINSTALLROOT)/MacOS/soffice && \ +gdb -x $${OFFICESCRIPT} $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice && \ rm $${OFFICESCRIPT} endef @@ -391,7 +388,7 @@ endef # Python gb_Python_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib -gb_Python_INSTALLED_EXECUTABLE := $(gb_DEVINSTALLROOT)/$(LIBO_LIB_FOLDER)/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython +gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_LIB_FOLDER)/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython # this is passed to gdb as executable when running tests gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE) diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index c4fb456c0064..5b13981737ea 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -17,9 +17,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_INSTROOT := $(INSTDIR) -gb_DEVINSTALLROOT := $(gb_INSTROOT) - gb_RC := $(WINDRES) gb_COMPILERDEFS += \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 017dafc6bc9b..7603be4294e1 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -17,9 +17,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_INSTROOT := $(INSTDIR) -gb_DEVINSTALLROOT := $(gb_INSTROOT) - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_MKTEMP := mktemp -t gbuild.XXXXXX @@ -329,7 +326,7 @@ else ifneq ($(gb_JunitTest_DEBUGRUN),) gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER) else -gb_JunitTest_SOFFICEARG:=path:$(gb_DEVINSTALLROOT)/program/soffice +gb_JunitTest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice endif endif @@ -352,8 +349,8 @@ gb_PythonTest_PRECOMMAND := define gb_Module_DEBUGRUNCOMMAND OFFICESCRIPT=`mktemp` && \ -printf ". $(gb_DEVINSTALLROOT)/program/ooenv\\n" > $${OFFICESCRIPT} && \ -printf "gdb --tui $(gb_DEVINSTALLROOT)/program/soffice.bin" >> $${OFFICESCRIPT} && \ +printf ". $(INSTROOT)/program/ooenv\\n" > $${OFFICESCRIPT} && \ +printf "gdb --tui $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.bin" >> $${OFFICESCRIPT} && \ printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)\"" >> $${OFFICESCRIPT} && \ printf " -ex \"r\"\\n" >> $${OFFICESCRIPT} && \ $(SHELL) $${OFFICESCRIPT} && \ @@ -411,9 +408,9 @@ gb_UIMenubarTarget_UIMenubarTarget_platform := # Python gb_Python_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib:$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload" -gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(gb_DEVINSTALLROOT)/program/python +gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(INSTROOT)/program/python # this is passed to gdb as executable when running tests -gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_DEVINSTALLROOT)/program/python.bin +gb_Python_INSTALLED_EXECUTABLE_GDB := $(INSTROOT)/program/python.bin include $(GBUILDDIR)/platform/com_GCC_class.mk diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 9ad883b85503..54ef9040de4c 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -17,9 +17,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_INSTROOT := $(INSTDIR) -gb_DEVINSTALLROOT := $(gb_INSTROOT) - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_MKTEMP := mktemp -t gbuild.XXXXXX @@ -325,7 +322,7 @@ else ifneq ($(gb_JunitTest_DEBUGRUN),) gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER) else -gb_JunitTest_SOFFICEARG:=path:$(gb_DEVINSTALLROOT)/program/soffice +gb_JunitTest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice endif endif @@ -341,14 +338,14 @@ endef # PythonTest class -gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(gb_DEVINSTALLROOT)/ure-link/lib:$(gb_DEVINSTALLROOT)/program:$(OUTDIR)/lib +gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(INSTROOT)/$(LIBO_URE_LIB_FOLDER):$(INSTROOT)/$(LIBO_LIB_FOLDER):$(OUTDIR)/lib # Module class define gb_Module_DEBUGRUNCOMMAND OFFICESCRIPT=`mktemp` && \ -printf 'if [ -e $(gb_DEVINSTALLROOT)/program/ooenv ]; then . $(gb_DEVINSTALLROOT)/program/ooenv; fi\n' > $${OFFICESCRIPT} && \ -printf "gdb $(gb_DEVINSTALLROOT)/program/soffice.bin" >> $${OFFICESCRIPT} && \ +printf 'if [ -e $(INSTROOT)/program/ooenv ]; then . $(INSTROOT)/program/ooenv; fi\n' > $${OFFICESCRIPT} && \ +printf "gdb $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.bin" >> $${OFFICESCRIPT} && \ printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)\"" >> $${OFFICESCRIPT} && \ $(SHELL) $${OFFICESCRIPT} && \ rm $${OFFICESCRIPT} @@ -408,9 +405,9 @@ gb_UIMenubarTarget_UIMenubarTarget_platform := # Python gb_Python_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib:$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload" -gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(gb_DEVINSTALLROOT)/program/python +gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(INSTROOT)/program/python # this is passed to gdb as executable when running tests -gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_DEVINSTALLROOT)/program/python.bin +gb_Python_INSTALLED_EXECUTABLE_GDB := $(INSTROOT)/program/python.bin include $(GBUILDDIR)/platform/com_GCC_class.mk |