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

[Mike Kaganski (via logerrit)]

 bin/gbuild-to-ide |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 7d44fef8a785321578d359e831c71d75b36b893f
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Jan 27 12:14:56 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Jan 27 17:16:50 2020 +0100

    VisualStudioIntegrationGenerator: put solution/projects to build dir
    
    .. instead of source dir. This allows to have ide integration files
    in proper directory when using out-of-the-tree build directory.
    
    Change-Id: I0d3be02b3ee27e499d9d223b0a521e4688885a1c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87502
    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 097f163d46ed..f74712cafeb9 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -917,7 +917,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
     def __init__(self, gbuildparser, ide):
         IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
         self.toolset = self.retrieve_toolset(ide)
-        self.solution_directory = './'
+        self.solution_directory = self.gbuildparser.builddir
         self.configurations = {
             'Build': {
                 'build': self.module_make_command('%(target)s'),
@@ -998,7 +998,9 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
                 f.write('EndProject\n')
             f.write('Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9292527-A979-4D13-A598-C75A33222174}"\n')
             f.write('\tProjectSection(SolutionItems) = preProject\n')
-            f.write('\t\tsolenv/vs/LibreOffice.natvis = solenv/vs/LibreOffice.natvis\n')
+            # The natvis file gives pretty-printed variable values when debugging
+            natvis_path = os.path.join(gbuildparser.srcdir, 'solenv/vs/LibreOffice.natvis')
+            f.write('\t\t%(natvis)s = %(natvis)s\n' % {'natvis': natvis_path})
             f.write('\tEndProjectSection\n')
             f.write('EndProject\n')
             f.write('Global\n')