From ec90ede1cf11f78b746da04a35d4eb32c05b535b Mon Sep 17 00:00:00 2001
From: Igor Zinkovsky <igorzi@microsoft.com>
Date: Thu, 10 Nov 2011 18:40:49 -0800
Subject: [PATCH] fix msi builder

---
 tools/msvs/msi/nodemsi.wixproj | 4 ++--
 tools/msvs/msi/product.wxs     | 2 +-
 vcbuild.bat                    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj
index 4253624991..b51e360eaf 100644
--- a/tools/msvs/msi/nodemsi.wixproj
+++ b/tools/msvs/msi/nodemsi.wixproj
@@ -13,12 +13,12 @@
     <NodeVersion Condition=" '$(NodeVersion)' == '' ">0.0.0.0</NodeVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>..\..\$(Configuration)\</OutputPath>
+    <OutputPath>..\..\..\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug;ProductVersion=$(NodeVersion)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\..\$(Configuration)\</OutputPath>
+    <OutputPath>..\..\..\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug;ProductVersion=$(NodeVersion)</DefineConstants>
   </PropertyGroup>
diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs
index 89a61295a1..f07d9c037e 100644
--- a/tools/msvs/msi/product.wxs
+++ b/tools/msvs/msi/product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define sourcedir="$(var.ProjectDir)..\..\$(var.Configuration)\" ?>
+  <?define sourcedir="$(var.ProjectDir)..\..\..\$(var.Configuration)\" ?>
 
   <Product Id="cc6c176e-e26c-48ec-8970-f58bd1d046cf"
            Name="node.js"
diff --git a/vcbuild.bat b/vcbuild.bat
index 9ec3989b8c..1f9713126f 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -75,10 +75,10 @@ if errorlevel 1 goto exit
 :msi
 @rem Skip msi generation if not requested
 if not defined msi goto run
-python "%~dp0tools\msi\getnodeversion.py" < "%~dp0src\node_version.h" > "%temp%\node_version.txt"
+python "%~dp0tools\msvs\msi\getnodeversion.py" < "%~dp0src\node_version.h" > "%temp%\node_version.txt"
 if not errorlevel 0 echo Cannot determine current version of node.js & goto exit
 for /F "tokens=*" %%i in (%temp%\node_version.txt) do set NODE_VERSION=%%i
-msbuild "%~dp0tools\msi\nodemsi.sln" /t:Clean,Build /p:Configuration=%config% /p:NodeVersion=%NODE_VERSION% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
+msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /t:Clean,Build /p:Configuration=%config% /p:NodeVersion=%NODE_VERSION% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
 if errorlevel 1 goto exit
 
 :run