[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Mike Kaganski (via logerrit)]

 bin/gbuild-to-ide |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 328b1d6774c3d116b62ab7149159389c5e2ca12f
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Jul 8 11:03:05 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Jul 8 12:47:53 2020 +0200

    vs-ide-integration: unescape values coming from DEFS
    
    ... so `TK_DLL_NAME=\"tklo.dll\"` becomes `TK_DLL_NAME="tklo.dll"`
    
    Change-Id: I0e14ded85be387a342e1979aa3f120727178351d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98319
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index f74712cafeb9..f23592469fd9 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -1028,6 +1028,9 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
         else:
             return shortnames
 
+    # Unescape the values: \"tklo.dll\" => "tklo.dll"
+    escapepattern = re.compile(r'\\(.)')
+
     @staticmethod
     def defs_list(defs):
         defines_list = []
@@ -1035,7 +1038,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
         for key, value in defs.items():
             define = key
             if value is not None:
-                define += '=' + value
+                define += '=' + VisualStudioIntegrationGenerator.escapepattern.sub(r'\1', value)
             defines_list.append(define)
         return defines_list