Author: cwittich Date: Wed May 27 14:53:33 2009 New Revision: 41137
URL: http://svn.reactos.org/svn/reactos?rev=41137&view=rev Log: add msi installer project (req. WiX v3)
Added: trunk/tools/reactosdbg/Installer/ (with props) trunk/tools/reactosdbg/Installer/Installer.wixproj (with props) trunk/tools/reactosdbg/Installer/Product.wxs (with props) Modified: trunk/tools/reactosdbg/ReactosDBG.sln
Propchange: trunk/tools/reactosdbg/Installer/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed May 27 14:53:33 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+)
Propchange: trunk/tools/reactosdbg/Installer/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/tools/reactosdbg/Installer/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Added: trunk/tools/reactosdbg/Installer/Installer.wixproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Installer/Installe... ============================================================================== --- trunk/tools/reactosdbg/Installer/Installer.wixproj (added) +++ trunk/tools/reactosdbg/Installer/Installer.wixproj [iso-8859-1] Wed May 27 14:53:33 2009 @@ -1,0 +1,64 @@ +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">x86</Platform> + <ProductVersion>3.0</ProductVersion> + <ProjectGuid>{b2c4fede-c383-49a2-b871-d17da238bb47}</ProjectGuid> + <SchemaVersion>2.0</SchemaVersion> + <OutputName>RosDbg</OutputName> + <OutputType>Package</OutputType> + <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath> + <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <OutputPath>bin$(Configuration)</OutputPath> + <IntermediateOutputPath>obj$(Configuration)</IntermediateOutputPath> + <DefineConstants>Debug</DefineConstants> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin$(Configuration)</OutputPath> + <IntermediateOutputPath>obj$(Configuration)</IntermediateOutputPath> + </PropertyGroup> + <ItemGroup> + <Compile Include="Product.wxs" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\DbgHelp\DbgHelp.csproj"> + <Name>DbgHelp</Name> + <Project>{3442437a-cb9c-4c73-b35b-3f6e4f60f3b2}</Project> + <Private>True</Private> + </ProjectReference> + <ProjectReference Include="..\DebugProtocol\DebugProtocol.csproj"> + <Name>DebugProtocol</Name> + <Project>{76a02c1d-4b11-4d43-966e-e5c053870d65}</Project> + <Private>True</Private> + </ProjectReference> + <ProjectReference Include="..\Pipe\Pipe.csproj"> + <Name>Pipe</Name> + <Project>{f943218a-0a5e-436e-a7a4-475f37f45fa8}</Project> + <Private>True</Private> + </ProjectReference> + <ProjectReference Include="..\RosDBG\RosDBG.csproj"> + <Name>RosDBG</Name> + <Project>{fb776bfe-d2c2-465e-b713-6ad82cae1a39}</Project> + <Private>True</Private> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <WixExtension Include="WixNetFxExtension"> + <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath> + </WixExtension> + <WixExtension Include="WixUIExtension"> + <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath> + </WixExtension> + </ItemGroup> + <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> + --> +</Project>
Propchange: trunk/tools/reactosdbg/Installer/Installer.wixproj ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/tools/reactosdbg/Installer/Product.wxs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Installer/Product.... ============================================================================== --- trunk/tools/reactosdbg/Installer/Product.wxs (added) +++ trunk/tools/reactosdbg/Installer/Product.wxs [iso-8859-1] Wed May 27 14:53:33 2009 @@ -1,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Product Id="c10bd463-0752-4b27-82ab-fc852bb11ee3" Name="ReactOS Remote Debugger" Language="1033" Version="1.0.0.0" Manufacturer="ReactOS Team" UpgradeCode="ea120514-a7ac-44c9-b68f-819bb15d22bd"> + <Package InstallerVersion="200" Compressed="yes" /> + + <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" /> + + <Directory Id="TARGETDIR" Name="SourceDir"> + + <Directory Id="ProgramFilesFolder"> + <Directory Id="INSTALLLOCATION" Name="ReactOS Remote Debugger"> + <Component Id ="ProgramFiles" Guid ="326981F4-EF71-49fc-BE0C-9433F674F059"> + + + <File Id="dbghelp.dll" Name="dbghelp.dll" Source="$(var.SolutionDir)dbghelptest\dbghelp.dll" DiskId="1"/> + <File Id="$(var.DbgHelp.TargetFileName)" Name="$(var.DbgHelp.TargetFileName)" Source="$(var.DbgHelp.TargetPath)" DiskId="1"/> + <File Id="$(var.Pipe.TargetFileName)" Name="$(var.Pipe.TargetFileName)" Source="$(var.Pipe.TargetPath)" DiskId="1"/> + <File Id="$(var.DebugProtocol.TargetFileName)" Name="$(var.DebugProtocol.TargetFileName)" Source="$(var.DebugProtocol.TargetPath)" DiskId="1"/> + <File Id="$(var.RosDBG.TargetFileName)" Name="$(var.RosDBG.TargetFileName)" Source="$(var.RosDBG.TargetPath)" DiskId="1" KeyPath="yes"> + <Shortcut Id="startmenuRosDbg" Directory="ProgramMenuDir" Name="ReactOS Remote Debugger" WorkingDirectory='INSTALLDIR' + Icon="$(var.RosDBG.TargetFileName)" IconIndex="0" Advertise="yes" /> + <Shortcut Id="desktopRosDbg" Directory="DesktopFolder" Name="ReactOS Remote Debugger" WorkingDirectory='INSTALLDIR' + Icon="$(var.RosDBG.TargetFileName)" IconIndex="0" Advertise="yes" /> + </File> + </Component> + </Directory> + </Directory> + + <Directory Id="ProgramMenuFolder"> + <Directory Id="ProgramMenuDir" Name='ReactOS Remote Debugger'> + <Component Id='ProgramMenuDir' Guid='C8B5EF28-F6D9-40a6-B7CB-6F6BF22FC0D7'> + <RemoveFolder Id='ProgramMenuDir' On='uninstall'/> + <RegistryValue Root='HKCU' Key='SOFTWARE\ReactOS\RosDbg' + Type='string' Value='StartMenuFolder' + KeyPath='yes' /> + </Component > + </Directory> + </Directory> + <Directory Id="DesktopFolder" Name="Desktop" /> + + </Directory> + + <Icon Id="$(var.RosDBG.TargetFileName)" SourceFile="$(var.RosDBG.TargetPath)" /> + + <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" /> + <UIRef Id="WixUI_Common" /> + <UIRef Id="WixUI_ErrorProgressText" /> + + <UI Id="WixUI_InstallDir"> + <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> + <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> + <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> + + <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> + <Property Id="WixUI_Mode" Value="InstallDir" /> + + <DialogRef Id="BrowseDlg" /> + <DialogRef Id="DiskCostDlg" /> + <DialogRef Id="ErrorDlg" /> + <DialogRef Id="FatalError" /> + <DialogRef Id="FilesInUse" /> + <DialogRef Id="MsiRMFilesInUse" /> + <DialogRef Id="PrepareDlg" /> + <DialogRef Id="ProgressDlg" /> + <DialogRef Id="ResumeDlg" /> + <DialogRef Id="UserExit" /> + + <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish> + <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish> + + <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> + + <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">1</Publish> + + <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> + <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> + <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">1</Publish> + <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish> + <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID="1"]]></Publish> + <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish> + <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish> + + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed</Publish> + + <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> + + <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> + + <Property Id="ARPNOMODIFY" Value="1" /> + </UI> + + <PropertyRef Id="NETFRAMEWORK35" /> + <Condition Message="This setup requires the .NET Framework 3.5 to be installed."> + Installed OR NETFRAMEWORK35 + </Condition> + + <Feature Id="ProductFeature" Title="ReactOS Remote Debugger" Level="1"> + <ComponentRef Id='ProgramFiles' /> + <ComponentRef Id='ProgramMenuDir' /> + </Feature> + </Product> +</Wix>
Propchange: trunk/tools/reactosdbg/Installer/Product.wxs ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/tools/reactosdbg/ReactosDBG.sln URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/ReactosDBG.sln?rev... ============================================================================== --- trunk/tools/reactosdbg/ReactosDBG.sln [iso-8859-1] (original) +++ trunk/tools/reactosdbg/ReactosDBG.sln [iso-8859-1] Wed May 27 14:53:33 2009 @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C# Express 2008 +# Visual Studio 2008 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RosDBG", "RosDBG\RosDBG.csproj", "{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DebugProtocol", "DebugProtocol\DebugProtocol.csproj", "{76A02C1D-4B11-4D43-966E-E5C053870D65}" @@ -9,28 +9,68 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbgHelp", "DbgHelp\DbgHelp.csproj", "{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{B2C4FEDE-C383-49A2-B871-D17DA238BB47}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|x86.ActiveCfg = Debug|Any CPU {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Any CPU.Build.0 = Release|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|x86.ActiveCfg = Release|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|x86.ActiveCfg = Debug|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Any CPU.ActiveCfg = Release|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Any CPU.Build.0 = Release|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|x86.ActiveCfg = Release|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|x86.ActiveCfg = Debug|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Any CPU.ActiveCfg = Release|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Any CPU.Build.0 = Release|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|x86.ActiveCfg = Release|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|x86.ActiveCfg = Debug|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Any CPU.Build.0 = Release|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|x86.ActiveCfg = Release|Any CPU + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Any CPU.ActiveCfg = Debug|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|x86.ActiveCfg = Debug|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|x86.Build.0 = Debug|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Any CPU.ActiveCfg = Release|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Mixed Platforms.Build.0 = Release|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|x86.ActiveCfg = Release|x86 + {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE