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

[openrtm ＠ openrtm.org]

Author: ga
Date: 2013-02-20 23:28:08 +0900 (Wed, 20 Feb 2013)
New Revision: 695

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-18 15:39:39 UTC (rev 694)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs	2013-02-20 14:28:08 UTC (rev 695)
@@ -1,20 +1,56 @@
+'orbd‹N“®—pƒXƒNƒŠƒvƒg
+'–{ƒXƒNƒŠƒvƒg‚͊‹«•Ï”TEMP‚ªÝ’肳‚ê‚Ä‚¢‚邱‚Æ‚ð‘O’ñ‚Æ‚µ‚Ü‚·
+'‚È‚¨AŠÂ‹«•Ï”TEMP‚Í’Ê—áOS‚É‚æ‚èƒfƒtƒHƒ‹ƒg‚Őݒ肳‚ê‚Ä‚¢‚Ü‚·
+
+
 '‹N“®—pƒIƒuƒWƒFƒNƒg‚̎擾
 Set objShell = WScript.CreateObject("WScript.Shell")
-'JDK‚̃ŒƒWƒXƒgƒŠƒL[‚ðƒZƒbƒg
-regJDKkey  = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
+
+If GetOSVersion() >= 6 Then
+	'JDK‚̃ŒƒWƒXƒgƒŠƒL[‚ðƒZƒbƒg
+	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ƒ‡ƒ“‚ðŽæ“¾
 'objShell.RegRead("HKLM\SOFTWARE\JavaSoft\Java Development Kit\CurrentVersion")
+
 '‚±‚ꂪA—Ⴆ‚Î"1.5"‚¾‚Æ‚·‚é‚ƁA
 'HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.5\JavaHome
 '‚ÉJDKƒJƒŒƒ“ƒgƒo[ƒWƒ‡ƒ“‚̃‹[ƒgƒtƒHƒ‹ƒ_‚ª‹LÚ‚³‚ê‚Ä‚¢‚é
 Javahome  = regJDKkey & "\" & objShell.RegRead(regJDKkey & "\CurrentVersion") & "\JavaHome"
+
 'JDKƒJƒŒƒ“ƒgƒo[ƒWƒ‡ƒ“‚̃‹[ƒgƒtƒHƒ‹ƒ_Javahome‚̉º‚Ìbin\orbd.exe‚ª–Ú“I‚ÌŽÀsƒtƒ@ƒCƒ‹
 targetexe = """" & objShell.RegRead(Javahome) & "\bin\orbd.exe"""
+
 '–Ú“I‚ÌŽÀsƒtƒ@ƒCƒ‹targetexe‚ð“KØ‚ȃIƒvƒVƒ‡ƒ“‚ð‚‚¯‚ÄŽÀs‚³‚¹‚é
 objShell.Run targetexe & " -ORBInitialPort 2809 -ORBInitialHost localhost -defaultdb ""%TEMP%""\orb.db"
-'‚±‚ê‚͗Ⴆ‚΁AŽŸ‚̂悤‚È‚±‚Æ‚ð‚â‚Á‚Ä‚éBì‹ÆƒfƒBƒŒƒNƒgƒŠ‚ðƒ†[ƒU[‚ÌtempƒtƒHƒ‹ƒ_‚ÉŽw’èB
+'‚±‚ê‚͗Ⴆ‚΁AŽŸ‚̂悤‚È‚±‚Æ‚ð‚â‚Á‚Ä‚éB‚½‚¾‚µAì‹ÆƒfƒBƒŒƒNƒgƒŠ‚ðƒ†[ƒU[‚ÌtempƒtƒHƒ‹ƒ_‚ÉŽw’èB
 'cf:objShell.Run """C:\Program Files\Java\jdk1.5.0_14\bin\orbd.exe"" -ORBInitialPort 2809 -ORBInitialHost localhost"
 
 'ˆê‰žƒIƒuƒWƒFƒNƒg‚ðŠJ•ú
 Set objShell = Nothing
 
+
+' **********************************************************
+' OS ƒo[ƒWƒ‡ƒ“‚̎擾
+' **********************************************************
+Function GetOSVersion()
+
+    Dim strComputer, Wmi, colTarget, strWork, objRow, aData
+
+    strComputer = "."
+    Set Wmi = GetObject("winmgmts:{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+    Set colTarget = Wmi.ExecQuery( "select Version from Win32_OperatingSystem" )
+
+    For Each objRow in colTarget
+        strWork = objRow.Version
+        Next
+
+        aData = Split( strWork, "." )
+        strWork = aData(0) & "." & aData(1)
+
+        GetOSVersion = CDbl( strWork )
+
+End Function
\ No newline at end of file

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-18 15:39:39 UTC (rev 694)
+++ trunk/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs	2013-02-20 14:28:08 UTC (rev 695)
@@ -6,8 +6,12 @@
 '‹N“®—pƒIƒuƒWƒFƒNƒg‚̎擾
 Set objShell = WScript.CreateObject("WScript.Shell")
 
-'JDK‚̃ŒƒWƒXƒgƒŠƒL[‚ðƒZƒbƒg
-regJDKkey  = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
+If GetOSVersion() >= 6 Then
+	'JDK‚̃ŒƒWƒXƒgƒŠƒL[‚ðƒZƒbƒg
+	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ƒ‡ƒ“‚ðŽæ“¾
 'objShell.RegRead("HKLM\SOFTWARE\JavaSoft\Java Development Kit\CurrentVersion")
@@ -28,3 +32,25 @@
 'ˆê‰žƒIƒuƒWƒFƒNƒg‚ðŠJ•ú
 Set objShell = Nothing
 
+
+' **********************************************************
+' OS ƒo[ƒWƒ‡ƒ“‚̎擾
+' **********************************************************
+Function GetOSVersion()
+
+    Dim strComputer, Wmi, colTarget, strWork, objRow, aData
+
+    strComputer = "."
+    Set Wmi = GetObject("winmgmts:{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+    Set colTarget = Wmi.ExecQuery( "select Version from Win32_OperatingSystem" )
+
+    For Each objRow in colTarget
+        strWork = objRow.Version
+        Next
+
+        aData = Split( strWork, "." )
+        strWork = aData(0) & "." & aData(1)
+
+        GetOSVersion = CDbl( strWork )
+
+End Function
\ No newline at end of file