Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix MSI generation on VC Express

  • Loading branch information...
commit 8e2c014e43809c0889b42ed4e567f4b734a82c01 1 parent 429efdd
Igor Zinkovsky authored
Showing with 23 additions and 13 deletions.
  1. +22 −10 tools/msvs/msi/nodemsi.wixproj
  2. +1 −3 vcbuild.bat
View
32 tools/msvs/msi/nodemsi.wixproj
@@ -16,12 +16,12 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>..\..\..\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>Debug;ProductVersion=$(NodeVersion);ProductId=$(NodeProductId);NPMSourceDir=..\..\..\deps\npm\</DefineConstants>
+ <DefineConstants>Debug;ProductVersion=$(NodeVersion);NPMSourceDir=..\..\..\deps\npm\</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\..\..\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>Debug;ProductVersion=$(NodeVersion);ProductId=$(NodeProductId);NPMSourceDir=..\..\..\deps\npm\</DefineConstants>
+ <DefineConstants>Debug;ProductVersion=$(NodeVersion);NPMSourceDir=..\..\..\deps\npm\</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="product.wxs" />
@@ -33,13 +33,25 @@
<Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
+ <UsingTask TaskName="GenerateProductId" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+ <ParameterGroup>
+ <ProductId ParameterType="System.String" Output="true" />
+ </ParameterGroup>
+ <Task>
+ <Code Type="Fragment" Language="cs">
+ <![CDATA[
+ this.ProductId = System.Guid.NewGuid().ToString().ToUpper();
+ ]]>
+ </Code>
+ </Task>
+ </UsingTask>
<Import Project="$(WixTargetsPath)" />
- <!--
- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Wix.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
+ <Target Name="BeforeBuild">
+ <GenerateProductId>
+ <Output PropertyName="NodeProductId" TaskParameter="ProductId"/>
+ </GenerateProductId>
+ <CreateProperty Value="$(DefineConstants);ProductId=$(NodeProductId)">
+ <Output TaskParameter="Value" PropertyName="DefineConstants" />
+ </CreateProperty>
+ </Target>
</Project>
View
4 vcbuild.bat
@@ -89,9 +89,7 @@ python "%~dp0tools\getnodeversion.py" > "%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
heat dir deps\npm -var var.NPMSourceDir -dr NodeModulesFolder -cg NPMFiles -gg -template fragment -nologo -out npm.wxs
-uuidgen > "%temp%\node_product_id.txt"
-set /p NODE_PRODUCT_ID=<"%temp%\node_product_id.txt"
-msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /t:Clean,Build /p:Configuration=%config% /p:NodeVersion=%NODE_VERSION% /p:NodeProductId=%NODE_PRODUCT_ID% /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
if defined nosign goto run
Please sign in to comment.
Something went wrong with that request. Please try again.