Changeset 591


Ignore:
Timestamp:
11/19/2008 5:25:09 AM (5 years ago)
Author:
lowjoel
Message:

-Define the preprocessor constant with our version string
-Prevent installations where an installed version is newer than the current version
-Upgrade installations lower than the current installer version
-I've reset the upgradecode to be the same as the first installer

Location:
branches/eraser6/Installer
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eraser6/Installer/DirectoryStructure.wxs

    r590 r591  
    3434                    </File> 
    3535                    <File Id="BevelLine" Name="BevelLine.dll" Source="..\bin\Release\BevelLine.dll" 
    36                         ProcessorArchitecture="msil"/> 
     36                        ProcessorArchitecture="msil" /> 
    3737                    <File Id="EraserManager" Name="Eraser.Manager.dll" 
    3838                        Source="..\bin\Release\Eraser.Manager.dll" ProcessorArchitecture="msil" /> 

  • branches/eraser6/Installer/Eraser.wxs

    r590 r591  
    2222 
    2323<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> 
    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"> 
     24    <!-- Change these constants at every build. --> 
     25    <?define VERSIONSTRING=6.0.1.3 ?><!-- Major.Minor.Release.Build --> 
     26    <?define PRODUCTID=58F70C8E-1E46-4864-86FC-119693E4DFE2?> 
     27 
     28    <Product Id="$(var.PRODUCTID)" Name="Eraser" Language="1033" Version="$(var.VERSIONSTRING)" 
     29            Manufacturer="The Eraser Project" UpgradeCode="073882B4-E059-4FB4-9D36-11E88D14AE87"> 
    2630        <Package Id="*" InstallerVersion="200" Compressed="yes" Keywords="Eraser" 
    2731            Description="Eraser Installer" Manufacturer="The Eraser Project" /> 
    … …  
    4044        <!-- Program upgrades--> 
    4145        <Upgrade Id ="D07F460B-E2B0-4cc5-A109-998CA9C2D4EA"> 
    42             <UpgradeVersion Property="ERASERUPDATE" Minimum="6.0.0.0" OnlyDetect="no" /> 
     46            <UpgradeVersion Property="ERASERUPDATE" Minimum="6.0.0" Maximum="$(var.VERSIONSTRING)" OnlyDetect="no" /> 
     47            <UpgradeVersion Property="ERASERDOWNDATE" Minimum="$(var.VERSIONSTRING)" OnlyDetect="yes" /> 
    4348        </Upgrade> 
     49        <CustomAction Id="AlreadyUpdated" Error="A newer version of Eraser is already installed. Setup will now exit." /> 
     50        <InstallUISequence> 
     51            <FindRelatedProducts Before="LaunchConditions" /> 
     52            <Custom Action="AlreadyUpdated" After="FindRelatedProducts">ERASERDOWNDATE</Custom> 
     53        </InstallUISequence> 
    4454        <InstallExecuteSequence> 
    4555            <RemoveExistingProducts After="InstallInitialize" /> 
Note: See TracChangeset for help on using the changeset viewer.