Skip to content

Commit ec90ede

Browse files
author
Igor Zinkovsky
committed
fix msi builder
1 parent 13324bf commit ec90ede

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

tools/msvs/msi/nodemsi.wixproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
<NodeVersion Condition=" '$(NodeVersion)' == '' ">0.0.0.0</NodeVersion>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
16-
<OutputPath>..\..\$(Configuration)\</OutputPath>
16+
<OutputPath>..\..\..\$(Configuration)\</OutputPath>
1717
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
1818
<DefineConstants>Debug;ProductVersion=$(NodeVersion)</DefineConstants>
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
21-
<OutputPath>..\..\$(Configuration)\</OutputPath>
21+
<OutputPath>..\..\..\$(Configuration)\</OutputPath>
2222
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
2323
<DefineConstants>Debug;ProductVersion=$(NodeVersion)</DefineConstants>
2424
</PropertyGroup>

tools/msvs/msi/product.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33

4-
<?define sourcedir="$(var.ProjectDir)..\..\$(var.Configuration)\" ?>
4+
<?define sourcedir="$(var.ProjectDir)..\..\..\$(var.Configuration)\" ?>
55

66
<Product Id="cc6c176e-e26c-48ec-8970-f58bd1d046cf"
77
Name="node.js"

vcbuild.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ if errorlevel 1 goto exit
7575
:msi
7676
@rem Skip msi generation if not requested
7777
if not defined msi goto run
78-
python "%~dp0tools\msi\getnodeversion.py" < "%~dp0src\node_version.h" > "%temp%\node_version.txt"
78+
python "%~dp0tools\msvs\msi\getnodeversion.py" < "%~dp0src\node_version.h" > "%temp%\node_version.txt"
7979
if not errorlevel 0 echo Cannot determine current version of node.js & goto exit
8080
for /F "tokens=*" %%i in (%temp%\node_version.txt) do set NODE_VERSION=%%i
81-
msbuild "%~dp0tools\msi\nodemsi.sln" /t:Clean,Build /p:Configuration=%config% /p:NodeVersion=%NODE_VERSION% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
81+
msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /t:Clean,Build /p:Configuration=%config% /p:NodeVersion=%NODE_VERSION% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
8282
if errorlevel 1 goto exit
8383

8484
:run

0 commit comments

Comments
 (0)