[openrtm-commit:01631] r734 - in branches/RELENG_1_1: . jp.go.aist.rtm.RTC jp.go.aist.rtm.RTC/Source/examples jp.go.aist.rtm.RTC/installer/resources/Source/examples

openrtm ＠ openrtm.org openrtm ＠ openrtm.org
2015年 10月 28日 (水) 11:38:33 JST 

Author: kawauchi
Date: 2015-10-28 11:38:33 +0900 (Wed, 28 Oct 2015)
New Revision: 734

Added:
   branches/RELENG_1_1/buildInstaller.bat
   branches/RELENG_1_1/buildPackage.sh
Modified:
   branches/RELENG_1_1/
   branches/RELENG_1_1/buildRTC.bat
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/.project
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs
   branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs
Log:
[compat,merge] r691,692,695,696,698 merged from trunk.


Property changes on: branches/RELENG_1_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0_0:60-401
/branches/work/ConfigurationCallback:631-635
/branches/work/DesignChangeOfEC:648-660
/branches/work/ForComponentActionListener:521-522
/branches/work/ForComponentObserverConsumer:534-543
/branches/work/ForConfigurationListener:524-526
/branches/work/ForLogFormat:518-519
/branches/work/ForPortConnectListener:528-532
/branches/work/ForSDOServiceAdminClass:505-507
/branches/work/LoggerService:666-669
/branches/work/SourceSharing:591-603
/branches/work/ToGetProperties:545-548
/branches/work/ToIFR_ID:509-514
/trunk:622,630-637,639-658,661,663,670,672-673,678,680-685,688
   + /branches/RELENG_1_0_0:60-401
/branches/work/ConfigurationCallback:631-635
/branches/work/DesignChangeOfEC:648-660
/branches/work/ForComponentActionListener:521-522
/branches/work/ForComponentObserverConsumer:534-543
/branches/work/ForConfigurationListener:524-526
/branches/work/ForLogFormat:518-519
/branches/work/ForPortConnectListener:528-532
/branches/work/ForSDOServiceAdminClass:505-507
/branches/work/LoggerService:666-669
/branches/work/SourceSharing:591-603
/branches/work/ToGetProperties:545-548
/branches/work/ToIFR_ID:509-514
/trunk:622,630-637,639-658,661,663,670,672-673,678,680-685,688,691-692,695-696,698

Copied: branches/RELENG_1_1/buildInstaller.bat (from rev 698, trunk/buildInstaller.bat)
===================================================================
--- branches/RELENG_1_1/buildInstaller.bat	                        (rev 0)
+++ branches/RELENG_1_1/buildInstaller.bat	2015-10-28 02:38:33 UTC (rev 734)
@@ -0,0 +1,18 @@
+set DUMMY=%ANT_HOME%
+ at rem set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.6.5\
+ at rem set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.7.0.v200706080842\
+set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.8.3.v20120321-1730\
+
+
+cd jp.go.aist.rtm.RTC
+call ant javaInstaller -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
+if ERRORLEVEL 1 goto error_end 
+cd ..
+set ANT_HOME=%DUMMY%
+exit /b 0
+
+:error_end
+cd ..
+set ANT_HOME=%DUMMY%
+exit /b 1
+

Copied: branches/RELENG_1_1/buildPackage.sh (from rev 698, trunk/buildPackage.sh)
===================================================================
--- branches/RELENG_1_1/buildPackage.sh	                        (rev 0)
+++ branches/RELENG_1_1/buildPackage.sh	2015-10-28 02:38:33 UTC (rev 734)
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+#
+
+DUMMY=$ANT_HOME
+export ANT_HOME=$ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/
+
+ 
+
+if test $# -eq 0 ; then
+    var_for="dist"
+else
+    var_for=$1
+fi
+
+#
+#
+#
+cd jp.go.aist.rtm.RTC
+ant $var_for -lib $ECLIPSE_HOME/plugins/net.sf.ant4eclipse.plugin_0.5.0.rc1/lib/ -lib $ECLIPSE_HOME/plugins/org.apache.ant_1.7.0.v200803061910/lib
+if [ $? -ne 0 ];
+then 
+    exit 1
+fi
+echo "--"
+cd ..
+
+export ANT_HOME=$DUMMY
+
+

Modified: branches/RELENG_1_1/buildRTC.bat
===================================================================
--- branches/RELENG_1_1/buildRTC.bat	2015-10-28 02:08:55 UTC (rev 733)
+++ branches/RELENG_1_1/buildRTC.bat	2015-10-28 02:38:33 UTC (rev 734)
@@ -1,7 +1,7 @@
 set DUMMY=%ANT_HOME%
 @rem set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.6.5\
 @rem set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.7.0.v200706080842\
-set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.7.0.v200803061910\
+set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.8.3.v20120321-1730\
 
 
 cd jp.go.aist.rtm.RTC
@@ -16,4 +16,3 @@
 set ANT_HOME=%DUMMY%
 exit /b 1
 
-


Property changes on: branches/RELENG_1_1/jp.go.aist.rtm.RTC
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/work/ConfigurationCallback/jp.go.aist.rtm.RTC:631-635
/branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC:648-660
/branches/work/ForComponentActionListener/jp.go.aist.rtm.RTC:521-522
/branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC:534-543
/branches/work/ForConfigurationListener/jp.go.aist.rtm.RTC:524-526
/branches/work/ForLogFormat/jp.go.aist.rtm.RTC:518-519
/branches/work/ForPortConnectListener/jp.go.aist.rtm.RTC:528-532
/branches/work/ForSDOServiceAdminClass/jp.go.aist.rtm.RTC:505-507
/branches/work/LoggerService/jp.go.aist.rtm.RTC:666-669
/branches/work/SourceSharing/jp.go.aist.rtm.RTC:591-603
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
/trunk/jp.go.aist.rtm.RTC:622,630-637,639-658,661,663,670,672-673,678,680-685,688
   + /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/work/ConfigurationCallback/jp.go.aist.rtm.RTC:631-635
/branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC:648-660
/branches/work/ForComponentActionListener/jp.go.aist.rtm.RTC:521-522
/branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC:534-543
/branches/work/ForConfigurationListener/jp.go.aist.rtm.RTC:524-526
/branches/work/ForLogFormat/jp.go.aist.rtm.RTC:518-519
/branches/work/ForPortConnectListener/jp.go.aist.rtm.RTC:528-532
/branches/work/ForSDOServiceAdminClass/jp.go.aist.rtm.RTC:505-507
/branches/work/LoggerService/jp.go.aist.rtm.RTC:666-669
/branches/work/SourceSharing/jp.go.aist.rtm.RTC:591-603
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
/trunk/jp.go.aist.rtm.RTC:622,630-637,639-658,661,663,670,672-673,678,680-685,688,691-692,695-696,698

Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/.project
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/.project	2015-10-28 02:08:55 UTC (rev 733)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/.project	2015-10-28 02:38:33 UTC (rev 734)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>OpenRTM-1.0.0-Java</name>
+	<name>OpenRTM-1.1.0-Java</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs	2015-10-28 02:08:55 UTC (rev 733)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs	2015-10-28 02:38:33 UTC (rev 734)
@@ -1,20 +1,58 @@
+'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")
+
+strMode = objShell.Environment("Process").Item("PROCESSOR_ARCHITECTURE")
+
 'JDK‚̃ŒƒWƒXƒgƒŠƒL[‚ðƒZƒbƒg
-regJDKkey  = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
+If UCase(strMode) = "X86" Then
+	regJDKkey  = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
+Else
+	regJDKkey  = "HKLM\SOFTWARE\Wow6432Node\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: branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs	2015-10-28 02:08:55 UTC (rev 733)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs	2015-10-28 02:38:33 UTC (rev 734)
@@ -6,8 +6,14 @@
 '‹N“®—pƒIƒuƒWƒFƒNƒg‚̎擾
 Set objShell = WScript.CreateObject("WScript.Shell")
 
+strMode = objShell.Environment("Process").Item("PROCESSOR_ARCHITECTURE")
+
 'JDK‚̃ŒƒWƒXƒgƒŠƒL[‚ðƒZƒbƒg
-regJDKkey  = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
+If UCase(strMode) = "X86" Then
+	regJDKkey  = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
+Else
+	regJDKkey  = "HKLM\SOFTWARE\Wow6432Node\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 +34,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

More information about the openrtm-commit mailing list