diff options
| author | Rod Vagg <rod@vagg.org> | 2015-06-10 17:05:26 +1000 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2015-06-25 15:22:27 +1000 |
| commit | dcbb9e1da65ac16e8ed783d0b2b82ad6c7de8dbc (patch) | |
| tree | 4c449f742eee5542f73ddd02c191e50c8167f6b8 /tools/msvs | |
| parent | 8e9089ac3574682bac610b4b7a93a7915ad5ab8d (diff) | |
| download | android-node-v8-dcbb9e1da65ac16e8ed783d0b2b82ad6c7de8dbc.tar.gz android-node-v8-dcbb9e1da65ac16e8ed783d0b2b82ad6c7de8dbc.tar.bz2 android-node-v8-dcbb9e1da65ac16e8ed783d0b2b82ad6c7de8dbc.zip | |
build: update build targets for io.js
PR-URL: https://github.com/nodejs/io.js/pull/1938
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
Diffstat (limited to 'tools/msvs')
| -rw-r--r-- | tools/msvs/msi/nodemsi.wixproj | 18 | ||||
| -rwxr-xr-x | tools/msvs/msi/product.wxs | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj index 4ca4d55682..03192bb1bc 100644 --- a/tools/msvs/msi/nodemsi.wixproj +++ b/tools/msvs/msi/nodemsi.wixproj @@ -6,7 +6,7 @@ <ProductVersion>3.5</ProductVersion> <ProjectGuid>{1d808ff0-b5a9-4be9-859d-b334b6f48be2}</ProjectGuid> <SchemaVersion>2.0</SchemaVersion> - <OutputName>iojs-v$(NodeVersion)-$(Platform)</OutputName> + <OutputName>iojs-v$(FullVersion)-$(Platform)</OutputName> <OutputType>Package</OutputType> <EnableProjectHarvesting>True</EnableProjectHarvesting> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> @@ -14,25 +14,25 @@ <NodeVersion Condition=" '$(NodeVersion)' == '' ">0.0.0.0</NodeVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> - <OutputPath>..\..\..\$(Configuration)\</OutputPath> + <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> - <OutputPath>..\..\..\$(Configuration)\</OutputPath> + <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> - <OutputPath>..\..\..\$(Configuration)\</OutputPath> + <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> <Cultures>en-US</Cultures> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> - <OutputPath>..\..\..\$(Configuration)\</OutputPath> + <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> </PropertyGroup> <PropertyGroup> <EnableProjectHarvesting>True</EnableProjectHarvesting> diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index 6ba74cb450..c90f77ce54 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -85,7 +85,7 @@ <Feature Level="1" Id="DocumentationShortcuts" Title="Online documentation shortcuts" - Description="Add start menu entries that link the the online documentation for io.js $(var.ProductVersion) and the io.js website."> + Description="Add start menu entries that link the the online documentation for io.js v$(var.FullVersion) and the io.js website."> <ComponentRef Id="DocumentationShortcuts"/> </Feature> @@ -225,7 +225,7 @@ Type="url"/> <util:InternetShortcut Id="DocsShortcut" Name="io.js documentation" - Target="https://iojs.org/dist/v$(var.ProductVersion)/doc/api/" + Target="https://iojs.org/download/$(var.DistTypeDir)/v$(var.FullVersion)/doc/api/" Type="url"/> </Component> </DirectoryRef> |