solenv/gbuild/TargetLocations.mk | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 83c2ef7c78d1453cc0419fd27a8c1418f90c12a3
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Thu May 2 11:31:59 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri May 3 16:07:04 2024 +0200
turn gb_CustomTarget_get_workdir into error and remove old _repo_targets
separate commit since help submodule also uses the macro.
actually turn it into make error to prevent reintroducing it
the repo_target ones are from way back when the whole repo was
split up in many different ones and not used for many years,
no point in having those as errors
Change-Id: I9fd42529d08ea7859b33f8570936f06039cfa184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167006
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 1db26abd9e4e..725390a8feed 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -55,9 +55,8 @@ gb_ComponentTarget_get_target_for_build =
$(WORKDIR_FOR_BUILD)/ComponentTarget/$
gb_Configuration_get_preparation_target =
$(WORKDIR)/Configuration/$(1).prepared
gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist
-gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
-gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
+gb_CustomTarget_get_workdir = $(error please use plain gb_CustomTarget_workdir
instead)
gb_CustomTarget_workdir := $(WORKDIR)/CustomTarget
gb_DescriptionTranslateTarget_get_target =
$(WORKDIR)/DescriptionTranslateTarget/$(1).xml
gb_Dictionary_get_target = $(WORKDIR)/Dictionary/$(1).done
@@ -109,7 +108,6 @@ gb_InternalUnoApi_get_target =
$(WORKDIR)/InternalUnoApi/$(1).done
gb_Jar_get_target = $(call gb_Jar_get_install_target,$(1))
gb_Jar_get_classsetname = Jar/$(1)
gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
-gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done
gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done
gb_JunitTest_get_classsetname = JunitTest/$(1)
gb_JunitTest_get_target = $(WORKDIR)/JunitTest/$(1)/done
