we do not need .xcd files in solver

Change-Id: Ic08b12b0deb7342c520a5385c226d864596fc858

4 files changed, 29 insertions, 49 deletions

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index d60bd0ddc60a..7eabc93d00d8 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -490,21 +490,21 @@ postprocess_DRIVERS := $(foreach driver,$(postprocess_DRIVERS),driver_$(driver))
 # Targets
 #
 
-$(eval $(call gb_CustomTarget_register_targets,postprocess/registry,\
-	$(postprocess_XCDS) \
-	$(foreach lang,$(gb_Configuration_LANGS), \
-		Langpack-$(lang).xcd \
-		fcfg_langpack_$(lang).xcd \
-		registry_$(lang).xcd \
-	) \
-))
+$(call gb_CustomTarget_get_target,postprocess/registry) : \
+	$(foreach target,$(postprocess_XCDS) \
+		$(foreach lang,$(gb_Configuration_LANGS), \
+			Langpack-$(lang).xcd \
+			fcfg_langpack_$(lang).xcd \
+			registry_$(lang).xcd \
+		) \
+	,$(call gb_XcdTarget_get_target,$(target)))
 
 #
 # Dependencies
 #
 
 define postprocess_xcd_deps
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).xcd : \
+$(call gb_XcdTarget_get_target,$(1)).xcd : \
 	$(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).list
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).list : \
@@ -517,19 +517,19 @@ endef
 $(foreach xcd,$(postprocess_XCDS),$(eval $(call postprocess_xcd_deps,$(basename $(xcd)))))
 
 define postprocess_lang_deps
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).xcd : \
+$(call gb_XcdTarget_get_target,Langpack-$(1).xcd) : \
 	$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list : \
 	$(call gb_XcuLangpackTarget_get_outdir_target,Langpack-$(1).xcu)
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).xcd : \
+$(call gb_XcdTarget_get_target,fcfg_langpack_$(1).xcd) : \
 	$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list : \
 	$(call gb_Configuration_get_target,fcfg_langpack)
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).xcd : \
+$(call gb_XcdTarget_get_target,registry_$(1).xcd) : \
 	$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list : \
@@ -559,21 +559,23 @@ postprocess_main_SED := \
 	-e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \
 	-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/main.xcd : \
+$(call gb_XcdTarget_get_target,main.xcd) : \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
+	$(call gb_Output_announce,main,$(true),XCD,3)
 	$(call gb_Helper_abbreviate_dirs, \
+		mkdir -p $(dir $@) && \
 		$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
 			$(SOLARENV)/bin/packregistry.xslt $< \
 		|  sed $(postprocess_main_SED) > $@ \
 	)
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.xcd : \
+$(call gb_XcdTarget_get_target,%.xcd) : \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
+	$(call gb_Output_announce,$*,$(true),XCD,3)
 	$(call gb_Helper_abbreviate_dirs, \
-	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-		-o $@ $(SOLARENV)/bin/packregistry.xslt $< \
+		mkdir -p $(dir $@) && \
+		$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
+			-o $@ $(SOLARENV)/bin/packregistry.xslt $< \
 	)
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 15e7b5875534..9ed1a758e587 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_Module_add_targets,postprocess,\
 	CustomTarget_registry \
 	Package_images \
 	Package_registry \
-	Package_registry_install \
 	Rdb_services \
 ))
 
diff --git a/postprocess/Package_registry.mk b/postprocess/Package_registry.mk
index 5b082b61c3e0..371ef8f02824 100644
--- a/postprocess/Package_registry.mk
+++ b/postprocess/Package_registry.mk
@@ -7,12 +7,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,postprocess_registry,$(call gb_CustomTarget_get_workdir,postprocess/registry)))
+$(eval $(call gb_Package_Package,postprocess_registry,$(patsubst %/,%,$(call gb_XcdTarget_get_target,))))
 
-$(eval $(call gb_Package_add_files,postprocess_registry,xml,\
+$(eval $(call gb_Package_set_outdir,postprocess_registry,$(INSTROOT)))
+
+$(eval $(call gb_Package_add_files,postprocess_registry,$(LIBO_SHARE_FOLDER)/registry,\
 	$(postprocess_XCDS) \
 	$(foreach lang,$(gb_Configuration_LANGS), \
 		Langpack-$(lang).xcd \
+	) \
+))
+
+$(eval $(call gb_Package_add_files,postprocess_registry,$(LIBO_SHARE_FOLDER)/registry/res,\
+	$(foreach lang,$(gb_Configuration_LANGS), \
 		fcfg_langpack_$(lang).xcd \
 		registry_$(lang).xcd \
 	) \
diff --git a/postprocess/Package_registry_install.mk b/postprocess/Package_registry_install.mk
deleted file mode 100644
index ba1d51605489..000000000000
--- a/postprocess/Package_registry_install.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,postprocess_registry_install,$(call gb_CustomTarget_get_workdir,postprocess/registry)))
-
-$(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(INSTROOT)))
-
-$(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry,\
-	$(postprocess_XCDS) \
-	$(foreach lang,$(gb_Configuration_LANGS), \
-		Langpack-$(lang).xcd \
-	) \
-))
-
-$(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry/res,\
-	$(foreach lang,$(gb_Configuration_LANGS), \
-		fcfg_langpack_$(lang).xcd \
-		registry_$(lang).xcd \
-	) \
-))
-
-# vim: set noet sw=4 ts=4: