moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-08-16 16:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize WiX sources

Browse Source
This commit is contained in:
Cameron Gutman 2018-07-25 19:33:09 -07:00
parent 1f314b839e
commit 718a575478
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/generate-installers.bat
View File

@ -67,7 +67,7 @@ copy %BUILD_FOLDER%\app\%BUILD_CONFIG%\Moonlight.exe %DEPLOY_FOLDER%
if !ERRORLEVEL! NEQ 0 goto Error if !ERRORLEVEL! NEQ 0 goto Error
echo Building installer echo Building installer
msbuild %SOURCE_ROOT%\wix\Moonlight\Moonlight.sln /p:Configuration=%BUILD_CONFIG% /p:Platform=%ARCH% msbuild %SOURCE_ROOT%\wix\Moonlight.sln /p:Configuration=%BUILD_CONFIG% /p:Platform=%ARCH%
if !ERRORLEVEL! NEQ 0 goto Error if !ERRORLEVEL! NEQ 0 goto Error
echo Build successful! echo Build successful!

4
wix/Moonlight/Moonlight.sln → wix/Moonlight.sln
View File

@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio 15
VisualStudioVersion = 15.0.27703.2035 VisualStudioVersion = 15.0.27703.2035
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Moonlight", "Moonlight.wixproj", "{466FA35D-4BE4-40EF-9CE5-AFADC3B63BC5}" Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MoonlightSetup", "MoonlightSetup\MoonlightSetup.wixproj", "{466FA35D-4BE4-40EF-9CE5-AFADC3B63BC5}"
EndProject EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MoonlightMsi", "..\MoonlightMsi\MoonlightMsi.wixproj", "{8468EF94-3BB8-47A5-AF15-0E314AFE664D}" Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Moonlight", "Moonlight\Moonlight.wixproj", "{8468EF94-3BB8-47A5-AF15-0E314AFE664D}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

28
wix/Moonlight/Moonlight.wixproj
View File

@ -2,37 +2,31 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProductVersion>3.10</ProductVersion> <ProductVersion>3.10</ProductVersion>
<ProjectGuid>466fa35d-4be4-40ef-9ce5-afadc3b63bc5</ProjectGuid> <ProjectGuid>8468ef94-3bb8-47a5-af15-0e314afe664d</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<OutputName>Moonlight</OutputName> <OutputName>Moonlight</OutputName>
<OutputType>Bundle</OutputType> <OutputType>Package</OutputType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>Debug</DefineConstants> <DefineConstants>Debug</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<OutputPath>$(INSTALLER_FOLDER)\</OutputPath> <OutputPath>$(BUILD_FOLDER)\</OutputPath>
<IntermediateOutputPath>$(BUILD_FOLDER)\</IntermediateOutputPath> <IntermediateOutputPath>$(BUILD_FOLDER)\</IntermediateOutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<DefineConstants>SourceDir=$(DEPLOY_FOLDER)</DefineConstants>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Bundle.wxs" /> <Compile Include="Product.wxs" />
<Compile Include="$(BUILD_FOLDER)\Dependencies.wxs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<WixExtension Include="WixBalExtension"> <WixExtension Include="WixFirewallExtension">
<HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath> <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
<Name>WixBalExtension</Name> <Name>WixFirewallExtension</Name>
</WixExtension> </WixExtension>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MoonlightMsi\MoonlightMsi.wixproj">
<Name>MoonlightMsi</Name>
<Project>{8468ef94-3bb8-47a5-af15-0e314afe664d}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">

0
wix/MoonlightMsi/Product.wxs → wix/Moonlight/Product.wxs
View File

4
wix/Moonlight/Bundle.wxs → wix/MoonlightSetup/Bundle.wxs
View File

@ -4,7 +4,7 @@
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"> xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
<Bundle Name="Moonlight Game Streaming Client" <Bundle Name="Moonlight Game Streaming Client"
Version="!(bind.PackageVersion.MoonlightMsi)" Version="!(bind.PackageVersion.Moonlight)"
Manufacturer="Moonlight Game Streaming Team" Manufacturer="Moonlight Game Streaming Team"
UpgradeCode="466fa35d-4be4-40ef-9ce5-afadc3b63bc5" UpgradeCode="466fa35d-4be4-40ef-9ce5-afadc3b63bc5"
HelpUrl="https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide" HelpUrl="https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide"
@ -24,7 +24,7 @@
</BootstrapperApplicationRef> </BootstrapperApplicationRef>
<Chain> <Chain>
<MsiPackage Id="MoonlightMsi" SourceFile="$(var.MoonlightMsi.TargetPath)" Vital="yes"> <MsiPackage Id="Moonlight" SourceFile="$(var.Moonlight.TargetPath)" Vital="yes">
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
</MsiPackage> </MsiPackage>
</Chain> </Chain>

30
wix/MoonlightMsi/MoonlightMsi.wixproj → wix/MoonlightSetup/MoonlightSetup.wixproj
View File

@ -2,31 +2,37 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProductVersion>3.10</ProductVersion> <ProductVersion>3.10</ProductVersion>
<ProjectGuid>8468ef94-3bb8-47a5-af15-0e314afe664d</ProjectGuid> <ProjectGuid>466fa35d-4be4-40ef-9ce5-afadc3b63bc5</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<OutputName>MoonlightMsi</OutputName> <OutputName>MoonlightSetup</OutputName>
<OutputType>Package</OutputType> <OutputType>Bundle</OutputType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>Debug</DefineConstants> <DefineConstants>Debug</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<OutputPath>$(BUILD_FOLDER)\</OutputPath> <OutputPath>$(INSTALLER_FOLDER)\</OutputPath>
<IntermediateOutputPath>$(BUILD_FOLDER)\</IntermediateOutputPath> <IntermediateOutputPath>$(BUILD_FOLDER)\</IntermediateOutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<DefineConstants>SourceDir=$(DEPLOY_FOLDER)</DefineConstants>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Product.wxs" /> <Compile Include="Bundle.wxs" />
<Compile Include="$(BUILD_FOLDER)\Dependencies.wxs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<WixExtension Include="WixFirewallExtension"> <WixExtension Include="WixBalExtension">
<HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath> <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
<Name>WixFirewallExtension</Name> <Name>WixBalExtension</Name>
</WixExtension> </WixExtension>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Moonlight\Moonlight.wixproj">
<Name>Moonlight</Name>
<Project>{8468ef94-3bb8-47a5-af15-0e314afe664d}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">

0
wix/Moonlight/license.rtf → wix/MoonlightSetup/license.rtf
View File