[openrtm-commit:01650] r751 - trunk/jp.go.aist.rtm.RTC/installer/win32

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-11-05 18:34:55 +0900 (Thu, 05 Nov 2015)
New Revision: 751

Modified:
   trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in
Log:
[compat,installer,->RELENG_1_1] Supported JDK8. refs #3353

Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in	2015-11-05 04:21:24 UTC (rev 750)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in	2015-11-05 09:34:55 UTC (rev 751)
@@ -37,6 +37,14 @@
                       Win64="yes"
                       Type="raw" />
     </Property>
+    <Property Id="JDK18">
+      <RegistrySearch Id="JDK18" 
+                      Root="HKLM" 
+                      Key="SOFTWARE\JavaSoft\Java Development Kit\1.8" 
+                      Name="JavaHome" 
+                      Win64="yes"
+                      Type="raw" />
+    </Property>
     <?else?>
     <Property Id="JDK17">
       <RegistrySearch Id="JDK17" 
@@ -45,6 +53,13 @@
                       Name="JavaHome" 
                       Type="raw" />
     </Property>
+    <Property Id="JDK18">
+      <RegistrySearch Id="JDK18" 
+                      Root="HKLM" 
+                      Key="SOFTWARE\JavaSoft\Java Development Kit\1.8" 
+                      Name="JavaHome" 
+                      Type="raw" />
+    </Property>
     <?endif ?>
 <!--     <SetProperty Id="FILEEXISTSDIR" After="AppSearch" Value="[FILEEXISTS]">
     </SetProperty>-->
@@ -84,8 +99,8 @@
     <!-- <Property Id="ALLUSERS" Value="1" /> -->
     
     <!-- Check Conditions -->
-    <Condition Message="[ProductName] requires JDK 1.7">
-      <![CDATA[Installed OR (JDK17 <> "")]]>
+    <Condition Message="[ProductName] requires JDK 1.7 or 1.8">
+      <![CDATA[Installed OR (JDK17 <> "" OR JDK18 <> "")]]>
     </Condition>
 
     <Directory Id="TARGETDIR" Name="SourceDir">