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

[Peter Foley]

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

New commits:
commit 7086ac7dad014e08160f9a7f87fcfba789420828
Author: Peter Foley <pefoley2 at pefoley.com>
Date:   Fri Oct 3 14:44:39 2014 -0400

    make gbuild-to-ide VS files work with separate builddir
    
    Change-Id: I847885885ed12dbbd64e3b694799e4835497d736
    Reviewed-on: https://gerrit.libreoffice.org/11799
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 34ae1fb..ea4cde4 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -668,7 +668,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
         return ide_toolset_map[ide]
 
     def module_make_command(self, targets):
-        return '%(sh)s -c "PATH=\\"/bin:$PATH\\"; cd %(location)s && %(makecmd)s -rs ' + targets + '"'
+        return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\" %(makecmd)s -rsC %(location)s ' + targets + '"'
 
     class Project:
 
@@ -796,6 +796,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
                                       Condition="'$(Configuration)|$(Platform)'=='%s|%s'" % (cfg_name, platform))
             nmake_params = {
                 'sh': os.path.join(self.gbuildparser.binpath, 'dash.exe'),
+                'builddir': self.gbuildparser.builddir,
                 'location': target.location,
                 'makecmd': self.gbuildparser.makecmd,
                 'target': target.target_name()}