scp2: move xsltfilter packages to AutoInstall

Change-Id: I2ae844d43a875ea0b4eb9dd445e483a36a90f73d
This commit is contained in:
Michael Stahl 2015-02-28 21:29:27 +01:00
parent dedaf74392
commit e0aaa830fc
5 changed files with 13 additions and 23 deletions

View file

@ -843,6 +843,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
slideshow_opengl_shader \ slideshow_opengl_shader \
)) ))
$(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\
filter_docbook \
filter_xhtml \
filter_xslt \
))
ifeq ($(GUIBASE),unx) ifeq ($(GUIBASE),unx)
$(eval $(call gb_Helper_register_packages_for_install,base_brand,\ $(eval $(call gb_Helper_register_packages_for_install,base_brand,\
desktop_sbase_sh \ desktop_sbase_sh \

View file

@ -53,5 +53,6 @@ $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE
endif endif
$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,xsltfilter,))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

View file

@ -9,6 +9,10 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/xsltfilter)) $(eval $(call gb_InstallModule_InstallModule,scp2/xsltfilter))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/xsltfilter,\
xsltfilter \
))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/xsltfilter,\ $(eval $(call gb_InstallModule_add_scpfiles,scp2/xsltfilter,\
scp2/source/xsltfilter/file_xsltfilter \ scp2/source/xsltfilter/file_xsltfilter \
)) ))

View file

@ -25,23 +25,3 @@ File gid_File_Share_Registry_Xsltfilter_Xcd
Name = "xsltfilter.xcd"; Name = "xsltfilter.xcd";
End End
File gid_File_filter_docbook
TXT_FILE_BODY;
Styles = (FILELIST, PACKED);
Dir = FILELIST_DIR;
Name = "filter_docbook.filelist";
End
File gid_File_filter_xhtml
TXT_FILE_BODY;
Styles = (FILELIST, PACKED);
Dir = FILELIST_DIR;
Name = "filter_xhtml.filelist";
End
File gid_File_filter_xslt
TXT_FILE_BODY;
Styles = (FILELIST, PACKED);
Dir = FILELIST_DIR;
Name = "filter_xslt.filelist";
End

View file

@ -18,15 +18,14 @@
#include "macros.inc" #include "macros.inc"
#include "AutoInstall/xsltfilter"
Module gid_Module_Optional_Xsltfiltersamples Module gid_Module_Optional_Xsltfiltersamples
PackageInfo = "packinfo_office.txt"; PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_XSLTFILTERSAMPLES); MOD_NAME_DESC(MODULE_OPTIONAL_XSLTFILTERSAMPLES);
Sortkey = "700"; Sortkey = "700";
ParentID = gid_Module_Optional; ParentID = gid_Module_Optional;
Files = ( gid_File_filter_docbook, Files = (auto_xsltfilter_ALL,
gid_File_filter_xhtml,
gid_File_filter_xslt,
gid_File_Share_Registry_Xsltfilter_Xcd ); gid_File_Share_Registry_Xsltfilter_Xcd );
Default = YES; Default = YES;
Styles = ( ); Styles = ( );