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

[openrtm ＠ openrtm.org]

Author: ga
Date: 2013-02-11 21:52:49 +0900 (Mon, 11 Feb 2013)
New Revision: 688

Modified:
   trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in
Log:
Supported JDK7. refs #2405
Now, RTSystemEditor is installed.

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	2013-02-10 18:10:53 UTC (rev 687)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in	2013-02-11 12:52:49 UTC (rev 688)
@@ -32,19 +32,25 @@
                       Name="JavaHome"
                       Type="raw" />
     </Property>
-    
+    <Property Id="JDK17">
+      <RegistrySearch Id="JDK17" 
+                      Root="HKLM" 
+                      Key="SOFTWARE\JavaSoft\Java Development Kit\1.7" 
+                      Name="JavaHome" 
+                      Type="raw" />
+    </Property>
     <!-- RTSE Property-->
-<!--
-    <Property Id="FILEEXISTS">
-      <DirectorySearch Id="CheckFileDir" Path="C:\Program Files">
+
+    <Property Id="RTSE_FILEEXISTS">
+      <DirectorySearch Id="CheckFileDir" Path="C:\Program Files\OpenRTM-aist\{% Product.ShortVersion %}">
         <DirectorySearch Id="CheckFileDir2" Path ="OpenRTP">
-          <DirectorySearch Id="CheckFileDir3" Path ="RTSystemEditor">
+          <DirectorySearch Id="CheckFileDir3" Path ="{% Product.ShortVersion %}\RTSystemEditor">
             <FileSearch Id="CheckFile" Name="RTSystemEditorRCP.exe" />
           </DirectorySearch>
         </DirectorySearch>
       </DirectorySearch>
     </Property>
--->
+
 <!--     <SetProperty Id="FILEEXISTSDIR" After="AppSearch" Value="[FILEEXISTS]">
     </SetProperty>-->
 
@@ -74,8 +80,8 @@
     <!-- <Property Id="ALLUSERS" Value="1" /> -->
     
     <!-- Check Conditions -->
-    <Condition Message="[ProductName] requires JDK 1.5 or 1.6">
-      <![CDATA[Installed OR (JDK15 <> "" OR JDK16 <> "")]]>
+    <Condition Message="[ProductName] requires JDK 1.5 or 1.6 or 1.7">
+      <![CDATA[Installed OR (JDK15 <> "" OR JDK16 <> "" OR JDK17 <> "")]]>
     </Condition>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
@@ -1350,23 +1356,19 @@
 
     <!-- OpenRTP tools -->
     <?if $(env.INCLUDE_OPENRTP) = YES ?>
-    <Feature Id="OpenRTP" Level="1" Title="OpenRT Platform Tool Chain">
-      <!--
-      <Condition Level ="1"><![CDATA[ (FILEEXISTS =  "") ]]></Condition>
-      <Condition Level ="0"><![CDATA[ (FILEEXISTS <> "") ]]></Condition>
-      -->
+    <Feature Id="OpenRTP" Level="1" Title="OpenRT Platform Tool Chain"
+			 ConfigurableDirectory="INSTALLLOCATION">
+      <Condition Level ="1"><![CDATA[ (RTSE_FILEEXISTS =  "") ]]></Condition>
+      <Condition Level ="0"><![CDATA[ (RTSE_FILEEXISTS <> "") ]]></Condition>
+
       <!-- rtse rcp -->
       <Feature Id="RTSystemEditor" Level="1" Title="RTSystemEditor">
 	<ComponentRef Id="Openrtp" />
 	<ComponentRef Id="OpenrtpConfiguration" />
 	<ComponentRef Id="OpenrtpPlugins" />
-	<!-- <ComponentRef Id="org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610" /> -->
 	<ComponentRef Id="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610" />
-	<!-- <ComponentRef Id="META_INF" /> -->
 	<ComponentRef Id="Meta_inf" />
-	<!-- <ComponentRef Id="org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731" /> -->
 	<ComponentRef Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731" />
-	<!-- <ComponentRef Id="META_INF_2" /> -->
 	<ComponentRef Id="Meta_inf_2" />
       </Feature>
     </Feature>