Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

fix msi builder

  • Loading branch information...
Igor Zinkovsky
Igor Zinkovsky committed Nov 11, 2011
1 parent 13324bf commit ec90ede1cf11f78b746da04a35d4eb32c05b535b
Showing with 5 additions and 5 deletions.
  1. +2 −2 tools/msvs/msi/nodemsi.wixproj
  2. +1 −1 tools/msvs/msi/product.wxs
  3. +2 −2 vcbuild.bat
@@ -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>
@@ -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"
@@ -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

0 comments on commit ec90ede

Please sign in to comment.
You can’t perform that action at this time.