[openrtm-commit:01646] r747 - 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 jp.go.aist.rtm.RTC/installer/win32
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2015年 10月 29日 (木) 16:28:46 JST
Author: kawauchi
Date: 2015-10-29 16:28:46 +0900 (Thu, 29 Oct 2015)
New Revision: 747
Modified:
branches/RELENG_1_1/
branches/RELENG_1_1/jp.go.aist.rtm.RTC/
branches/RELENG_1_1/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs
branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml
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/win32/OpenRTM-aist-Java.wxs.in
branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/build.cmd
Log:
[compat,merge] r724-727 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/ForComponentActionListener:521-522
/branches/work/ForComponentObserverConsumer:534-543
/branches/work/ForConfigurationListener:524-526
/branches/work/ForFileNameservice:623-628
/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:621-622,629-658,662-663,670,672-673,678,680-685,687-696,698-700,702-703,706-716,721-722
+ /branches/RELENG_1_0_0:60-401
/branches/work/ConfigurationCallback:631-635
/branches/work/ForComponentActionListener:521-522
/branches/work/ForComponentObserverConsumer:534-543
/branches/work/ForConfigurationListener:524-526
/branches/work/ForFileNameservice:623-628
/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:621-622,629-658,662-663,670,672-673,678,680-685,687-696,698-700,702-703,706-716,721-722,724-727
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/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/ForFileNameservice/jp.go.aist.rtm.RTC:623-628
/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:621-622,629-658,662-663,670,672-673,678,680-685,687-696,698-700,702-703,706-716,721-722
+ /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/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/ForFileNameservice/jp.go.aist.rtm.RTC:623-628
/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:621-622,629-658,662-663,670,672-673,678,680-685,687-696,698-700,702-703,706-716,721-722,724-727
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-29 07:25:59 UTC (rev 746)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs 2015-10-29 07:28:46 UTC (rev 747)
@@ -1,42 +1,48 @@
-'orbd‹N“®—pƒXƒNƒŠƒvƒg
-'–{ƒXƒNƒŠƒvƒg‚͊‹«•Ï”TEMP‚ªÝ’肳‚ê‚Ä‚¢‚邱‚Æ‚ð‘O’ñ‚Æ‚µ‚Ü‚·
-'‚È‚¨AŠÂ‹«•Ï”TEMP‚Í’Ê—áOS‚É‚æ‚èƒfƒtƒHƒ‹ƒg‚Åݒ肳‚ê‚Ä‚¢‚Ü‚·
+'orbd起動用スクリプト
+'本スクリプトã¯ç’°å¢ƒå¤‰æ•°TEMPãŒè¨å®šã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’å‰æã¨ã—ã¾ã™
+'ãªãŠã€ç’°å¢ƒå¤‰æ•°TEMPã¯é€šä¾‹OSã«ã‚ˆã‚Šãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§è¨å®šã•ã‚Œã¦ã„ã¾ã™
-'‹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
-If UCase(strMode) = "X86" Then
- regJDKkey = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
-Else
- regJDKkey = "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Development Kit"
+'JDKã®ãƒ¬ã‚¸ã‚¹ãƒˆãƒªã‚ーをセット
+regJDKkey = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
+If not (UCase(strMode) = "X86") Then
+ '64bit OS
+ On Error Resume Next
+ regJDKkey = regJDKkey + "\"
+ If IsNull(objShell.RegRead(regJDKkey)) Then
+ 'ã‚ーãŒå˜åœ¨ã—ãªã„
+ '64bitã®OS上ã«32bit版ã®JavaãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹
+ regJDKkey = "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Development Kit"
+ End If
End If
-'ƒŒƒWƒXƒgƒŠ‚©‚çJDKƒJƒŒƒ“ƒgƒo[ƒWƒ‡ƒ“‚ðŽæ“¾
+'レジストリã‹ã‚‰JDKカレントãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’å–å¾—
'objShell.RegRead("HKLM\SOFTWARE\JavaSoft\Java Development Kit\CurrentVersion")
-'‚±‚ꂪA—Ⴆ‚Î"1.5"‚¾‚Æ‚·‚é‚ÆA
+'ã“ã‚ŒãŒã€ä¾‹ãˆã°"1.5"ã ã¨ã™ã‚‹ã¨ã€
'HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.5\JavaHome
-'‚ÉJDKƒJƒŒƒ“ƒgƒo[ƒWƒ‡ƒ“‚̃‹[ƒgƒtƒHƒ‹ƒ_‚ª‹LÚ‚³‚ê‚Ä‚¢‚é
+'ã«JDKカレントãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ«ãƒ¼ãƒˆãƒ•ã‚©ãƒ«ãƒ€ãŒè¨˜è¼‰ã•ã‚Œã¦ã„ã‚‹
Javahome = regJDKkey & "\" & objShell.RegRead(regJDKkey & "\CurrentVersion") & "\JavaHome"
-'JDKƒJƒŒƒ“ƒgƒo[ƒWƒ‡ƒ“‚̃‹[ƒgƒtƒHƒ‹ƒ_Javahome‚̉º‚Ìbin\orbd.exe‚ª–Ú“I‚ÌŽÀsƒtƒ@ƒCƒ‹
+'JDKカレントãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ«ãƒ¼ãƒˆãƒ•ã‚©ãƒ«ãƒ€Javahomeã®ä¸‹ã®bin\orbd.exeãŒç›®çš„ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«
targetexe = """" & objShell.RegRead(Javahome) & "\bin\orbd.exe"""
-'–Ú“I‚ÌŽÀsƒtƒ@ƒCƒ‹targetexe‚ð“K؂ȃIƒvƒVƒ‡ƒ“‚ð‚‚¯‚ÄŽÀs‚³‚¹‚é
+'目的ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«targetexeã‚’é©åˆ‡ãªã‚ªãƒ—ションをã¤ã‘ã¦å®Ÿè¡Œã•ã›ã‚‹
objShell.Run targetexe & " -ORBInitialPort 2809 -ORBInitialHost localhost -defaultdb ""%TEMP%""\orb.db"
-'‚±‚ê‚͗Ⴆ‚ÎAŽŸ‚̂悤‚È‚±‚Æ‚ð‚â‚Á‚Ä‚éB‚½‚¾‚µAì‹ÆƒfƒBƒŒƒNƒgƒŠ‚ðƒ†[ƒU[‚ÌtempƒtƒHƒ‹ƒ_‚ÉŽw’èB
+'ã“ã‚Œã¯ä¾‹ãˆã°ã€æ¬¡ã®ã‚ˆã†ãªã“ã¨ã‚’ã‚„ã£ã¦ã‚‹ã€‚ãŸã ã—ã€ä½œæ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ユーザーã®tempフォルダã«æŒ‡å®šã€‚
'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ƒ‡ƒ“‚̎擾
+' OS ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å–å¾—
' **********************************************************
Function GetOSVersion()
@@ -55,4 +61,4 @@
GetOSVersion = CDbl( strWork )
-End Function
\ No newline at end of file
+End Function
Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml 2015-10-29 07:25:59 UTC (rev 746)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml 2015-10-29 07:28:46 UTC (rev 747)
@@ -855,7 +855,7 @@
<mkdir dir="${dist.dir}/source/OpenRTM-aist-Java-${version}" />
- <delete file="${dist.dir}/source/OpenRTM-aist-Java-${version}.zip" />
+ <delete file="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE.zip" />
<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}/src" >
@@ -881,7 +881,7 @@
<copy file=".classpath" todir="${dist.dir}/source/OpenRTM-aist-Java-${version}" />
- <zip destfile="${dist.dir}/source/OpenRTM-aist-Java-${version}.zip" basedir="${dist.dir}/source/OpenRTM-aist-Java-${version}" />
+ <zip destfile="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE.zip" basedir="${dist.dir}/source/OpenRTM-aist-Java-${version}" />
@@ -894,7 +894,7 @@
<mkdir dir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/1.1" />
- <delete file="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar.zip" />
+ <delete file="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE-jar.zip" />
<copy todir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar/OpenRTM-aist/1.1/jar" >
@@ -952,7 +952,7 @@
</copy>
- <zip destfile="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar.zip" basedir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar" />
+ <zip destfile="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE-jar.zip" basedir="${dist.dir}/source/OpenRTM-aist-Java-${version}-jar" />
<delete file="${dist.dir}/source/OpenRTM-aist-Java-${version}-RELEASE.tar.gz" />
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-29 07:25:59 UTC (rev 746)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs 2015-10-29 07:28:46 UTC (rev 747)
@@ -1,42 +1,48 @@
-'orbd‹N“®—pƒXƒNƒŠƒvƒg
-'–{ƒXƒNƒŠƒvƒg‚͊‹«•Ï”TEMP‚ªÝ’肳‚ê‚Ä‚¢‚邱‚Æ‚ð‘O’ñ‚Æ‚µ‚Ü‚·
-'‚È‚¨AŠÂ‹«•Ï”TEMP‚Í’Ê—áOS‚É‚æ‚èƒfƒtƒHƒ‹ƒg‚Åݒ肳‚ê‚Ä‚¢‚Ü‚·
+'orbd起動用スクリプト
+'本スクリプトã¯ç’°å¢ƒå¤‰æ•°TEMPãŒè¨å®šã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’å‰æã¨ã—ã¾ã™
+'ãªãŠã€ç’°å¢ƒå¤‰æ•°TEMPã¯é€šä¾‹OSã«ã‚ˆã‚Šãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§è¨å®šã•ã‚Œã¦ã„ã¾ã™
-'‹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
-If UCase(strMode) = "X86" Then
- regJDKkey = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
-Else
- regJDKkey = "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Development Kit"
+'JDKã®ãƒ¬ã‚¸ã‚¹ãƒˆãƒªã‚ーをセット
+regJDKkey = "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
+If not (UCase(strMode) = "X86") Then
+ '64bit OS
+ On Error Resume Next
+ regJDKkey = regJDKkey + "\"
+ If IsNull(objShell.RegRead(regJDKkey)) Then
+ 'ã‚ーãŒå˜åœ¨ã—ãªã„
+ '64bitã®OS上ã«32bit版ã®JavaãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹
+ regJDKkey = "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Development Kit"
+ End If
End If
-'ƒŒƒWƒXƒgƒŠ‚©‚çJDKƒJƒŒƒ“ƒgƒo[ƒWƒ‡ƒ“‚ðŽæ“¾
+'レジストリã‹ã‚‰JDKカレントãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’å–å¾—
'objShell.RegRead("HKLM\SOFTWARE\JavaSoft\Java Development Kit\CurrentVersion")
-'‚±‚ꂪA—Ⴆ‚Î"1.5"‚¾‚Æ‚·‚é‚ÆA
+'ã“ã‚ŒãŒã€ä¾‹ãˆã°"1.5"ã ã¨ã™ã‚‹ã¨ã€
'HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.5\JavaHome
-'‚ÉJDKƒJƒŒƒ“ƒgƒo[ƒWƒ‡ƒ“‚̃‹[ƒgƒtƒHƒ‹ƒ_‚ª‹LÚ‚³‚ê‚Ä‚¢‚é
+'ã«JDKカレントãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ«ãƒ¼ãƒˆãƒ•ã‚©ãƒ«ãƒ€ãŒè¨˜è¼‰ã•ã‚Œã¦ã„ã‚‹
Javahome = regJDKkey & "\" & objShell.RegRead(regJDKkey & "\CurrentVersion") & "\JavaHome"
-'JDKƒJƒŒƒ“ƒgƒo[ƒWƒ‡ƒ“‚̃‹[ƒgƒtƒHƒ‹ƒ_Javahome‚̉º‚Ìbin\orbd.exe‚ª–Ú“I‚ÌŽÀsƒtƒ@ƒCƒ‹
+'JDKカレントãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ«ãƒ¼ãƒˆãƒ•ã‚©ãƒ«ãƒ€Javahomeã®ä¸‹ã®bin\orbd.exeãŒç›®çš„ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«
targetexe = """" & objShell.RegRead(Javahome) & "\bin\orbd.exe"""
-'–Ú“I‚ÌŽÀsƒtƒ@ƒCƒ‹targetexe‚ð“K؂ȃIƒvƒVƒ‡ƒ“‚ð‚‚¯‚ÄŽÀs‚³‚¹‚é
+'目的ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«targetexeã‚’é©åˆ‡ãªã‚ªãƒ—ションをã¤ã‘ã¦å®Ÿè¡Œã•ã›ã‚‹
objShell.Run targetexe & " -ORBInitialPort 2809 -ORBInitialHost localhost -defaultdb ""%TEMP%""\orb.db"
-'‚±‚ê‚͗Ⴆ‚ÎAŽŸ‚̂悤‚È‚±‚Æ‚ð‚â‚Á‚Ä‚éB‚½‚¾‚µAì‹ÆƒfƒBƒŒƒNƒgƒŠ‚ðƒ†[ƒU[‚ÌtempƒtƒHƒ‹ƒ_‚ÉŽw’èB
+'ã“ã‚Œã¯ä¾‹ãˆã°ã€æ¬¡ã®ã‚ˆã†ãªã“ã¨ã‚’ã‚„ã£ã¦ã‚‹ã€‚ãŸã ã—ã€ä½œæ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ユーザーã®tempフォルダã«æŒ‡å®šã€‚
'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ƒ‡ƒ“‚̎擾
+' OS ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å–å¾—
' **********************************************************
Function GetOSVersion()
@@ -55,4 +61,4 @@
GetOSVersion = CDbl( strWork )
-End Function
\ No newline at end of file
+End Function
Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in 2015-10-29 07:25:59 UTC (rev 746)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in 2015-10-29 07:28:46 UTC (rev 747)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?define ProductName = "{% Product.Name %}-{% Product.Version %} for Java"?>
- <Product Name="{% Product.Name %}-{% Product.Version %} for Java"
+ <Product Name='$(env.PRODUCT_NAME)'
Id="{% Product.Id %}"
Language='$(var.language)'
Codepage='$(var.codepage)'
@@ -18,20 +17,16 @@
<!-- Property -->
<Property Id='USERPROFILEDIR' Value='%USERPROFILE%' />
- <Property Id="JDK15">
- <RegistrySearch Id="JDK15"
- Root="HKLM"
- Key="SOFTWARE\JavaSoft\Java Development Kit\1.5"
- Name="JavaHome"
+ <?if $(env.ARCH) = x86_64 ?>
+ <Property Id="JDK17">
+ <RegistrySearch Id="JDK17"
+ Root="HKLM"
+ Key="SOFTWARE\JavaSoft\Java Development Kit\1.7"
+ Name="JavaHome"
+ Win64="yes"
Type="raw" />
</Property>
- <Property Id="JDK16">
- <RegistrySearch Id="JDK16"
- Root="HKLM"
- Key="SOFTWARE\JavaSoft\Java Development Kit\1.6"
- Name="JavaHome"
- Type="raw" />
- </Property>
+ <?else?>
<Property Id="JDK17">
<RegistrySearch Id="JDK17"
Root="HKLM"
@@ -39,18 +34,7 @@
Name="JavaHome"
Type="raw" />
</Property>
- <!-- RTSE Property-->
-
- <Property Id="RTSE_FILEEXISTS">
- <DirectorySearch Id="CheckFileDir" Path="C:\Program Files\OpenRTM-aist\{% Product.ShortVersion %}">
- <DirectorySearch Id="CheckFileDir2" Path ="OpenRTP">
- <DirectorySearch Id="CheckFileDir3" Path ="{% Product.ShortVersion %}">
- <FileSearch Id="CheckFile" Name="RTSystemEditorRCP.exe" />
- </DirectorySearch>
- </DirectorySearch>
- </DirectorySearch>
- </Property>
-
+ <?endif ?>
<!-- <SetProperty Id="FILEEXISTSDIR" After="AppSearch" Value="[FILEEXISTS]">
</SetProperty>-->
@@ -80,13 +64,17 @@
<!-- <Property Id="ALLUSERS" Value="1" /> -->
<!-- Check Conditions -->
- <Condition Message="[ProductName] requires JDK 1.5 or 1.6 or 1.7">
- <![CDATA[Installed OR (JDK15 <> "" OR JDK16 <> "" OR JDK17 <> "")]]>
+ <Condition Message="[ProductName] requires JDK 1.7">
+ <![CDATA[Installed OR (JDK17 <> "")]]>
</Condition>
<Directory Id="TARGETDIR" Name="SourceDir">
<!-- Program Files Folder -->
+ <?if $(env.ARCH) = x86 ?>
<Directory Id="ProgramFilesFolder" SourceName="PFILE">
+ <?else?>
+ <Directory Id="ProgramFiles64Folder" SourceName="PFILE">
+ <?endif ?>
<Directory Id="INSTALLLOCATION"
Name="{% Product.Name %}">
<Directory Id="Version"
@@ -97,6 +85,7 @@
<Condition>
<![CDATA[ALLUSERS <> 1]]>
</Condition>
+ <CreateFolder />
<Environment Id="envRTMJAVAROOTlocal" Name="RTM_JAVA_ROOT" Action="set"
System="no" Part="last" Value="[Version]"/>
</Component>
@@ -104,10 +93,18 @@
<Condition>
<![CDATA[ALLUSERS = 1 AND Privileged = 1]]>
</Condition>
+ <CreateFolder />
<Environment Id="envRTMJAVAROOTsystem" Name="RTM_JAVA_ROOT" Action="set"
System="yes" Part="last" Value="[Version]"/>
</Component>
+ <!-- JRE -->
+ <?if $(env.INCLUDE_JRE) = YES ?>
+ <Merge Id="Msi_JRE_OpenJDK" Language="1041"
+ SourceFile="JRE_OpenJDK7_$(env.ARCH).msm" DiskId="1" />
+ <?endif ?>
+ <!-- end of JRE -->
+
<!-- bin -->
<Directory Id="bin" Name="bin">
<Component Id="RtmSourceExamplesBin" Guid="{% RtmSourceExamplesBin.GUID %}">
@@ -118,8 +115,8 @@
Name="{% file.Name %}" DiskId="1"
Source="{% file.Source %}">
{% if file.Name is start-orbd.vbs %}
- <Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
- Name="Start Naming Service"
+ <Shortcut Id="{% file.Id %}" Directory="CommonToolsMenuFolder"
+ Name="Start Java Naming Service"
Show="normal" WorkingDirectory="bin"/>
{% endif %}
{% if file.Name is rtcd_java.exe %}
@@ -1223,7 +1220,8 @@
</Directory>
<!-- rtmtools components -->
<?if $(env.INCLUDE_OPENRTP) = YES ?>
- <?include OpenRTP_inc.wxs ?>
+ <Merge Id="Msi_RTSystemEditorRCP" Language="1041"
+ SourceFile="RTSystemEditorRCP_$(env.ARCH).msm" DiskId="1" />
<?endif ?>
<!-- end of rtmtools -->
@@ -1231,16 +1229,12 @@
</Directory>
- <!-- rtmtools components -->
-<!--
- <?if $(env.INCLUDE_OPENRTP) = YES ?>
- <?include OpenRTP_inc.wxs ?>
- <?endif ?>
--->
- <!-- end of rtmtools -->
<!-- end of Program Files Folder -->
-
+ <?if $(env.ARCH) = "x86" ?>
</Directory>
+ <?else?>
+ </Directory>
+ <?endif?>
<!-- Program Folder -->
<Directory Id="ProgramMenuFolder">
@@ -1252,15 +1246,17 @@
<Component Id="JavaMenuFolder" Guid="4F6569FA-8492-441c-AF92-9E4B65C738EC">
<RemoveFolder Id='JavaMenuFolder' On='uninstall' />
</Component>
- <Directory Id="ToolsMenuFolder" Name="tools">
- </Directory>
- <Directory Id="Components" Name="components">
- <Directory Id="ExpMenuFolder" Name="examples">
+ <Directory Id="ToolsMenuFolder" Name="Tools">
+ </Directory>
+ <Directory Id="Components" Name="Components">
+ <Directory Id="ExpMenuFolder" Name="Examples">
</Directory>
</Directory>
- <Directory Id="DocMenuFolder" Name="documents">
+ <Directory Id="DocMenuFolder" Name="Documents">
</Directory>
</Directory>
+ <Directory Id="CommonToolsMenuFolder" Name="Tools">
+ </Directory>
</Directory>
</Directory>
@@ -1364,29 +1360,17 @@
</Feature>
+ <!-- JRE -->
+ <?if $(env.INCLUDE_JRE) = YES ?>
+ <Feature Id="JRE_OpenJDK" Level="1" Title="JRE for RTSystemEditorRCP 1.1">
+ <MergeRef Id="Msi_JRE_OpenJDK" />
+ </Feature>
+ <?endif ?>
+
<!-- OpenRTP tools -->
<?if $(env.INCLUDE_OPENRTP) = YES ?>
- <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="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610" />
- <ComponentRef Id="Meta_inf" />
- <ComponentRef Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731" />
- <ComponentRef Id="Meta_inf_2" />
- -->
- <ComponentRef Id="org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610" />
- <ComponentRef Id="META_INF" />
- <ComponentRef Id="org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731" />
- <ComponentRef Id="META_INF_2" />
- </Feature>
+ <Feature Id="RTSE_ONLY" Level="1" Title="RTSystemEditorRCP 1.1">
+ <MergeRef Id="Msi_RTSystemEditorRCP" />
</Feature>
<?endif ?>
Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/build.cmd
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/build.cmd 2015-10-29 07:25:59 UTC (rev 746)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/build.cmd 2015-10-29 07:28:46 UTC (rev 747)
@@ -3,12 +3,24 @@
@rem Variable Settings
@rem usually only %TARGET% might be changed
@rem ------------------------------------------------------------
- at set PATH=%WIX%\bin;%PATH%
+if not DEFINED ARCH set ARCH=x86_64
+if not DEFINED INCLUDE_JRE set INCLUDE_JRE=YES
+ at set PATH_OLD=%PATH%
+ at set INCLUDE_OPENRTP=YES
@set VERSION=1.1.0
@set TARGET=OpenRTM-aist-Java
@set TARGET_WXS=%TARGET%.wxs
@set TARGET_WIXOBJ=%TARGET%.wixobj
- at set TARGET_FULL=%TARGET%-%VERSION%
+ at set TARGET_FULL=%TARGET%_%VERSION%-RELEASE_%ARCH%
+if "x%ARCH%" == "xx86_64" (
+ @set PYTHON_DIR=C:\Python27_x64
+ @set OS_ARCH=64-bit OS
+) else (
+ @set PYTHON_DIR=C:\Python27
+ @set OS_ARCH=32-bit OS
+)
+ at set PATH=%WIX%bin;%PYTHON_DIR%;%PATH%
+ at set PRODUCT_NAME=OpenRTM-aist-%VERSION%-RELEASE (%OS_ARCH%) for Java
@rem ------------------------------------------------------------
@rem WixUI Customization Settings
@@ -47,30 +59,32 @@
@rem RTSystemEditorRCP.exe should be under %RTSE_ROOT%
@rem
@rem ------------------------------------------------------------
-if "x%RTSE_ROOT%" == "x" (
- echo Envrionment variable "RTSE_ROOT" is not set. Abort.
- goto END
-)
-if not exist "%RTSE_ROOT%\RTSystemEditorRCP.exe" (
- echo RTSystemEditorRCP.exe does not found. Abort
- goto END
-)
-set INCLUDE_RTSE=YES
-set INCLUDE_OPENRTP=YES
+ at rem *** RTSystemEditorRCP has been changed to use the merge module.
+ at rem *** So this process has been deleted.
+ at rem if "x%RTSE_ROOT%" == "x" (
+ at rem echo Envrionment variable "RTSE_ROOT" is not set. Abort.
+ at rem goto END
+ at rem )
+ at rem if not exist "%RTSE_ROOT%\RTSystemEditorRCP.exe" (
+ at rem echo RTSystemEditorRCP.exe does not found. Abort
+ at rem goto END
+ at rem )
+ at rem set INCLUDE_RTSE=YES
+ at rem set INCLUDE_OPENRTP=YES
+ at rem
+ at rem if not exist OpenRTP_inc.wxs (
+ at rem cd OpenRTP
+ at rem rem set TMP_PYTHONPATH=%PYTHONPATH%
+ at rem rem set PYTHONPATH=../;../../bin;%PYTHONPATH%
+ at rem rem echo Generating OpenRTP_inc.wxs......
+ at rem rem openrtpwxs.py
+ at rem rem set PYTHONPATH=%TMP_PYTHONPATH%
+ at rem copy OpenRTP_inc.wxs ..
+ at rem cd ..
+ at rem )
-if not exist OpenRTP_inc.wxs (
- cd OpenRTP
-rem set TMP_PYTHONPATH=%PYTHONPATH%
-rem set PYTHONPATH=../;../../bin;%PYTHONPATH%
-rem echo Generating OpenRTP_inc.wxs......
-rem openrtpwxs.py
-rem set PYTHONPATH=%TMP_PYTHONPATH%
- copy OpenRTP_inc.wxs ..
- cd ..
-)
-
@rem ------------------------------------------------------------
@rem Import Language-Country, Language codes, Codepages
@rem from langs.txt
@@ -90,7 +104,11 @@
@rem ============================================================
@rem compile wxs file and link msi
@rem ============================================================
-candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=1033 -dcodepage=1252
+if "x%ARCH%" == "xx86_64" (
+ candle.exe -arch x64 %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=1033 -dcodepage=1252
+) else (
+ candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=1033 -dcodepage=1252
+)
light.exe -ext WixUIExtension -loc WixUI_en-us.wxl ^
-out %TARGET_FULL%.msi %TARGET_WIXOBJ% %WIXUI_RTM_WIXOBJ%
@@ -107,7 +125,11 @@
@rem ------------------------------------------------------------
@rem compile wxs file and link msi
@rem
- candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=!LANG[%%i]! -dcodepage=!CODE[%%i]!
+ if "x%ARCH%" == "xx86_64" (
+ candle.exe -arch x64 %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=!LANG[%%i]! -dcodepage=!CODE[%%i]!
+ ) else (
+ candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=!LANG[%%i]! -dcodepage=!CODE[%%i]!
+ )
if exist WixUI_!LC[%%i]!.wxl (
light.exe -ext WixUIExtension -loc WixUI_!LC[%%i]!.wxl ^
@@ -144,4 +166,7 @@
:END
del *.yaml
+ at set PATH=%PATH_OLD%
+ at rem pause;
+
More information about the openrtm-commit
mailing list