move Pagein from desktop to gbuild

desktop/Module_desktop.mk

@@ -25,16 +25,6 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-# FIXME: Okay, so this is ugly hack, because
-# include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))Pagein.mk
-# does not work from tail_build. I think I should just move Pagein.mk
-# into gbuild proper...
-#
-# On the other side, I wonder how many of our gbuild classes /
-# implementations would break when using with multiple repos as they
-# were originally intended, i.e., with different root dirs.
-include $(SRCDIR)/desktop/Pagein.mk
-
 $(eval $(call gb_Module_Module,desktop))
 
 $(eval $(call gb_Module_add_targets,desktop,\

desktop/Pagein_calc.mk

@@ -25,9 +25,9 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call desktop_Pagein_Pagein,calc))
+$(eval $(call gb_Pagein_Pagein,calc))
 
-$(eval $(call desktop_Pagein_add_libs,calc,\
+$(eval $(call gb_Pagein_add_libs,calc,\
     sc \
     scui \
     svx \

desktop/Pagein_common.mk

@@ -25,10 +25,10 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call desktop_Pagein_Pagein,common))
+$(eval $(call gb_Pagein_Pagein,common))
 
 # sorted in approx. reverse load order (ld.so.1)
-$(eval $(call desktop_Pagein_add_libs,common,\
+$(eval $(call gb_Pagein_add_libs,common,\
     i18npool \
     $(if $(findstring YES,$(SYSTEM_ICU)),,\
         icui18n \
@@ -54,7 +54,7 @@ $(eval $(call desktop_Pagein_add_libs,common,\
     sb \
 ))
 
-$(eval $(call desktop_Pagein_add_libs_with_dir,common,\
+$(eval $(call gb_Pagein_add_libs_with_dir,common,\
     stocservices \
     bootstrap \
     reg \
@@ -66,7 +66,7 @@ $(eval $(call desktop_Pagein_add_libs_with_dir,common,\
     ,../ure-link/lib \
 ))
 
-$(eval $(call desktop_Pagein_add_libs,common,\
+$(eval $(call gb_Pagein_add_libs,common,\
     ucbhelper \
     comphelper \
     tl \
@@ -76,7 +76,7 @@ $(eval $(call desktop_Pagein_add_libs,common,\
     tk \
 ))
 
-$(eval $(call desktop_Pagein_add_objects,common,\
+$(eval $(call gb_Pagein_add_objects,common,\
     ../ure-link/share/misc/types.rdb \
     services.rdb \
     oovbaapi.rdb \
@@ -85,7 +85,7 @@ $(eval $(call desktop_Pagein_add_objects,common,\
 # TODO: Hmm, so it looks like there are duplicates in the list... Moreover,
 # some that are conditional above are not conditional here (e.g., icule).
 # I have doubts about gconfbe, desktopbe and localebe too.
-$(eval $(call desktop_Pagein_add_libs,common,\
+$(eval $(call gb_Pagein_add_libs,common,\
     deployment \
     deploymentmisc \
     ucb1 \

desktop/Pagein_draw.mk

@@ -25,9 +25,9 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call desktop_Pagein_Pagein,draw))
+$(eval $(call gb_Pagein_Pagein,draw))
 
-$(eval $(call desktop_Pagein_add_libs,draw,\
+$(eval $(call gb_Pagein_add_libs,draw,\
     sd \
     sdui \
     svx \

desktop/Pagein_impress.mk

@@ -25,9 +25,9 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call desktop_Pagein_Pagein,impress))
+$(eval $(call gb_Pagein_Pagein,impress))
 
-$(eval $(call desktop_Pagein_add_libs,impress,\
+$(eval $(call gb_Pagein_add_libs,impress,\
     sd \
     sdui \
     svx \

desktop/Pagein_writer.mk

@@ -25,9 +25,9 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call desktop_Pagein_Pagein,writer))
+$(eval $(call gb_Pagein_Pagein,writer))
 
-$(eval $(call desktop_Pagein_add_libs,writer,\
+$(eval $(call gb_Pagein_add_libs,writer,\
     sw \
     swui \
     svx \

desktop/Pagein.mk → solenv/gbuild/Pagein.mk

@@ -25,79 +25,75 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-desktop_Pagein_get_target = $(WORKDIR)/Pagein/desktop/$(1)
-desktop_Pagein_get_clean_target = $(WORKDIR)/Clean/Pagein/desktop/$(1)
-desktop_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
-
-desktop_Pagein__istype = $(findstring $(2),$(call desktop_Pagein__prefix,$(1)))
-desktop_Pagein__prefix = $(firstword $(subst :, ,$(1)))
-desktop_Pagein__suffix = $(lastword $(subst :, ,$(1)))
-desktop_Pagein__object = $(call desktop_Pagein__suffix,$(1))
-desktop_Pagein__dir = $(call desktop_Pagein__prefix,$(1))
-desktop_Pagein__libname = $(notdir $(call gb_Library_get_target,$(call desktop_Pagein__suffix,$(1))))
-desktop_Pagein__libpath = $(call desktop_Pagein__dir,$(1))/$(call desktop_Pagein__libname,$(1))
-
-desktop_Pagein__make_path = \
-$(if $(call desktop_Pagein__istype,$(1),OBJ),\
-    $(call desktop_Pagein__object,$(1)),\
-    $(if $(call desktop_Pagein__istype,$(1),LIB),\
-        $(call desktop_Pagein__libname,$(1)),\
-        $(call desktop_Pagein__libpath,$(1))))
-
-define desktop_Pagein__command
+gb_Pagein__istype = $(findstring $(2),$(call gb_Pagein__prefix,$(1)))
+gb_Pagein__prefix = $(firstword $(subst :, ,$(1)))
+gb_Pagein__suffix = $(lastword $(subst :, ,$(1)))
+gb_Pagein__object = $(call gb_Pagein__suffix,$(1))
+gb_Pagein__dir = $(call gb_Pagein__prefix,$(1))
+gb_Pagein__libname = $(notdir $(call gb_Library_get_target,$(call gb_Pagein__suffix,$(1))))
+gb_Pagein__libpath = $(call gb_Pagein__dir,$(1))/$(call gb_Pagein__libname,$(1))
+
+gb_Pagein__make_path = \
+$(if $(call gb_Pagein__istype,$(1),OBJ),\
+    $(call gb_Pagein__object,$(1)),\
+    $(if $(call gb_Pagein__istype,$(1),LIB),\
+        $(call gb_Pagein__libname,$(1)),\
+        $(call gb_Pagein__libpath,$(1))))
+
+define gb_Pagein__command
 $(call gb_Output_announce,$(2),$(true),PAG,5)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && rm -f $(1) \
-    $(foreach object,$(OBJECTS),&& echo $(call desktop_Pagein__make_path,$(object)) >> $(1)))
+    $(foreach object,$(OBJECTS),&& echo $(call gb_Pagein__make_path,$(object)) >> $(1)))
 
 endef
 
-.PHONY : $(call desktop_Pagein_get_clean_target,%)
-$(call desktop_Pagein_get_clean_target,%) :
+.PHONY : $(call gb_Pagein_get_clean_target,%)
+$(call gb_Pagein_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),PAG,5)
 	$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call desktop_Pagein_get_target,$*) $(call desktop_Pagein_get_outdir_target,$*))
+        rm -f $(call gb_Pagein_get_target,$*) $(call gb_Pagein_get_outdir_target,$*))
 
-$(call desktop_Pagein_get_target,%) :
-	$(call desktop_Pagein__command,$@,$*,$^)
+$(call gb_Pagein_get_target,%) :
+	$(call gb_Pagein__command,$@,$*,$^)
 	
-$(call desktop_Pagein_get_outdir_target,%) : $(call desktop_Pagein_get_target,%)
+$(call gb_Pagein_get_outdir_target,%) : $(call gb_Pagein_get_target,%)
 	$(call gb_Deliver_deliver,$<,$@)
 
-define desktop_Pagein_Pagein
-$(call desktop_Pagein_get_target,$(1)) : OBJECTS :=
-$$(eval $$(call gb_Module_register_target,$(call desktop_Pagein_get_outdir_target,$(1)),$(call desktop_Pagein_get_clean_target,$(1))))
-$(call desktop_Pagein_get_outdir_target,$(1)) : $(call desktop_Pagein_get_target,$(1))
+define gb_Pagein_Pagein
+$(call gb_Pagein_get_target,$(1)) : OBJECTS :=
+$$(eval $$(call gb_Module_register_target,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
+$(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1))
 
 endef
 
-define desktop_Pagein_add_lib
-$(call desktop_Pagein_get_target,$(1)) : OBJECTS += LIB:$(2)
+define gb_Pagein_add_lib
+$(call gb_Pagein_get_target,$(1)) : OBJECTS += LIB:$(2)
 
 endef
 
-define desktop_Pagein_add_lib_with_dir
-$(call desktop_Pagein_get_target,$(1)) : OBJECTS += $(strip $(3)):$(2)
+define gb_Pagein_add_lib_with_dir
+$(call gb_Pagein_get_target,$(1)) : OBJECTS += $(strip $(3)):$(2)
 
 endef
 
-define desktop_Pagein_add_object
-$(call desktop_Pagein_get_target,$(1)) : OBJECTS += OBJ:$(2)
+define gb_Pagein_add_object
+$(call gb_Pagein_get_target,$(1)) : OBJECTS += OBJ:$(2)
 
 endef
 
-define desktop_Pagein_add_libs
-$(foreach lib,$(2),$(call desktop_Pagein_add_lib,$(1),$(lib)))
+define gb_Pagein_add_libs
+$(foreach lib,$(2),$(call gb_Pagein_add_lib,$(1),$(lib)))
 
 endef
 
-define desktop_Pagein_add_libs_with_dir
-$(foreach lib,$(2),$(call desktop_Pagein_add_lib_with_dir,$(1),$(lib),$(3)))
+define gb_Pagein_add_libs_with_dir
+$(foreach lib,$(2),$(call gb_Pagein_add_lib_with_dir,$(1),$(lib),$(3)))
 
 endef
 
-define desktop_Pagein_add_objects
-$(foreach object,$(2),$(call desktop_Pagein_add_object,$(1),$(object)))
+define gb_Pagein_add_objects
+$(foreach object,$(2),$(call gb_Pagein_add_object,$(1),$(object)))
 
 endef
 

solenv/gbuild/TargetLocations.mk

@@ -32,6 +32,7 @@ gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).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
+gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
 gb_PackagePart_get_destinations = \
 	$(OUTDIR)/bin \
 	$(OUTDIR)/idl \
@@ -107,6 +108,7 @@ gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
 gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
 gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
 gb_Package_get_target = $(WORKDIR)/Package/$(1)
+gb_Pagein_get_target = $(WORKDIR)/Pagein/$(1)
 gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
 gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
 gb_PyunoFile_get_target = $(WORKDIR)/Pyuno/$(1)/contents/$(2)
@@ -168,6 +170,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	Module \
 	PackagePart \
 	Package \
+	Pagein \
 	Pyuno \
 	Rdb \
 	ResTarget \

solenv/gbuild/gbuild.mk

@@ -294,6 +294,7 @@ include $(foreach class, \
 	Package \
 	CustomTarget \
 	ExternalLib \
+	Pagein \
 	Pyuno \
 	Rdb \
 	CppunitTest \