Tweaks to installer

- Fixed overlapping IntermediateOutputPath causing Installer build nightmares (ref wix 4661) - Execute removal logic at install, eliminating previously failed installs if present (closes #1, closes #3)
riverar · Mar 1, 2015 · 04458bd · 04458bd
1 parent c1941a0
commit 04458bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/code/installer/CustomActions.wxs b/code/installer/CustomActions.wxs
@@ -13,7 +13,7 @@
                  Sequence="execute" Before="RemoveDriver_Cmd" />
 
     <CustomAction Id="RemoveDriver_Cmd" BinaryKey="WixCA" DllEntry="CAQuietExec"
-                  Execute="deferred" Return="check" Impersonate="no"/>
+                  Execute="deferred" Return="ignore" Impersonate="no"/>
 
     <SetProperty Id="StartDriver_Cmd"
                  Value='"sc.exe" start uxstyle'
@@ -30,9 +30,7 @@
                   Execute="deferred" Return="check" Impersonate="no"/>
 
     <InstallExecuteSequence>
-      <Custom Action="RemoveDriver_Cmd" After="DeleteServices">
-        ?elytsxu.sys = 3
-      </Custom>
+	  <Custom Action="RemoveDriver_Cmd" After="DeleteServices" />
 
       <Custom Action="StopDriver_Cmd" After="StopServices">
         ?elytsxu.sys = 3

diff --git a/code/installer/Installer.wixproj b/code/installer/Installer.wixproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\..\bin\x86\debug\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug;</DefineConstants>
     <LinkerAdditionalOptions>-ext WixUtilExtension -ext WixUIExtension</LinkerAdditionalOptions>
     <WixVariables>
@@ -25,7 +25,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\..\bin\x86\release\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
     <LinkerAdditionalOptions>-ext WixUtilExtension -ext WixUIExtension -cultures:en-us</LinkerAdditionalOptions>
     <WixVariables>
     </WixVariables>
@@ -38,7 +38,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>..\..\bin\x64\debug\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug;</DefineConstants>
     <LinkerAdditionalOptions>-ext WixUtilExtension -ext WixUIExtension</LinkerAdditionalOptions>
     <WixVariables>
@@ -51,7 +51,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>..\..\bin\x64\release\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
     <LinkerAdditionalOptions>-ext WixUtilExtension -ext WixUIExtension -cultures:en-us</LinkerAdditionalOptions>
     <WixVariables>
     </WixVariables>

diff --git a/code/installer/Product.wxs b/code/installer/Product.wxs
@@ -31,7 +31,7 @@
           <ServiceInstall Id="UnsignedThemes_ServiceInstall" Name="UnsignedThemes" Type="ownProcess" LoadOrderGroup="AudioGroup" Start="auto" DisplayName="Unsigned Themes"
                           Description="Enables the use of unsigned third-party themes." ErrorControl="ignore" />
 
-          <ServiceControl Id="UnsignedThemes_ServiceControl" Name="UnsignedThemes" Start="install" Stop="uninstall" Remove="uninstall" Wait="yes" />
+          <ServiceControl Id="UnsignedThemes_ServiceControl" Name="UnsignedThemes" Start="install" Stop="uninstall" Remove="both" Wait="yes" />
 
           <RegistryValue Id="EnableLogging" Action="write" Root="HKLM" Key="SYSTEM\CurrentControlSet\services\uxstyle\Parameters" Type="integer" Name="EnableLogging" Value="0" />
           <RegistryValue Id="LogFile" Action="write" Root="HKLM" Key="SYSTEM\CurrentControlSet\services\uxstyle\Parameters" Type="string" Name="LogFile" Value="" />