Merge branch 'release/1.0.3'

wbicode · Mar 18, 2019 · 0b17930 · 0b17930
2 parents 700c8f6 + 86ed2a0
commit 0b17930
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 11 deletions.
diff --git a/TikaServiceInstaller.sln b/TikaServiceInstaller.sln
@@ -15,12 +15,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{63B23924-060F-4D4A-9B88-9457EA87662F}.Debug|x64.ActiveCfg = Debug|x64
 		{63B23924-060F-4D4A-9B88-9457EA87662F}.Debug|x86.ActiveCfg = Debug|x86
 		{63B23924-060F-4D4A-9B88-9457EA87662F}.Debug|x86.Build.0 = Debug|x86
+		{63B23924-060F-4D4A-9B88-9457EA87662F}.Release|x64.ActiveCfg = Release|x64
+		{63B23924-060F-4D4A-9B88-9457EA87662F}.Release|x64.Build.0 = Release|x64
 		{63B23924-060F-4D4A-9B88-9457EA87662F}.Release|x86.ActiveCfg = Release|x86
 		{63B23924-060F-4D4A-9B88-9457EA87662F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

diff --git a/TikaServiceInstaller/Product.wxs b/TikaServiceInstaller/Product.wxs
@@ -41,7 +41,7 @@
              Manufacturer="$(var.Manufacturer)"
              Description="Tika Service"/>
 
-    <MajorUpgrade DowngradeErrorMessage="!(loc.older_version_installed)" />
+    <MajorUpgrade DowngradeErrorMessage="!(loc.newer_version_installed)" />
 
     <!-- include .cab file in .msi file -->
     <MediaTemplate EmbedCab="yes" />
@@ -81,7 +81,7 @@
     </Feature>
 
     <!-- use .dll which has a custom action to check if a JRE is installed -->
-    <Binary Id="CA_CheckJava" SourceFile="$(var.SolutionDir)/packages/CA_CheckJava.1.0.1/lib/net45/CA_CheckJava.CA.dll" />
+    <Binary Id="CA_CheckJava" SourceFile="$(var.SolutionDir)/packages/CA_CheckJava.1.0.3/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.1/lib/net45/CA_DirectoryChooser.CA.dll" />
@@ -99,16 +99,19 @@
     <Property Id="SERVICE_PORT" Value="9997" />
     <Property Id="SERVICE_HOST" Value="localhost" />
     <Property Id='SERVICE_NAME' Value='TikaService' />
+
     <Property Id='UNINSTALL_SERVICE_NAME' Secure='yes'>
       <RegistrySearch Id='SearchUninstallServiceName' Root='HKLM'
           Key='SOFTWARE\TikaService'
          Name='[ProductCode]_UninstallServiceName' Type='raw' />
     </Property>
+
     <Property Id='UNINSTALL_PRUNSRV_NAME' Secure='yes'>
       <RegistrySearch Id='SearchUninstallPrunsrvName' Root='HKLM'
           Key='SOFTWARE\TikaService'
          Name='[ProductCode]_UninstallPrunsrvName' Type='raw' />
     </Property>
+
     <Property Id='UNINSTALL_LOG_FOLDER' Secure='yes'>
       <RegistrySearch Id='SearchUninstallLogFolder' Root='HKLM' Key='SOFTWARE\TikaService'
                         Name='LogDirectory' Type='raw' />
@@ -136,12 +139,12 @@
     <!-- all predifined; directory in which the final programm will get installed-->
     <Directory Id="TARGETDIR" Name="SourceDir">
 
-      <!-- Program Files folder for 32bit -->
-      <Directory Id="ProgramFilesFolder">
+      <!-- Program Files folder for our bitness -->
+      <Directory Id="$(var.ProgramFilesFolder)">
         <Directory Id="INSTALLFOLDER" Name="TikaService" />
       </Directory>
 
-      <Directory Id="SystemFolder">
+      <Directory Id="$(var.SystemFolder)">
         <Directory Id="LogFiles" Name="LogFiles">
           <Directory Id="LOG_PATH" Name="TikaService" />
         </Directory>
@@ -156,7 +159,7 @@
         <Shortcut Id="UninstallProduct"
                   Name="!(loc.uninstall) $(var.ProductName)"
                   Description="!(loc.uninstalls) $(var.ProductName)"
-                  Target="[SystemFolder]msiexec.exe"
+                  Target="[$(var.SystemFolder)]msiexec.exe"
                   Arguments="/x [ProductCode]"/>
         <CreateFolder/>
         <RemoveFolder Id="ProgramFilesFolder" On="uninstall"  />
@@ -167,12 +170,12 @@
     <DirectoryRef Id="TARGETDIR">
       <Component Id="RememberUninstallServiceName">
         <RegistryValue Root='HKLM' Key='SOFTWARE\TikaService'
-                        Name='[ProductCode]_UninstallServiceName' Value='[SERVICE_NAME]'
+                        Name='ServiceName' Value='[SERVICE_NAME]'
                         Type='string' />
       </Component>
       <Component Id="RememberUninstallPrunsrvName">
         <RegistryValue Root='HKLM' Key='SOFTWARE\TikaService'
-                        Name='[ProductCode]_UninstallPrunsrvName' Value='[PRUNSRV_NAME]'
+                        Name='PrunsrvName' Value='[PRUNSRV_NAME]'
                         Type='string' />
       </Component>
       <Component Id="RememberLogDirectory">

diff --git a/TikaServiceInstaller/TikaServiceInstaller.wixproj b/TikaServiceInstaller/TikaServiceInstaller.wixproj
@@ -24,6 +24,15 @@
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="ComponentsGenerated.wxs" />
     <Compile Include="Dialogs\CustomInstallDirDlg.wxs" />

diff --git a/TikaServiceInstaller/lang/Strings-de.wxl b/TikaServiceInstaller/lang/Strings-de.wxl
@@ -5,7 +5,7 @@
   <String Id="uninstalls">Deinstalliert</String>
   <String Id="manual">Manuell</String>
   <String Id="automatic">Automatisch</String>
-  <String Id="older_version_installed">Eine neuere Version von [ProductName] ist bereits installiert.</String>
+  <String Id="newer_version_installed">Eine neuere Version von TikaService ist bereits installiert.</String>
   <String Id="startup">Starttyp:</String>
   <String Id="start_after_install">Starte den Service nach der Installation</String>
   <String Id="java_home_missing">JAVA_HOME Umgebungsvariable ist nicht definiert</String>

diff --git a/TikaServiceInstaller/lang/Strings-en.wxl b/TikaServiceInstaller/lang/Strings-en.wxl
@@ -5,7 +5,7 @@
   <String Id="uninstalls">Uninstalls</String>
   <String Id="manual">Manual</String>
   <String Id="automatic">Automatic</String>
-  <String Id="older_version_installed">A newer version of [ProductName] is already installed.</String>
+  <String Id="newer_version_installed">A newer version of TikaService is already installed.</String>
   <String Id="startup">Startup:</String>
   <String Id="start_after_install">Start service after installation is completed</String>
   <String Id="java_home_missing">JAVA_HOME environment variable is not set</String>

diff --git a/TikaServiceInstaller/packages.config b/TikaServiceInstaller/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CA_CheckJava" version="1.0.1" />
+  <package id="CA_CheckJava" version="1.0.3" />
   <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" />