diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-27 12:14:56 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-27 17:16:50 +0100 |
| commit | 7d44fef8a785321578d359e831c71d75b36b893f (patch) | |
| tree | 99db14a76608d6468b14eec560ae9b090c2f8a88 /bin | |
| parent | 8ffc1299ebf83450e67cf2a89304859e2558cd27 (diff) | |
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@collabora.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/gbuild-to-ide | 6 |
1 files changed, 4 insertions, 2 deletions
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') |