Merge branch 'release/1.0.2'

wbicode · Mar 12, 2019 · 700c8f6 · 700c8f6
2 parents 983d2d4 + 76d2231
commit 700c8f6
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 15 deletions.
diff --git a/TikaServiceInstaller/Dialogs/CustomInstallDirDlg.wxs b/TikaServiceInstaller/Dialogs/CustomInstallDirDlg.wxs
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI>
+      <Dialog Id="CustomInstallDirDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+          <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+        </Control>
+        <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" />
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
+        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+        <Control Id="FolderLabel" Type="Text" X="20" Y="60" Width="316" Height="28" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
+        <Control Id="Folder" Type="PathEdit" X="20" Y="100" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
+        <Control Id="ChangeFolder" Type="PushButton" X="20" Y="120" Width="68" Height="17" Text="!(loc.InstallDirDlgChange)">
+          <Publish Property="CA_DC_OPEN_DIR" Value="[ProgramFilesFolder]" Order="1">1</Publish>
+          <Publish Event="DoAction" Value="OpenFileChooser" Order="2">1</Publish>
+          <Publish Property="INSTALLFOLDER" Value="[CHOSEN_DIRECTORY]" Order="3">CHOSEN_DIRECTORY</Publish>
+        </Control>
+      </Dialog>
+    </UI>
+  </Fragment>
+</Wix>
diff --git a/TikaServiceInstaller/Dialogs/TikaServiceDlg.wxs b/TikaServiceInstaller/Dialogs/TikaServiceDlg.wxs
@@ -29,8 +29,9 @@
         <Control Type="Text" Id="LogPathText" Width="59" Height="14" X="15" Y="138" Text="!(loc.log_path)" />
         <Control Type="PathEdit" Id="Folder" Width="278" Height="15" X="79" Y="135" Property="LOG_PATH" />
         <Control Id="ChangeFolder" Type="PushButton" X="79" Y="158" Width="80" Height="17" Text="!(loc.InstallDirDlgChange)">
-          <Publish Event="DoAction" Value="OpenFileChooser" Order="1">1</Publish>
-          <Publish Property="LOG_PATH" Value="[CHOSEN_DIRECTORY]" Order="2">1</Publish>
+          <Publish Property="CA_DC_OPEN_DIR" Value="[LogFiles]" Order="1">1</Publish>
+          <Publish Event="DoAction" Value="OpenFileChooser" Order="2">1</Publish>
+          <Publish Property="LOG_PATH" Value="[CHOSEN_DIRECTORY]" Order="3">CHOSEN_DIRECTORY</Publish>
         </Control>
         <!-- Log-Level -->
         <Control Type="Text" Id="LogLevelText" Width="63" Height="11" X="15" Y="188" Text="!(loc.log_level)" />

diff --git a/TikaServiceInstaller/InstallerUI.wxs b/TikaServiceInstaller/InstallerUI.wxs
@@ -59,23 +59,21 @@ Patch dialog sequence:
       <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="TikaServiceDlg" Order="2">LicenseAccepted = "1" AND NOT WIX_UPGRADE_DETECTED</Publish>
 
       <Publish Dialog="TikaServiceDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="1">1</Publish>
-      <Publish Dialog="TikaServiceDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="7"><![CDATA[NOT CA_IV_SERVICE_EXISTS AND PORT_IS_AVAILABLE]]></Publish>
+      <Publish Dialog="TikaServiceDlg" Control="Next" Event="NewDialog" Value="CustomInstallDirDlg" Order="7"><![CDATA[NOT CA_IV_SERVICE_EXISTS AND PORT_IS_AVAILABLE]]></Publish>
 
       <!-- warning that the servicename is already taken -->
       <Publish Dialog="ServiceExistsWarningDlg" Control="Back" Event="EndDialog" Value="Return">1</Publish>
 
       <!-- warning that the port is already in use -->
       <Publish Dialog="PortInUseWarningDlg" Control="Back" Event="EndDialog" Value="Return">1</Publish>
 
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="TikaServiceDlg">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+      <Publish Dialog="CustomInstallDirDlg" Control="Back" Event="NewDialog" Value="TikaServiceDlg">1</Publish>
+      <Publish Dialog="CustomInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="CustomInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+      <Publish Dialog="CustomInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+      <Publish Dialog="CustomInstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
 
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="TikaServiceDlg" Order="1">NOT Installed</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomInstallDirDlg" Order="1">NOT Installed</Publish>
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">WIX_UPGRADE_DETECTED</Publish>
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="3">Installed AND NOT PATCH</Publish>
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="4">Installed AND PATCH</Publish>

diff --git a/TikaServiceInstaller/Product.wxs b/TikaServiceInstaller/Product.wxs
@@ -84,10 +84,10 @@
     <Binary Id="CA_CheckJava" SourceFile="$(var.SolutionDir)/packages/CA_CheckJava.1.0.1/lib/net45/CA_CheckJava.CA.dll" />
 
     <!-- dll which provides the functionality to open a dialog to choose a file -->
-    <Binary Id="CA_DirectoryChooser" SourceFile="$(var.SolutionDir)/packages/CA_DirectoryChooser.1.0.0/lib/net45/CA_DirectoryChooser.CA.dll" />
+    <Binary Id="CA_DirectoryChooser" SourceFile="$(var.SolutionDir)/packages/CA_DirectoryChooser.1.0.1/lib/net45/CA_DirectoryChooser.CA.dll" />
 
     <!-- dll to make input validation -->
-    <Binary Id="CA_InputValidation" SourceFile="$(var.SolutionDir)/packages/CA_InputValidation.1.0.0/lib/net45/CA_InputValidation.CA.dll" />
+    <Binary Id="CA_InputValidation" SourceFile="$(var.SolutionDir)/packages/CA_InputValidation.1.0.1/lib/net45/CA_InputValidation.CA.dll" />
 
     <!-- property for the launch condition -->
     <Property Id="JRE_INSTALLED" Value="0" />

diff --git a/TikaServiceInstaller/TikaServiceInstaller.wixproj b/TikaServiceInstaller/TikaServiceInstaller.wixproj
@@ -26,6 +26,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ComponentsGenerated.wxs" />
+    <Compile Include="Dialogs\CustomInstallDirDlg.wxs" />
     <Compile Include="Dialogs\PortInUseWarningDlg.wxs" />
     <Compile Include="Dialogs\ServiceExistsWarningDlg.wxs" />
     <Compile Include="Dialogs\UninstallDlg.wxs" />

diff --git a/TikaServiceInstaller/packages.config b/TikaServiceInstaller/packages.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CA_CheckJava" version="1.0.1" />
-  <package id="CA_DirectoryChooser" version="1.0.0" />
-  <package id="CA_InputValidation" version="1.0.0" />
+  <package id="CA_DirectoryChooser" version="1.0.1" />
+  <package id="CA_InputValidation" version="1.0.1" />
+  <package id="Microsoft.WindowsAPICodePack.Core" version="1.1.0" />
+  <package id="Microsoft.WindowsAPICodePack.Shell" version="1.1.0" />
 </packages>