Changeset 590


Ignore:
Timestamp:
11/19/2008 3:53:59 AM (5 years ago)
Author:
lowjoel
Message:

-OK, always maintain the upgrade code, but change the product ID. This way, old versions of the 6x line will be replaced with the new binaries at every install
-Also, move the localisation Features and Components to Localisations.wxs

Location:
branches/eraser6/Installer
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eraser6/Installer/DirectoryStructure.wxs

    r589 r590  
    4848                    </Component> 
    4949                </Directory> 
    50                 <Directory Id="EraserLangNlDir" Name="nl"> 
    51                     <Component Id="EraserLangNl" Guid="A404FC89-2216-4e14-96D5-30F54D120FBB"> 
    52                         <File Id="EraserNl" Name="Eraser.resources.dll" 
    53                             Source="..\bin\Release\nl\Eraser.resources.dll" 
    54                             ProcessorArchitecture="msil" /> 
    55                     </Component> 
    56                 </Directory> 
    5750 
    5851                <Directory Id="EraserPluginsDir" Name="Plugins"> 
    … …  
    7366                        </Component> 
    7467                    </Directory> 
    75                     <Directory Id="EraserPluginsLangNlDir" Name="nl"> 
    76                         <Component Id="EraserPluginsLangNl" Guid="CD85AC3F-2B4E-4ac8-8FF9-6BD3BC90BD3D"> 
    77                             <File Id="EraserDefaultPluginsNl" Name="Eraser.DefaultPlugins.resources.dll" 
    78                                 Source="..\bin\Release\Plugins\nl\Eraser.DefaultPlugins.resources.dll" 
    79                                 ProcessorArchitecture="msil" /> 
    80                         </Component> 
    81                     </Directory> 
    8268                </Directory> 
    8369            </Directory> 

  • branches/eraser6/Installer/Eraser.wxs

    r589 r590  
    2222 
    2323<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> 
    24     <Product Id="3CD6BF73-CEF1-4648-B0C6-5F3370F80C7D" Name="Eraser" Language="1033" Version="6.0.0.1" 
    25             Manufacturer="The Eraser Project" UpgradeCode="F7C915E0-B081-4a80-97E2-FDA462FEDF05"> 
     24    <Product Id="C71D72C1-1148-4ec5-8BD5-198C85AB0DDD" Name="Eraser" Language="1033" Version="6.0.0.2" 
     25            Manufacturer="The Eraser Project" UpgradeCode="D07F460B-E2B0-4cc5-A109-998CA9C2D4EA"> 
    2626        <Package Id="*" InstallerVersion="200" Compressed="yes" Keywords="Eraser" 
    2727            Description="Eraser Installer" Manufacturer="The Eraser Project" /> 
    … …  
    3939 
    4040        <!-- Program upgrades--> 
     41        <Upgrade Id ="D07F460B-E2B0-4cc5-A109-998CA9C2D4EA"> 
     42            <UpgradeVersion Property="ERASERUPDATE" Minimum="6.0.0.0" OnlyDetect="no" /> 
     43        </Upgrade> 
    4144        <InstallExecuteSequence> 
    4245            <RemoveExistingProducts After="InstallInitialize" /> 
    … …  
    6669            <ComponentRef Id="EraserPlugins" /> 
    6770            <ComponentRef Id="EraserPluginsLangEn" /> 
    68  
    69             <Feature Id="EraserLanguages" Title="Alternative Languages" 
    70                     Description="Alternative localised version of Eraser." Level="10" 
    71                     Display="expand"> 
    72                 <Feature Id="EraserLanguagesNl" Title="Dutch" Description="Dutch localisation" Level="10"> 
    73                     <ComponentRef Id="EraserLangNl" /> 
    74                     <ComponentRef Id="EraserPluginsLangNl" /> 
    75                 </Feature> 
    76             </Feature> 
     71             
     72            <FeatureRef Id="EraserLanguages" /> 
    7773        </Feature> 
    7874    </Product> 

  • branches/eraser6/Installer/Installer.wixproj

    r589 r590  
    3333    <Compile Include="DirectoryStructure.wxs" /> 
    3434    <Compile Include="Eraser.wxs" /> 
     35    <Compile Include="Localisations.wxs" /> 
    3536    <Compile Include="UserInterface.wxs" /> 
    3637  </ItemGroup> 
Note: See TracChangeset for help on using the changeset viewer.