[Libreoffice-commits] core.git: scp2/AutoInstall.mk scp2/inc scp2/source solenv/gbuild

[Mike Kaganski (via logerrit)]

 scp2/AutoInstall.mk                                  |    2 +-
 scp2/inc/macros.inc                                  |    4 ++--
 scp2/source/winexplorerext/file_winexplorerext.scp   |    6 ++++++
 scp2/source/winexplorerext/module_winexplorerext.scp |    2 +-
 solenv/gbuild/gen-autoinstall.py                     |    2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 0cf2531cc59556d04acd4a614e452df6bbad7368
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sat Sep 12 11:46:33 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Sep 12 18:14:45 2020 +0200

    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 at collabora.com>

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
diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py
index 44f4ecd7ffd1..d55ab51d3822 100644
--- a/solenv/gbuild/gen-autoinstall.py
+++ b/solenv/gbuild/gen-autoinstall.py
@@ -71,7 +71,7 @@ print(", \\\n".join(["    " + gid for gid in allgids]))
 for (gid, link, target) in autosdklibs:
     print("SDK_LIBRARY_LINK(" + gid + "," + link + "," + target + ")")
 
-scp2libtemplates = set([ "URE_PRIVATE_LIB", "LIBO_LIB_FILE", "LIBO_LIB_FILE_BINARYTABLE", "LIBO_LIB_FILE_COMPONENTCONDITION", "SHLXTHDL_LIB_FILE", "SHLXTHDL_LIB_FILE_COMPONENTCONDITION" ])
+scp2libtemplates = set([ "URE_PRIVATE_LIB", "LIBO_LIB_FILE", "LIBO_LIB_FILE_BINARYTABLE", "LIBO_LIB_FILE_COMPONENTCONDITION", "SHLXTHDL_LIB_FILE", "SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION" ])
 for (gid, libfile) in autolibs:
     if not(scp2libtemplate in scp2libtemplates):
         raise Exception("invalid scp2libtemplate \"" + scp2libtemplate + "\"")