Skip to content

Commit

Permalink
Start Menu Shortcuts (part of LT-19007)
Browse files Browse the repository at this point in the history
* Include start menu shortcuts from the old installer
* Install license text

Change-Id: I4965164fa009d22fb91e289a717c27a8cefde942
  • Loading branch information
papeh committed Jul 13, 2018
1 parent a772b66 commit 51c62a3
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Build/Installer.targets
Expand Up @@ -172,7 +172,7 @@
<DeveloperFiles Include="$(fwrt)\DistFiles\TxtConv.exe"/>
<DeveloperFiles Include="$(fwrt)\DistFiles\Windows\**\*"/>
<IcuFiles Include="$(fwrt)\DistFiles\Icu$(IcuVersion)\**\*"/>
<InstallerResources Include="$(fwrt)\License.htm"/>
<InstallerResources Include="$(fwrt)\License.htm"/> <!-- allow users to view the license before installing -->
<InstallerResources Include="$(fwrt)\resources\App.ico"/>
<InstallerResources Include="$(fwrt)\resources\Installer.ico"/>
<!-- If you change this list, you must also update those listed at $(fwrt)\Localizations\ReadMe.md -->
Expand Down Expand Up @@ -244,6 +244,7 @@
<BinFiles Remove="$(OutputDirForConfig)\*Tests.*"/>
<BinFiles Remove="$(OutputDirForConfig)\test*"/>
<BinFiles Include="$(fwrt)\DistFiles\**\*" Exclude="@(DeveloperFiles);@(IcuFiles)"/>
<BinFiles Include="$(fwrt)\License.htm"/> <!-- install the license -->
<!-- Files used to customize the generic patchable installer -->
<OverrideFiles Include="$(fwrt)\FLExInstaller\*.wxi"/>
</ItemGroup>
Expand Down
37 changes: 37 additions & 0 deletions FLExInstaller/CustomComponents.wxi
Expand Up @@ -31,6 +31,43 @@
<ComponentRef Id="FwInstallDir"/>
</ComponentGroup>

<DirectoryRef Id="ProgramMenuFolder">
<Directory Id="FLExProgramMenuFolder" Name="$(var.ApplicationName) $(var.MajorVersion)">
<Component Id="StartMenuShortcuts" Guid="EE2CF3EF-30C2-48AC-8151-7B55191A1E59">
<Shortcut Id="HelpsShortcut"
Name="$(var.ApplicationName) Help"
Description="$(var.ApplicationName) Help"
Target="[APPFOLDER]Helps\FieldWorks_Language_Explorer_Help.chm"/>
<Shortcut Id="ApplicationStartSubmenuShortcut"
Name="$(var.ApplicationName)"
Description="$(var.ApplicationName) $(var.MajorVersion)"
Target="[APPFOLDER]Flex.exe"
WorkingDirectory="APPFOLDER"
Icon="Application_Icon.ico"/>
<Shortcut Id="MorphologyIntroShortcut"
Name="Morphology Introduction"
Description="A Conceptual Introduction to Morphological Parsing for Stage 1 of the FieldWorks Language Explorer"
Target="[APPFOLDER]Helps\WW-ConceptualIntro\ConceptualIntroduction.htm"/>
<Shortcut Id="UnicodeCharEditorShortcut"
Name="Unicode Character Editor"
Description="Unicode Character Editor"
Target="[APPFOLDER]UnicodeCharEditor.exe"
WorkingDirectory="APPFOLDER"/>
<Shortcut Id="EULAShortcut"
Name="View the End User License Agreement"
Description="$(var.ApplicationName) License"
Target="[APPFOLDER]License.htm"/>
<Shortcut Id="UninstallProductSubmenu"
Name="Uninstall $(var.ApplicationName)"
Target="[SystemFolder]msiexec.exe"
Arguments="/x [ProductCode]"
Description="Uninstalls $(var.ApplicationName)"/>
<RemoveFolder Id="RemoveFLExProgramMenuFolder" Directory="FLExProgramMenuFolder" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\Microsoft\$(var.SafeApplicationName)$(var.MajorVersion)" Name="installed" Type="integer" Value="1" KeyPath="yes"/><!--REVIEW (Hasso) 2018.07: what is this and why is it *here*? (copied from genericinstaller's Framework.wxs -->
</Component>
</Directory>
</DirectoryRef>

<DirectoryRef Id='APPFOLDER'>
<?if $(sys.BUILDARCH) = x64 ?>
<Merge Id="CC_DLL" Language="1033" SourceFile="$(var.EncodingConvertersPath)\CcDLLs64bitMM.msm" DiskId="1"/>
Expand Down
5 changes: 4 additions & 1 deletion FLExInstaller/CustomFeatures.wxi
Expand Up @@ -13,7 +13,10 @@
<Feature Id='DesktopShortcut' Title='Desktop Shortcut' Description='Creates a shortcut on the desktop.' Level='3' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
<ComponentRef Id='ApplicationShortcutDesktop'/>
</Feature>
<Feature Id='MenuShortcut' Title='Start Menu Shortcut' Description='Creates a shortcut in the Start menu.' Level='3' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
<Feature Id='MenuShortcuts' Title='Start Menu Shortcuts' Description='Creates shortcuts in the Start Menu to FieldWorks, utilities, and key documentation.' Level='3' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
<ComponentRef Id='StartMenuShortcuts' />
</Feature>
<Feature Id='GenericShortcut_NotInstalled' Title='Generic Start Menu Shortcut' Description='Creates a shortcut in the Start menu.' Level='0' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
<ComponentRef Id='ApplicationShortcutMenu' />
</Feature>
<Feature Id="LOC" Title="Language Packs" Description="Additional languages for the user interface." Display="expand" Level="3" AllowAdvertise="no">
Expand Down
2 changes: 1 addition & 1 deletion License.htm
Expand Up @@ -44,7 +44,7 @@
<span style="font-size:22">Version 2.1, February 1999</span></p>
<br>
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA<br>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
<br><br>
Expand Down

0 comments on commit 51c62a3

Please sign in to comment.