Permalink
Browse files

RavenDB-5929 Installer fails on Windows Server Core

  • Loading branch information...
1 parent 6f6fc89 commit dc0c5519cffdb277b660b3ba31eaf3ebb5d75ad1 @arekpalinski arekpalinski committed with ayende Jan 2, 2017
@@ -235,6 +235,7 @@
</RegistryKey>
</Component>
<Component Id="Raven.Web.Shortcut" Guid="0C2BD57F-4FE3-425E-9E74-D22BF6495041">
+ <Condition>WINDOWS_EXPLORER_AVAILABLE</Condition>
<CreateFolder />
<util:InternetShortcut
Id="IISLocalhostShortcut"
@@ -148,6 +148,7 @@
Sequence="17" />
</Component>
<Component Id="Raven.Server.Shortcut" Guid="C7A448B6-5E3B-4705-B2D6-3766D83E8924">
+ <Condition>WINDOWS_EXPLORER_AVAILABLE</Condition>
<CreateFolder />
<util:InternetShortcut
Id="ServerLocalhostShortcut"
@@ -33,6 +33,12 @@
Type="raw" />
</Property>
+ <Property Id="WINDOWS_EXPLORER_AVAILABLE">
+ <DirectorySearch Id="CheckWindowsFolderDir" Path="[WindowsFolder]" Depth="0">
+ <FileSearch Id="CheckWindowsExplorerFile" Name="explorer.exe" />
+ </DirectorySearch>
+ </Property>
+
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="INSTALLFOLDER" Name="RavenDB">
<Component Id="StoreInstallationPath" Guid="{1313C2AF-E8AD-46B6-9EA8-A60C5134CC8F}">
@@ -32,16 +32,31 @@
<Control Id="IndexesPathlEdit" Type="Edit" X="98" Y="145" Width="180" Height="15" Property="RAVEN_INDEX_DIR" Text="[RAVEN_INDEX_DIR]" />
<Control Type="Text" Id="LogsLabel" Width="50" Height="17" X="20" Y="165" Text="&amp;Logs*:" />
<Control Type="Edit" Id="LogsPathEdit" Width="180" Height="15" X="98" Y="165" Property="RAVEN_STORAGE_LOGS_DIR" Text="[RAVEN_STORAGE_LOGS_DIR]" />
- <Control Type="PushButton" Id="btnChangeWorkingDir" Width="56" Height="16" X="285" Y="90" Text="Change ..." TabSkip="no" />
- <Control Type="PushButton" Id="btnChangeData" Width="56" Height="16" X="285" Y="125" Text="Change ..." TabSkip="no" />
- <Control Type="PushButton" Id="btnChangeIndexes" Width="56" Height="16" X="285" Y="145" Text="Change ..." TabSkip="no" />
- <Control Type="PushButton" Id="btnChangeLogs" Width="56" Height="16" X="285" Y="165" Text="Change ..." />
+ <Control Type="PushButton" Id="btnChangeWorkingDir" Width="56" Height="16" X="285" Y="90" Text="Change ..." TabSkip="no" >
+ <Condition Action="disable">NOT WINDOWS_EXPLORER_AVAILABLE</Condition>
+ <Condition Action="enable">WINDOWS_EXPLORER_AVAILABLE</Condition>
+ </Control>
+ <Control Type="PushButton" Id="btnChangeData" Width="56" Height="16" X="285" Y="125" Text="Change ..." TabSkip="no" >
+ <Condition Action="disable">NOT WINDOWS_EXPLORER_AVAILABLE</Condition>
+ <Condition Action="enable">WINDOWS_EXPLORER_AVAILABLE</Condition>
+ </Control>
+ <Control Type="PushButton" Id="btnChangeIndexes" Width="56" Height="16" X="285" Y="145" Text="Change ..." TabSkip="no" >
+ <Condition Action="disable">NOT WINDOWS_EXPLORER_AVAILABLE</Condition>
+ <Condition Action="enable">WINDOWS_EXPLORER_AVAILABLE</Condition>
+ </Control>
+ <Control Type="PushButton" Id="btnChangeLogs" Width="56" Height="16" X="285" Y="165" Text="Change ..." >
+ <Condition Action="disable">NOT WINDOWS_EXPLORER_AVAILABLE</Condition>
+ <Condition Action="enable">WINDOWS_EXPLORER_AVAILABLE</Condition>
+ </Control>
<Control Type="Text" Id="CustomPathsInfo2" Width="305" Height="10" X="20" Y="185">
<Text>RavenFS paths (relative to the working directory or absolute ones):</Text>
</Control>
<Control Id="FsDataDirLabel" Type="Text" X="20" Y="200" Width="50" Height="15" TabSkip="no" Text="Data:" />
<Control Id="FsDirPathEdit" Type="Edit" X="98" Y="200" Width="180" Height="15" Property="RAVENFS_DATA_DIR" Text="[RAVENFS_DATA_DIR]" />
- <Control Type="PushButton" Id="btnChangeFsDataDir" Width="56" Height="16" X="285" Y="200" Text="Change ..." TabSkip="no" />
+ <Control Type="PushButton" Id="btnChangeFsDataDir" Width="56" Height="16" X="285" Y="200" Text="Change ..." TabSkip="no" >
+ <Condition Action="disable">NOT WINDOWS_EXPLORER_AVAILABLE</Condition>
+ <Condition Action="enable">WINDOWS_EXPLORER_AVAILABLE</Condition>
+ </Control>
<Control Type="Text" Id="pathsInfo" Width="302" Text="{\SmallInfo}*By default (an empty path) they will be located together with database's data" Height="10" X="20" Y="224" />
</Dialog>
<Publish Dialog="CustomInstallDirDlg" Control="btnChangeWorkingDir" Event="DoAction" Value="OpenWorkingDirChooser" Order="1">1</Publish>
@@ -54,6 +54,8 @@
<Control Type="PushButton" Id="btnChange" Width="29" Height="17" X="300" Y="130" Text="&amp;Select" TabSkip="no">
<Condition Action="show"><![CDATA[WEBSITE_TYPE = "NEW"]]></Condition>
<Condition Action="hide"><![CDATA[WEBSITE_TYPE = "EXISTING"]]></Condition>
+ <Condition Action="disable">NOT WINDOWS_EXPLORER_AVAILABLE</Condition>
+ <Condition Action="enable">WINDOWS_EXPLORER_AVAILABLE</Condition>
</Control>
<Control Type="Text" Id="hostNameLabel" Width="50" Height="11" X="40" Y="156" Text="&amp;Host name:" TabSkip="no">
<Condition Action="show"><![CDATA[WEBSITE_TYPE = "NEW"]]></Condition>
@@ -24,7 +24,10 @@
<Text>Specify the location for a license file</Text>
</Control>
<Control Type="Edit" Id="txtFilePath" Width="283" Height="15" X="30" Y="68" Property="RAVEN_LICENSE_FILE_PATH" Text="[RAVEN_LICENSE_FILE_PATH]" />
- <Control Type="PushButton" Id="btnChange" Width="56" Height="17" X="30" Y="86" Text="&amp;Browse" />
+ <Control Type="PushButton" Id="btnChange" Width="56" Height="17" X="30" Y="86" Text="&amp;Browse">
+ <Condition Action="disable">NOT WINDOWS_EXPLORER_AVAILABLE</Condition>
+ <Condition Action="enable">WINDOWS_EXPLORER_AVAILABLE</Condition>
+ </Control>
<Control Type="Text" Id="error" Width="280" Text="{\Red8}[RAVEN_LICENSE_ERROR]" Property="RAVEN_LICENSE_ERROR" Height="15" X="30" Y="52" />
<Control Type="Text" Id="userName" Width="280" Text="[RAVEN_LICENSE_USER_NAME]" Property="RAVEN_LICENSE_USER_NAME" Height="10" X="30" Y="105" />
<Control Type="Text" Id="type" Width="280" Text="[RAVEN_LICENSE_TYPE]" Property="RAVEN_LICENSE_TYPE" Height="10" X="30" Y="114" />

0 comments on commit dc0c551

Please sign in to comment.