kill multi repo support: SetupLocal can only work with multiple repo support

2 files changed, 9 insertions, 82 deletions

diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 5d9540b936e8..b0233c83eb83 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -26,8 +26,6 @@
 #
 #*************************************************************************
 
-gb_ComponentTarget_REPOS := $(gb_REPOS)
-
 gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt
 gb_ComponentTarget_get_source = $(1)/$(2).component
 
@@ -40,17 +38,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(gb_ComponentTarget_XSLTCOMMANDFILE) $(realpath $(2)))
 endef
 
-# 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.
-define gb_ComponentTarget__rules
-$$(call gb_ComponentTarget_get_inbuild_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
-	$$(call gb_ComponentTarget__command,$$@,$$<,$$*)
-
-$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
-	$$(call gb_ComponentTarget__command,$$@,$$<,$$*)
-
-endef
 
 $(call gb_ComponentTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),CMP,1)
@@ -59,7 +46,15 @@ $(call gb_ComponentTarget_get_clean_target,%) :
 		$(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \
 		$(call gb_ComponentTarget_get_inbuild_target,$*) \
 
-$(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
+
+# 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,$(SOLARSRC),%) | $(gb_XSLTPROCTARGET)
+	$(call gb_ComponentTarget__command,$@,$<,$*)
+
+$(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$(SOLARSRC),%) | $(gb_XSLTPROCTARGET)
+	$(call gb_ComponentTarget__command,$@,$<,$*)
 
 $(call gb_ComponentTarget_get_target,%) :
 	$(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xsltproc is missing.))
diff --git a/solenv/gbuild/extensions/post_SetupLocal.mk b/solenv/gbuild/extensions/post_SetupLocal.mk
deleted file mode 100644
index 175903c3a2b9..000000000000
--- a/solenv/gbuild/extensions/post_SetupLocal.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.PHONY : setuplocal removelocal
-ifneq ($(gb_LOCALBUILDDIR),)
-ifneq ($(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk),)
-setuplocal :
-	$(eval $(call gb_Output_error,$(gb_LOCALBUILDDIR) exists already.))
-
-else
-
-setuplocal :
-	$(eval MODULE := $(firstword $(MODULE) $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))))
-	$(eval modulerepo := $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))))
-	$(eval $(call gb_Output_announce,setting up local build directory (module: $(MODULE)).,$(true),SYC,5))
-	mkdir -p $(gb_LOCALBUILDDIR)/srcdir $(gb_LOCALBUILDDIR)/workdir $(gb_LOCALBUILDDIR)/outdir
-	rsync --archive --exclude 'workdir/**' $(SOLARVERSION)/$(INPATH)/ $(gb_LOCALBUILDDIR)/outdir
-	cp $(modulerepo)/Repository.mk $(gb_LOCALBUILDDIR)/srcdir/Repository.mk
-	cp $(modulerepo)/RepositoryFixes.mk $(gb_LOCALBUILDDIR)/srcdir/RepositoryFixes.mk
-	rsync --archive $(modulerepo)/$(MODULE)/ $(gb_LOCALBUILDDIR)/srcdir/$(MODULE)
-	echo "gb_REPOS := $(gb_LOCALBUILDDIR)/srcdir $(filter-out $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))),$(gb_REPOS))" > $(gb_LOCALBUILDDIR)/SetupLocal.mk
-	echo "#original gb_REPOS was $(gb_REPOS)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-	echo "OUTDIR := $(gb_LOCALBUILDDIR)/outdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-	echo "#original OUTDIR was $(OUTDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-	echo "WORKDIR := $(gb_LOCALBUILDDIR)/workdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-	echo "#original WORKDIR was $(WORKDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-
-endif
-
-removelocal :
-	$(eval $(call gb_Output_warn,removing directory $(gb_LOCALBUILDDIR).,SYC))
-	sleep 10
-	rm -rf $(gb_LOCALBUILDDIR)
-
-else
-setuplocal:
-	$(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
-
-removelocal:
-	$(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
-
-endif
-
-# vim: set noet sw=4: