strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gbuild: install pagein files directly from workdir

Browse source 
Change-Id: I51e632ab96a5a569446c1a46ffce5cc3d85eadf9
This commit is contained in:
Matúš Kukan 2013-05-24 14:55:47 +02:00
parent 529b1ea6f4
commit 6f2715fe35
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scp2/source/ooo/file_ooo.scp
View file

@ -646,35 +646,35 @@ File gid_File_Txt_Pagein_Calc
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "pagein-calc";
Name = "Pagein/pagein-calc";
End
File gid_File_Txt_Pagein_Common
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "pagein-common";
Name = "Pagein/pagein-common";
End
File gid_File_Txt_Pagein_Draw
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "pagein-draw";
Name = "Pagein/pagein-draw";
End
File gid_File_Txt_Pagein_Impress
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "pagein-impress";
Name = "Pagein/pagein-impress";
End
File gid_File_Txt_Pagein_Writer
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "pagein-writer";
Name = "Pagein/pagein-writer";
End
#endif

22
solenv/gbuild/Pagein.mk
View file

@ -18,6 +18,9 @@ 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 = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
gb_Pagein__get_final_target = $(WORKDIR)/Pagein/pagein-$(1).final
define gb_Pagein__command
$(call gb_Output_announce,$(2),$(true),PAG,5)
$(call gb_Helper_abbreviate_dirs,\
@ -31,24 +34,23 @@ endef
$(call gb_Pagein_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PAG,5)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Pagein_get_target,$*) $(call gb_Pagein_get_outdir_target,$*))
rm -f $(call gb_Pagein__get_final_target,$*) $(call gb_Pagein_get_target,$*))
$(call gb_Pagein_get_target,%) :
$(call gb_Pagein__command,$@,$*,$^)
gb_Pagein_get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
$(call gb_Pagein__get_final_target,%) :
touch $@
define gb_Pagein_Pagein
$(call gb_Pagein_get_target,$(1)) : OBJECTS :=
$(call gb_Pagein_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$$(eval $$(call gb_Module_register_target,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_outdir_target,$(1)))
$(call gb_Deliver_add_deliverable,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_target,$(1)),$(1))
$(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1))
$(call gb_Pagein_get_outdir_target,$(1)) :| $(dir $(call gb_Pagein_get_outdir_target,$(1))).dir
$(call gb_Pagein__get_final_target,$(1)) : $(call gb_Pagein_get_target,$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_Pagein__get_final_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_target,$(1)))
$(call gb_Helper_install,$(call gb_Pagein_get_outdir_target,$(1)), \
$(call gb_Pagein_get_install_target,$(1)), \
$(call gb_Helper_install,$(call gb_Pagein__get_final_target,$(1)), \
$(call gb_Pagein__get_install_target,$(1)), \
$(call gb_Pagein_get_target,$(1)))
endef

3
solenv/gbuild/TargetLocations.mk
View file

@ -22,7 +22,6 @@
gb_CliLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliLibrary_EXT)
gb_CliNativeLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliNativeLibrary_EXT)
gb_CliUnoApi_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliUnoApi_EXT)
gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
gb_PackagePart_get_destinations = \
$(INSTDIR) \
$(OUTDIR)/bin \
@ -148,7 +147,7 @@ gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1)
gb_Module_get_target = $(WORKDIR)/Module/$(1)
gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
gb_Pagein_get_target = $(WORKDIR)/Pagein/$(1)
gb_Pagein_get_target = $(WORKDIR)/Pagein/pagein-$(1)
gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
gb_Package_get_target = $(WORKDIR)/Package/$(1).filelist
gb_Package_get_target_for_build = $(WORKDIR_FOR_BUILD)/Package/$(1).filelist