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

scp2: merge explorer extension modules

Browse source 
Don't need to check the Windows version any more.

Change-Id: I774e68b6b3a07684e60532f9d76b9af6d2ea28cf
This commit is contained in:
Michael Stahl 2017-06-02 15:55:31 +02:00
parent 78d03c6389
commit 8dac2cc0b9
4 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Repository.mk
View file

@ -682,20 +682,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,winexplorer
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerext, \ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerext, \
ooofilt \ ooofilt \
shlxthdl \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextnt6, \
propertyhdl \ propertyhdl \
shlxthdl \
)) ))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64, \ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64, \
ooofilt_x64 \ ooofilt_x64 \
shlxthdl_x64 \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64nt6, \
propertyhdl_x64 \ propertyhdl_x64 \
shlxthdl_x64 \
)) ))
endif # WNT endif # WNT

2
scp2/AutoInstall.mk
View file

@ -49,10 +49,8 @@ $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,winexplorerextnt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT >= 600"))
ifeq ($(BUILD_X64),TRUE) ifeq ($(BUILD_X64),TRUE)
$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64")) $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600"))
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,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))

4
scp2/InstallModule_winexplorerext.mk
View file

@ -16,9 +16,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/winexplorerext,\
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\
winexplorerextbinarytable \ winexplorerextbinarytable \
winexplorerext \ winexplorerext \
winexplorerextnt6 \ $(if $(filter TRUE,$(BUILD_X64)),winexplorerextwin64) \
$(if $(filter TRUE,$(BUILD_X64)), winexplorerextwin64 \
winexplorerextwin64nt6) \
)) ))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\ $(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\

4
scp2/source/winexplorerext/module_winexplorerext.scp
View file

@ -20,10 +20,8 @@
#include "AutoInstall/winexplorerextbinarytable" #include "AutoInstall/winexplorerextbinarytable"
#include "AutoInstall/winexplorerext" #include "AutoInstall/winexplorerext"
#include "AutoInstall/winexplorerextnt6"
#ifdef BUILD_X64 #ifdef BUILD_X64
#include "AutoInstall/winexplorerextwin64" #include "AutoInstall/winexplorerextwin64"
#include "AutoInstall/winexplorerextwin64nt6"
#endif #endif
Module gid_Module_Optional_Winexplorerext Module gid_Module_Optional_Winexplorerext
@ -34,7 +32,6 @@ Module gid_Module_Optional_Winexplorerext
Dirs = (gid_Dir_Shlxthdl); Dirs = (gid_Dir_Shlxthdl);
Files = (auto_winexplorerextbinarytable_ALL, Files = (auto_winexplorerextbinarytable_ALL,
auto_winexplorerext_ALL, auto_winexplorerext_ALL,
auto_winexplorerextnt6_ALL,
gid_File_Tmp_Userinstall_Winexplorerext_Inf); gid_File_Tmp_Userinstall_Winexplorerext_Inf);
End End
@ -48,7 +45,6 @@ Module gid_Module_Optional_Winexplorerext_x64
Styles = (HIDDEN_ROOT); Styles = (HIDDEN_ROOT);
Dirs = (gid_Dir_Shlxthdl); Dirs = (gid_Dir_Shlxthdl);
Files = (auto_winexplorerextwin64_ALL, Files = (auto_winexplorerextwin64_ALL,
auto_winexplorerextwin64nt6_ALL,
gid_File_Lib_Msvcp100, gid_File_Lib_Msvcp100,
gid_File_Lib_Msvcr100, gid_File_Lib_Msvcr100,
gid_File_Lib_Msvcp110, gid_File_Lib_Msvcp110,