Skip to content

Commit 677d3bf

Browse files
GlennPruittGlennPruitt
committed
Updates to saymore installer. Changed graphics, removed data folder, removed component chooser, fix path for pathes.
1 parent cb877e2 commit 677d3bf

16 files changed

+44
-30
lines changed

‎WiXInstaller/BaseInstallerBuild/TemplateBundle.wxs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
</PackageGroup>
5151
</Fragment>
5252

53+
<!--
5354
<?define NetFx451MinRelease = 378675?>
5455
<?define NetFx451WebLink = http://go.microsoft.com/fwlink/?LinkId=322115 ?>
5556
<?define NetFx451RedistLink = http://go.microsoft.com/fwlink/?LinkId=322116 ?>
@@ -96,7 +97,9 @@
9697
</ExePackage>
9798
</PackageGroup>
9899
</Fragment>
99-
100+
-->
101+
102+
<!--
100103
<?define VC10RedistWebLink = https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe ?>
101104
<?define VC11RedistWebLink = https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe ?>
102105
<?define VC12RedistWebLink = http://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe ?>
@@ -169,4 +172,5 @@
169172
</ExePackage>
170173
</PackageGroup>
171174
</Fragment>
175+
-->
172176
</Wix>

‎WiXInstaller/BaseInstallerBuild/TemplateBundleTheme.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
99
-->
1010
<Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
11-
<Font Id="1" Height="-32" Weight="500" Foreground="FFFFFF">Segoe UI</Font>
11+
<Font Id="1" Height="-32" Weight="500" Foreground="000000">Segoe UI</Font>
1212
<Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
13-
<Font Id="3" Height="-13" Weight="500" Foreground="FFFFFF" Background="3d2004">Segoe UI</Font>
13+
<Font Id="3" Height="-13" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
1414
<Font Id="4" Height="-14" Weight="500" Foreground="fdf1af" Background="3d2004" Underline="no">Segoe UI</Font>
1515
<Font Id="5" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
1616
<Font Id="6" Height="-14" Weight="500" Foreground="fdf1af" Background="3d2004" Underline="yes">Segoe UI</Font>
17-
<Font Id="7" Height="-13" Weight="500" Foreground="FFFFFF" Background="3d2004">Segoe UI</Font>
17+
<Font Id="7" Height="-13" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
1818

1919
<!--<Text X="80" Y="11" Width="-11" Height="64" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>-->
2020

‎WiXInstaller/BaseInstallerBuild/TemplateFramework.wxs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@
146146
<UIRef Id="WixUI_ErrorProgressText" />
147147

148148
<Directory Id='TARGETDIR' Name='SourceDir'>
149-
<Directory Id='DATAFOLDER' Name='.' />
150-
<Directory Id='FontsFolder'/>
149+
<!--<Directory Id='DATAFOLDER' Name='.' />-->
150+
<!--<Directory Id='FontsFolder'/>-->
151151
<Directory Id="DesktopFolder" Name="Desktop">
152152
<Component Id="ApplicationShortcutDesktop" Guid="*">
153153
<Shortcut Id="ApplicationDesktopShortcut"
@@ -206,6 +206,7 @@
206206
</Component>
207207
</DirectoryRef>
208208

209+
<!--
209210
<DirectoryRef Id='FontsFolder'>
210211
<Component Id='Font1' Guid='*' Permanent='yes'>
211212
<Condition>DOULOS_INSTALLED="False"</Condition>
@@ -264,6 +265,7 @@
264265
<File Id='SILEzraOTSR' Source='..\resources\SILEOTSR.ttf' TrueType='yes'/>
265266
</Component>
266267
</DirectoryRef>
268+
-->
267269

268270
<!-- A "typical" install will install featues of level 3 and below. A "complete" install will install features of level 1000 and below.
269271
A "custom" install will display the tree view with items of value "3" and below selected by default. -->
@@ -278,19 +280,22 @@
278280
<ComponentRef Id='AppIcon'/>
279281
</Feature>
280282

283+
<!--
281284
<Feature Id='DataFiles' Title='Default Data' Description='Default data files distributed with the application.'
282285
Level='1' ConfigurableDirectory='DATAFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
283286
<ComponentGroupRef Id="HarvestedDataFiles" />
284287
</Feature>
285-
286-
<Feature Id='DesktopShortcut' Title='Desktop Shortuct' Description='Creates a shortcut on the desktop.' Level='3' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
288+
-->
289+
290+
<Feature Id='DesktopShortcut' Title='Desktop Shortuct' Description='Creates a shortcut on the desktop.' Level='1' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
287291
<ComponentRef Id='ApplicationShortcutDesktop'/>
288292
</Feature>
289293

290-
<Feature Id='MenuShortcut' Title='Start Menu Shortuct' Description='Creates a shortcut in the Start menu.' Level='3' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
294+
<Feature Id='MenuShortcut' Title='Start Menu Shortuct' Description='Creates a shortcut in the Start menu.' Level='1' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
291295
<ComponentRef Id='ApplicationShortcutMenu' />
292296
</Feature>
293297

298+
<!-- Fonts not needed for saymore
294299
<Feature Id='Fonts' Title='Related Fonts' Description='Installing fonts used by the application.' Level='3' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
295300
<ComponentRef Id='Font1'/>
296301
<ComponentRef Id='Font2'/>
@@ -307,6 +312,7 @@
307312
<ComponentRef Id='Font13'/>
308313
<ComponentRef Id='Font14'/>
309314
</Feature>
315+
-->
310316
</Feature>
311317
</Product>
312318
</Wix>

‎WiXInstaller/BaseInstallerBuild/TemplateInstallDirDlg.wxs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
</Control>
3535

3636
<!-- Users of this repo should edit the text field in the following line. -->
37+
<!--
3738
<Control Id="ProjFolderLabel" Type="Text" X="20" Y="140" Width="290" Height="15" NoPrefix="yes" Text="My Paratext Projects folder:" />
3839
<Control Id="ProjFolder" Type="PathEdit" X="20" Y="160" Width="320" Height="18" Property="WIXUI_PROJECTSDIR" Indirect="yes" >
3940
<Condition Action="enable"><![CDATA[DATAFOLDERFOUND <> "AlreadyExisting"]]></Condition>
@@ -44,6 +45,7 @@
4445
<Condition Action="disable"><![CDATA[DATAFOLDERFOUND = "AlreadyExisting"]]></Condition>
4546
</Control>
4647
<Control Id="ProjFolderExplanation" Type="Text" X="96" Y="180" Width="244" Height="30" NoPrefix="yes" Text="[EXPLANATIONTEXT]"/>
48+
-->
4749
</Dialog>
4850
</UI>
4951
</Fragment>

‎WiXInstaller/BaseInstallerBuild/TemplateOfflineBundle.wxs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
</PackageGroup>
5151
</Fragment>
5252

53+
<!--
5354
<Fragment>
5455
<util:RegistrySearch Root="HKLM" Key="SOFTWARE\Microsoft\Net Framework Setup\NDP\v4\Full" Value="Version" Variable="Netfx45FullVersion" />
5556
<util:RegistrySearch Root="HKLM" Key="SOFTWARE\Microsoft\Net Framework Setup\NDP\v4\Full" Value="Version" Variable="Netfx45x64FullVersion" Win64="yes" />
@@ -67,7 +68,9 @@
6768
</ExePackage>
6869
</PackageGroup>
6970
</Fragment>
71+
-->
7072

73+
<!--
7174
<Fragment>
7275
<util:RegistrySearch Root="HKLM"
7376
Key="SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86"
@@ -115,5 +118,5 @@
115118
/>
116119
</PackageGroup>
117120
</Fragment>
118-
119-
</Wix>
121+
-->
122+
</Wix>

‎WiXInstaller/BaseInstallerBuild/WixUI_TemplateDialogFlow.wxs‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ Patch dialog sequence:
3535
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
3636
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
3737
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
38-
<TextStyle Id="WixUI_Font_Normal_White" FaceName="Tahoma" Size="8" Red="255" Green="255" Blue="255"/>
39-
<TextStyle Id="WixUI_Font_Bigger_White" FaceName="Tahoma" Size="12" Red="255" Green="255" Blue="255"/>
40-
<TextStyle Id="WixUI_Font_Title_White" FaceName="Tahoma" Size="9" Bold="yes" Red="255" Green="255" Blue="255"/>
38+
<TextStyle Id="WixUI_Font_Normal_White" FaceName="Tahoma" Size="8" Red="0" Green="0" Blue="0"/>
39+
<TextStyle Id="WixUI_Font_Bigger_White" FaceName="Tahoma" Size="12" Red="0" Green="0" Blue="0"/>
40+
<TextStyle Id="WixUI_Font_Title_White" FaceName="Tahoma" Size="9" Bold="yes" Red="0" Green="0" Blue="0"/>
4141

4242
<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
4343
<Property Id="WixUI_Mode" Value="InstallDir" />
@@ -59,9 +59,10 @@ Patch dialog sequence:
5959

6060
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
6161

62-
<Publish Dialog="TemplateWelcomeDlg" Control="Next" Event="NewDialog" Value="TemplateSetupTypeDlg">NOT Installed</Publish>
62+
<Publish Dialog="TemplateWelcomeDlg" Control="Next" Event="NewDialog" Value="TemplateInstallDirDlg">NOT Installed</Publish>
6363
<Publish Dialog="TemplateWelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
6464

65+
<!--
6566
<Publish Dialog="TemplateSetupTypeDlg" Control="Back" Event="NewDialog" Value="TemplateWelcomeDlg">1</Publish>
6667
<Publish Dialog="TemplateSetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="TemplateInstallDirDlg">1</Publish>
6768
<Publish Dialog="TemplateSetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="TemplateCustomizeDlg">1</Publish>
@@ -70,13 +71,9 @@ Patch dialog sequence:
7071
<Publish Dialog="TemplateCustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
7172
<Publish Dialog="TemplateCustomizeDlg" Control="Back" Event="NewDialog" Value="TemplateSetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
7273
<Publish Dialog="TemplateCustomizeDlg" Control="Next" Event="NewDialog" Value="TemplateInstallDirDlg">1</Publish>
74+
-->
7375

74-
<Publish Dialog="TemplateInstallDirDlg" Control="Back" Event="NewDialog" Value="TemplateCustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
75-
<Publish Dialog="TemplateInstallDirDlg" Control="Back" Event="NewDialog" Value="TemplateSetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
76-
<Publish Dialog="TemplateInstallDirDlg" Control="Back" Event="NewDialog" Value="TemplateCustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
77-
<Publish Dialog="TemplateInstallDirDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
78-
<Publish Dialog="TemplateInstallDirDlg" Control="Back" Event="NewDialog" Value="TemplateWelcomeDlg" Order="2">WixUI_InstallMode = "Update"</Publish>
79-
76+
<Publish Dialog="TemplateInstallDirDlg" Control="Back" Event="NewDialog" Value="TemplateWelcomeDlg" Order="1" />
8077
<Publish Dialog="TemplateInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
8178
<Publish Dialog="TemplateInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
8279
<Publish Dialog="TemplateInstallDirDlg" Control="Next" Event="DoAction" Value="CheckApplicationPath" Order="3">NOT WIXUI_DONTVALIDATEPATH</Publish>
@@ -85,8 +82,8 @@ Patch dialog sequence:
8582
<Publish Dialog="TemplateInstallDirDlg" Control="ChangeAppFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
8683
<Publish Dialog="TemplateInstallDirDlg" Control="ChangeAppFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
8784

88-
<Publish Dialog="TemplateInstallDirDlg" Control="ChangeProjFolder" Property="_BrowseProperty" Value="[WIXUI_PROJECTSDIR]" Order="1">1</Publish>
89-
<Publish Dialog="TemplateInstallDirDlg" Control="ChangeProjFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
85+
<!--<Publish Dialog="TemplateInstallDirDlg" Control="ChangeProjFolder" Property="_BrowseProperty" Value="[WIXUI_PROJECTSDIR]" Order="1">1</Publish>
86+
<Publish Dialog="TemplateInstallDirDlg" Control="ChangeProjFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>-->
9087

9188

9289
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="TemplateInstallDirDlg" Order="1">NOT Installed</Publish>
@@ -95,7 +92,7 @@ Patch dialog sequence:
9592

9693
<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
9794

98-
<Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="TemplateCustomizeDlg">1</Publish>
95+
<Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="TemplateInstallDirDlg">1</Publish>
9996
<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
10097
<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
10198
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>

‎WiXInstaller/BaseInstallerBuild/buildBaseInstaller.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ heat.exe dir %APPBUILDDIR% -cg HarvestedAppFiles -gg -scom -sreg -sfrag -srd -sw
4848
heat.exe dir %APPDATADIR% -cg HarvestedDataFiles -gg -scom -sreg -sfrag -srd -sw5150 -sw5151 -dr DATAFOLDER -var var.APPDATADIR -t KeyPathFix.xsl -out DataHarvest.wxs
4949

5050
@REM Compile (candle) and Link (light) the MSI file.
51-
candle.exe -dApplicationName=%AppName% -dManufacturer=%Manufacturer% -dVersionNumber=%Version% -dMajorVersion=%Major% -dMinorVersion=%Minor% -dAPPBUILDDIR=%APPBUILDDIR% -dAPPDATADIR=%APPDATADIR% -dUpgradeCode=%UPGRADECODEGUID% -dProductCode=%PRODUCTIDGUID% -dShortcutTargetName=%ShortcutTargetName% TemplateFramework.wxs AppHarvest.wxs DataHarvest.wxs WixUI_TemplateDialogFlow.wxs TemplateInstallDirDlg.wxs TemplateProgressDlg.wxs TemplateWelcomeDlg.wxs TemplateCustomizeDlg.wxs TemplateSetupTypeDlg.wxs
51+
candle.exe -dApplicationName=%AppName% -dManufacturer=%Manufacturer% -dVersionNumber=%Version% -dMajorVersion=%Major% -dMinorVersion=%Minor% -dAPPBUILDDIR=%APPBUILDDIR% -dAPPDATADIR=%APPDATADIR% -dUpgradeCode=%UPGRADECODEGUID% -dProductCode=%PRODUCTIDGUID% -dShortcutTargetName=%ShortcutTargetName% TemplateFramework.wxs AppHarvest.wxs DataHarvest.wxs WixUI_TemplateDialogFlow.wxs TemplateInstallDirDlg.wxs TemplateProgressDlg.wxs TemplateWelcomeDlg.wxs
5252

53-
light.exe TemplateFramework.wixobj AppHarvest.wixobj DataHarvest.wixobj WixUI_TemplateDialogFlow.wixobj TemplateInstallDirDlg.wixobj TemplateProgressDlg.wixobj TemplateWelcomeDlg.wixobj TemplateCustomizeDlg.wixobj TemplateSetupTypeDlg.wixobj -ext WixUIExtension -ext WixUtilExtension.dll -cultures:en-us -loc TemplateWixUI_en-us.wxl -sw1076 -out %AppName%_%Version%.msi
53+
light.exe TemplateFramework.wixobj AppHarvest.wixobj DataHarvest.wixobj WixUI_TemplateDialogFlow.wixobj TemplateInstallDirDlg.wixobj TemplateProgressDlg.wixobj TemplateWelcomeDlg.wixobj -ext WixUIExtension -ext WixUtilExtension.dll -cultures:en-us -loc TemplateWixUI_en-us.wxl -sw1076 -out %AppName%_%Version%.msi
5454

5555
signtool.exe sign /f %CERTPATH% /p %CERTPASS% %AppName%_%Version%.msi
5656

‎WiXInstaller/CreateUpdatePatch/Master/AppNoUi.wxs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,11 @@
8787
<ComponentRef Id='RegKeyValues'/>
8888
</Feature>
8989

90+
<!--
9091
<Feature Id='DataFiles' Title='$(var.ApplicationName) $(var.MajorVersion).$(var.MinorVersion) Data Folder Resources' Description='Installing $(var.ApplicationName) Data Folder'
9192
Level='1' ConfigurableDirectory='DATAFOLDER'>
9293
<ComponentGroupRef Id="HarvestedDataFiles" />
9394
</Feature>
94-
95+
-->
9596
</Product>
9697
</Wix>

‎WiXInstaller/CreateUpdatePatch/Update/AppNoUi.wxs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,12 @@
8686
<ComponentGroupRef Id="HarvestedAppFiles" />
8787
<ComponentRef Id='RegKeyValues'/>
8888
</Feature>
89-
89+
90+
<!--
9091
<Feature Id='DataFiles' Title='$(var.ApplicationName) $(var.MajorVersion).$(var.MinorVersion) Data Folder Resources' Description='Installing $(var.ApplicationName) Data Folder'
9192
Level='1' ConfigurableDirectory='DATAFOLDER'>
9293
<ComponentGroupRef Id="HarvestedDataFiles" />
9394
</Feature>
94-
95+
-->
9596
</Product>
9697
</Wix>

‎WiXInstaller/CreateUpdatePatch/buildPatch.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ for /f "tokens=1,2,3,4 delims=/." %%a in ("%BaseVersion%") do set bmaj=%%a&set b
4040

4141
for /f "tokens=1,2,3,4 delims=/." %%a in ("%PatchVersion%") do set pmaj=%%a&set pmin=%%b&set pbuild=%%c&set prev=%%d
4242

43-
cd %AppName%/WixInstaller/CreateUpdatePatch/
43+
cd WixInstaller/CreateUpdatePatch/
4444

4545
@echo on
4646
@REM Harvest the Paratext MASTER application

0 commit comments

Comments
 (0)