[openrtm-commit:01022] r696 - in trunk/jp.go.aist.rtm.RTC: Source/examples installer/resources/Source/examples

[openrtm ＠ openrtm.org]

Author: ga
Date: 2013-02-20 23:57:21 +0900 (Wed, 20 Feb 2013)
New Revision: 696

Modified:
   trunk/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs
   trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs
Log:
Correspondence to Windows7(64bit). refs #2592

Modified: trunk/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs	2013-02-20 14:28:08 UTC (rev 695)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs	2013-02-20 14:57:21 UTC (rev 696)
@@ -6,11 +6,13 @@
 '‹N“®—pƒIƒuƒWƒFƒNƒg‚̎擾
 Set objShell = WScript.CreateObject("WScript.Shell")
 
-If GetOSVersion() >= 6 Then
-	'JDK‚̃ŒƒWƒXƒgƒŠƒL[‚ðƒZƒbƒg
+strMode = objShell.Environment("Process").Item("PROCESSOR_ARCHITECTURE")
+
+'JDK‚̃ŒƒWƒXƒgƒŠƒL[‚ðƒZƒbƒg
+If UCase(strMode) = "X86" Then
+	regJDKkey  = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
+Else
 	regJDKkey  = "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Development Kit"
-Else
-	regJDKkey  = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
 End If
 
 'ƒŒƒWƒXƒgƒŠ‚©‚çJDKƒJƒŒƒ“ƒgƒo[ƒWƒ‡ƒ“‚ðŽæ“¾

Modified: trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs	2013-02-20 14:28:08 UTC (rev 695)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs	2013-02-20 14:57:21 UTC (rev 696)
@@ -6,11 +6,13 @@
 '‹N“®—pƒIƒuƒWƒFƒNƒg‚̎擾
 Set objShell = WScript.CreateObject("WScript.Shell")
 
-If GetOSVersion() >= 6 Then
-	'JDK‚̃ŒƒWƒXƒgƒŠƒL[‚ðƒZƒbƒg
+strMode = objShell.Environment("Process").Item("PROCESSOR_ARCHITECTURE")
+
+'JDK‚̃ŒƒWƒXƒgƒŠƒL[‚ðƒZƒbƒg
+If UCase(strMode) = "X86" Then
+	regJDKkey  = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
+Else
 	regJDKkey  = "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Development Kit"
-Else
-	regJDKkey  = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
 End If
 
 'ƒŒƒWƒXƒgƒŠ‚©‚çJDKƒJƒŒƒ“ƒgƒo[ƒWƒ‡ƒ“‚ðŽæ“¾