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

tdf#90753: AutoInstall setup_native packages

Browse source 
Change-Id: Iecf059b974b996fceb57b04197c7dac9b7c8dd47
This commit is contained in:
Matúš Kukan 2016-12-01 22:19:04 +01:00
parent a779b5f7f0
commit 67398a8d97
6 changed files with 12 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Repository.mk
View file

@ -909,6 +909,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\
desktop_branding \
$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
$(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),desktop_soffice_sh) \
$(call gb_Helper_optional,DESKTOP,setup_native_packinfo) \
))
ifeq ($(USING_X11), TRUE)
@ -937,6 +938,10 @@ $(eval $(call gb_Helper_register_packages_for_install,writer_brand,\
))
endif # USING_X11=TRUE
$(eval $(call gb_Helper_register_packages_for_install,onlineupdate,\
$(if $(ENABLE_ONLINE_UPDATE),$(if $(filter LINUX SOLARIS,$(OS)),setup_native_scripts)) \
))
ifneq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_Helper_register_packages_for_install,python, \
pyuno_pythonloader_ini \

9
scp2/source/onlineupdate/file_onlineupdate.scp
View file

@ -25,12 +25,3 @@ File gid_File_Share_Registry_Onlineupdate_Xcd
Name = "onlineupdate.xcd";
ComponentCondition="ISCHECKFORPRODUCTUPDATES=1";
End
#if defined LINUX || defined SOLARIS
File gid_File_Bin_UnpackUpdate
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = "unpack_update";
Styles = (PACKED);
End
#endif

1
scp2/source/onlineupdate/module_onlineupdate.scp
View file

@ -28,6 +28,5 @@ Module gid_Module_Optional_Onlineupdate
Default = YES;
Styles = ();
Files = (auto_onlineupdate_ALL,
gid_File_Bin_UnpackUpdate,
gid_File_Share_Registry_Onlineupdate_Xcd);
End

8
scp2/source/ooo/common_brand.scp
View file

@ -78,7 +78,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_StartCenter,
gid_Brand_File_Share_Xdg_Writer,
gid_Brand_File_Share_Xdg_XsltFilter,
gid_Brand_File_Txt_Package,
gid_License_Txt,
git_License_Odt,
gid_Credits_Odt,
@ -520,13 +519,6 @@ File gid_Brand_File_Script_Unopkg
End
#endif
File gid_Brand_File_Txt_Package
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Extensions;
Name = "package.txt";
Styles = (PACKED);
End
File gid_Brand_File_Share_Registry_Cjk_Xcd
TXT_FILE_BODY;
Styles = (PACKED,MAKE_LANG_SPECIFIC);

24
setup_native/Module_setup_native.mk
View file

@ -11,25 +11,19 @@ $(eval $(call gb_Module_Module,setup_native))
$(eval $(call gb_Module_add_targets,setup_native,\
$(if $(filter LINUX SOLARIS,$(OS)),Library_getuid) \
$(if $(filter MACOSX,$(OS)),CustomTarget_mac) \
CustomTarget_spell \
$(if $(filter WNT,$(OS)),Package_misc) \
Package_packinfo \
$(if $(filter LINUX SOLARIS,$(OS)), \
CustomTarget_scripts \
$(if $(ENABLE_ONLINE_UPDATE),Package_scripts) \
) \
))
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,setup_native,\
CustomTarget_mac \
))
endif
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,setup_native,\
Package_misc \
))
endif
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Module_add_targets,setup_native,\
Library_instooofiltmsi \
Library_instooofiltmsi \
Library_qslnkmsi \
Library_reg4allmsdoc \
$(if $(DISABLE_ACTIVEX),,Library_regactivex) \
@ -52,10 +46,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\
))
endif
$(eval $(call gb_Module_add_targets,setup_native,\
CustomTarget_scripts \
Package_scripts \
))
endif
# vim: set noet sw=4 ts=4:

4
setup_native/Package_scripts.mk
View file

@ -9,10 +9,6 @@
$(eval $(call gb_Package_Package,setup_native_scripts,$(SRCDIR)/setup_native/scripts))
ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
ifneq ($(filter LINUX SOLARIS,$(OS)),)
$(eval $(call gb_Package_add_file,setup_native_scripts,$(LIBO_BIN_FOLDER)/unpack_update,unpack_update.sh))
endif
endif
# vim: set noet sw=4 ts=4: