diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-09-12 11:46:33 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-09-12 18:14:45 +0200 |
| commit | 0cf2531cc59556d04acd4a614e452df6bbad7368 (patch) | |
| tree | 8b640efa1178149135f6f0f094cf5209f2be2819 /scp2 | |
| parent | 7ed8d93fab114804387990215545bdceafee36db (diff) | |
Try fix multiple assignments of gids
************************************************
WARNING: multiple assignments of gids:
************************************************
GID: gid_Dir_Shlxthdl Assignments: 2
Change-Id: I4c2f53d8b996fc750465219f320fd8538a4d23f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102494
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rw-r--r-- | scp2/inc/macros.inc | 4 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/file_winexplorerext.scp | 6 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/module_winexplorerext.scp | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 9b18c1ecce08..e39fbd559363 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -50,7 +50,7 @@ $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_J $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE)) ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,PACKAGE_FILELIST_COMPONENTCONDITION,"VersionNT64")) +$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION,,,PACKAGE_FILELIST_COMPONENTCONDITION,"VersionNT64")) endif $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index e801253df1f0..8f507c510346 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -179,12 +179,12 @@ End Dir = gid_Dir_Shlxthdl; \ End -#define SHLXTHDL_LIB_FILE_COMPONENTCONDITION(id,name,cond) \ +#define SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION(id,name,cond) \ File id \ Name = name; \ LIB_FILE_BODY; \ Styles = (PACKED); \ - Dir = gid_Dir_Shlxthdl; \ + Dir = gid_Dir_Shlxthdl_x64; \ ComponentCondition = cond; \ End diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 50bcfc3f3901..3eb80bbec63b 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -23,3 +23,9 @@ Directory gid_Dir_Shlxthdl DosName = "shlxthdl"; End +#ifdef BUILD_X64 +Directory gid_Dir_Shlxthdl_x64 + ParentID = gid_Dir_Shlxthdl; + DosName = "."; +End +#endif diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index 97bfc231769a..2acd44c1ed89 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -43,7 +43,7 @@ Module gid_Module_Optional_Winexplorerext_x64 Sortkey = "1210"; Default = YES; Styles = (HIDDEN_ROOT); - Dirs = (gid_Dir_Shlxthdl); + Dirs = (gid_Dir_Shlxthdl_x64); Files = (auto_winexplorerextwin64_ALL); End #endif |