Changeset 1628 for trunk/eraser6


Ignore:
Timestamp:
1/21/2010 8:53:32 AM (3 years ago)
Author:
lowjoel
Message:

Build the installers as a separate target in the msbuild project. Also removed the dependency on solution variables when building the WiX project.

Location:
trunk/eraser6
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/eraser6/Eraser.msbuild

    r1627 r1628  
    1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
    2     <ItemGroup> 
    3         <ProjectToBuild Include="Eraser.sln"> 
     1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="BuildInstaller"> 
     2    <ItemGroup> 
     3        <ProjectToBuild Include="Eraser.sln"> 
    44            <AdditionalProperties>Platform=Win32</AdditionalProperties> 
    5         </ProjectToBuild> 
    6         <ProjectToBuild Include="Eraser.sln"> 
    7             <AdditionalProperties>Platform=x64</AdditionalProperties> 
    8         </ProjectToBuild> 
    9         <ProjectToBuild Include="Installer\Installer.wixproj"> 
    10             <AdditionalProperties>Platform=x86;SolutionDir=$(MSBuildProjectDirectory)\</AdditionalProperties> 
    115        </ProjectToBuild> 
    12         <ProjectToBuild Include="Installer\Installer.wixproj"> 
    13             <AdditionalProperties>Platform=x64;SolutionDir=$(MSBuildProjectDirectory)\</AdditionalProperties> 
     6        <ProjectToBuild Include="Eraser.sln"> 
     7            <AdditionalProperties>Platform=x64</AdditionalProperties> 
    148        </ProjectToBuild> 
    15     </ItemGroup> 
    16     <Target Name="Build"> 
     9    </ItemGroup> 
     10    <ItemGroup> 
     11        <InstallerToBuild Include="Installer\Installer.wixproj"> 
     12            <AdditionalProperties>Platform=x86</AdditionalProperties> 
     13        </InstallerToBuild> 
     14        <InstallerToBuild Include="Installer\Installer.wixproj"> 
     15            <AdditionalProperties>Platform=x64</AdditionalProperties> 
     16        </InstallerToBuild> 
     17    </ItemGroup> 
     18    <Target Name="Build"> 
    1719        <MSBuild Projects="@(ProjectToBuild)" Properties="Configuration=Release" Targets="rebuild" /> 
    18     </Target> 
     20    </Target> 
     21    <Target Name="BuildInstaller" DependsOnTargets="Build"> 
     22        <MSBuild Projects="@(InstallerToBuild)" Properties="Configuration=Release" Targets="rebuild" /> 
     23    </Target> 
    1924</Project> 

  • trunk/eraser6/Installer/Installer.wixproj

    r1350 r1628  
    7575    --> 
    7676  <PropertyGroup> 
    77     <PreBuildEvent>call "$(SolutionDir)UpdateVersions.bat" "$(SolutionDir)\" "$(SolutionDir)Version.wxs.in" "$(SolutionDir)Version.wxs" 
    78 call "$(ProjectDir)\SignBin.bat" "$(SolutionDir)"</PreBuildEvent> 
     77    <PreBuildEvent>call "$(ProjectDir)..\UpdateVersions.bat" "$(ProjectDir)\..\\" "$(ProjectDir)..\Version.wxs.in" "$(ProjectDir)..\Version.wxs" 
     78call "$(ProjectDir)\SignBin.bat" "$(ProjectDir)..\\"</PreBuildEvent> 
    7979    <PostBuildEvent>signtool sign /a /t http://timestamp.verisign.com/scripts/timestamp.dll "$(TargetPath)"</PostBuildEvent> 
    8080  </PropertyGroup> 
Note: See TracChangeset for help on using the changeset viewer.