summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2014-06-13 14:39:53 -0700
committerTimothy J Fontaine <tjfontaine@gmail.com>2014-06-13 14:39:53 -0700
commit361aa5344d6b2bc5d09fc7de20de703a8501264c (patch)
treef804b7b75413f6d70ed0d770c8e88929c9802d9b
parentf6ba61bd1545a72636eb02b213772dd221b681be (diff)
downloadnode-361aa5344d6b2bc5d09fc7de20de703a8501264c.tar.gz
build: run wix tool chain out of process
Building MSIs for different arch's can sometimes confuse MSBuild and Wix, isntead run the toolchain externally so we don't have to worry about which arch cmd.exe is running as.
-rw-r--r--tools/msvs/msi/nodemsi.wixproj4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj
index 891291d19..1059bccb2 100644
--- a/tools/msvs/msi/nodemsi.wixproj
+++ b/tools/msvs/msi/nodemsi.wixproj
@@ -58,11 +58,11 @@
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<Target Name="BeforeBuild">
- <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\..\..\deps\npm" PreprocessorVariable="var.NpmSourceDir" DirectoryRefId="NodeModulesFolder" ComponentGroupName="NpmSourceFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="..\..\..\npm.wxs">
+ <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\..\..\deps\npm" PreprocessorVariable="var.NpmSourceDir" DirectoryRefId="NodeModulesFolder" ComponentGroupName="NpmSourceFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="..\..\..\npm.wxs" RunAsSeparateProcess="true">
</HeatDirectory>
</Target>
<PropertyGroup>
<PostBuildEvent>move "!(TargetPath)" "$(TargetDir)\$(TargetFileName)"
move "!(TargetPdbPath)" "$(TargetDir)\$(TargetPdbName)"</PostBuildEvent>
</PropertyGroup>
-</Project> \ No newline at end of file
+</Project>