[openrtm-commit:01632] r735 - 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 jp.go.aist.rtm.RTC/installer/win32/OpenRTP
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2015年 10月 28日 (水) 11:50:05 JST
Author: kawauchi
Date: 2015-10-28 11:50:04 +0900 (Wed, 28 Oct 2015)
New Revision: 735
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/OpenRTP/OpenRTP_inc.wxs
branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/OpenRTP_inc.wxs.in
branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/openrtpwxs.py
branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_hu-hu.wxl
branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_ja-jp.wxl
branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_ko-kr.wxl
branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_zh-tw.wxl
branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/build.cmd
Log:
[compat,merge] r707-716,721,722,724-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/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
+ /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,707-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/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
+ /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,707-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-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/Source/examples/start-orbd.vbs 2015-10-28 02:50:04 UTC (rev 735)
@@ -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-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml 2015-10-28 02:50:04 UTC (rev 735)
@@ -915,7 +915,7 @@
<delete dir="${build.dir.test}/reports/*.txt" />
- <junit haltonfailure="No" >
+ <junit haltonfailure="Yes" >
<formatter type="xml" usefile="true" />
<classpath>
<pathelement path="bin:${env.JUNIT_HOME}/junit:${env.JUNIT_HOME}/junit/samples:${env.JUNIT_HOME}:${env.ANT_HOME}:${build.dir.test}:lib/commons-cli-1.1.jar"/>
@@ -945,7 +945,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" >
@@ -971,7 +971,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}" />
@@ -984,7 +984,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" >
@@ -1042,7 +1042,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-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/resources/Source/examples/start-orbd.vbs 2015-10-28 02:50:04 UTC (rev 735)
@@ -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-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in 2015-10-28 02:50:04 UTC (rev 735)
@@ -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)'
@@ -11,27 +10,23 @@
<Package Id="*"
Keywords="Installer"
Description="{% Package.Description %}"
- InstallerVersion="300"
+ InstallerVersion="{% Package.InstallerVersion %}"
Languages='$(var.language)'
- Compressed="yes"
+ Compressed="{% Package.Compressed %}"
SummaryCodepage='$(var.codepage)' />
<!-- 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 %}\RTSystemEditor">
- <FileSearch Id="CheckFile" Name="RTSystemEditorRCP.exe" />
- </DirectorySearch>
- </DirectorySearch>
- </DirectorySearch>
- </Property>
-
+ <?endif ?>
<!-- <SetProperty Id="FILEEXISTSDIR" After="AppSearch" Value="[FILEEXISTS]">
</SetProperty>-->
@@ -65,7 +49,7 @@
Minimum="1.1.0"
Maximum="1.1.0.1"
Property="OLDERVERSIONBEINGUPGRADED"
- IncludeMaximum="no" />
+ IncludeMaximum="yes" />
<UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND'
Minimum='1.1.0' IncludeMinimum='yes'
Maximum='1.2.0' IncludeMaximum='no' />
@@ -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,21 +93,30 @@
<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 %}">
<RemoveFolder Id='RtmSourceExamplesBin_f' On='uninstall'/>
+ <RemoveFolder Id='RemoveToolsMenuFolder' Directory='ToolsMenuFolder' On='uninstall' />
{% for file in RtmSourceExamplesBin.Files %}
<File Id="{% file.Id %}"
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 %}
@@ -191,6 +189,7 @@
<Component Id="RtmSourceJavadoc"
Guid="{% RtmSourceJavadoc.GUID %}">
<RemoveFolder Id='RtmSourceJavadoc_f' On='uninstall' />
+ <RemoveFolder Id='RemoveDocMenuFolder' Directory='DocMenuFolder' On='uninstall' />
{% for file in RtmSourceJavadoc.Files %}
<File Id="{% file.Id %}"
Name="{% file.Name %}" DiskId="1"
@@ -1041,6 +1040,8 @@
Guid="{% RtmSourceExamplesBat.GUID %}">
<RemoveFile Id='RtmSourceExamplesBat' On='uninstall' Name='*.log' />
<RemoveFolder Id='RtmSourceExamplesBat_f' On='uninstall' />
+ <RemoveFolder Id='RemoveExpMenuFolder' Directory='ExpMenuFolder' On='uninstall' />
+ <RemoveFolder Id='RemoveComponents' Directory='Components' On='uninstall' />
{% for file in RtmSourceExamplesBat.Files %}
<File Id="{% file.Id %}"
Name="{% file.Name %}" DiskId="1"
@@ -1219,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 -->
@@ -1227,30 +1229,34 @@
</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">
<Directory Id="AppMenuFolder" Name="{% Product.Name %} {% Product.ShortVersion %}">
+ <Component Id="AppMenuFolder" Guid="7B97F931-CCBC-42d4-A280-5223F4EC3885">
+ <RemoveFolder Id='AppMenuFolder' On='uninstall' />
+ </Component>
<Directory Id="JavaMenuFolder" Name="Java">
- <Directory Id="ToolsMenuFolder" Name="tools">
+ <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="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>
@@ -1354,23 +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" />
- </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/OpenRTP/OpenRTP_inc.wxs
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/OpenRTP_inc.wxs 2015-10-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/OpenRTP_inc.wxs 2015-10-28 02:50:04 UTC (rev 735)
@@ -3,23 +3,24 @@
<!-- root directory -->
<Directory Id="OpenRTP" Name="OpenRTP">
<Directory Id="OpenRTPVersion" Name="1.1">
- <Component Id="Openrtp" Guid="D004598F-F86B-11E0-9CF4-001BDC004C2E">
+ <Component Id="Openrtp" Guid="F71D844F-ADA6-11E3-AED5-9A48C58E0395">
<Environment Id="OPENRTP_ROOT" Name="OPENRTP_ROOT" Action="set"
System="yes" Value="[openrtpVersion]" />
<File Id="Openrtp0000" Name="RTSystemEditorRCP.exe"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\\\RTSystemEditorRCP.exe">
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\RTSystemEditorRCP.exe">
<Shortcut Id="Openrtp0000" Directory="ToolsMenuFolder"
- Name="RTSystemEditor"
+ Name="RTSystemEditor"
+ Arguments="-data "%USERPROFILE%\workspace""
Show="normal" WorkingDirectory="tools"/>
</File>
<File Id="Openrtp0001" Name=".eclipseproduct"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\\\.eclipseproduct">
+ DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\.eclipseproduct">
</File>
</Component>
<!-- configuration -->
<Directory Id="openrtp_configuration" Name="configuration">
- <Component Id="OpenrtpConfiguration" Guid="D0176C61-F86B-11E0-8601-001BDC004C2E">
+ <Component Id="OpenrtpConfiguration" Guid="F71EBCD1-ADA6-11E3-A057-9A48C58E0395">
<File Id="OpenrtpConfiguration0000" Name="config.ini"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\configuration\\config.ini">
</File>
@@ -28,7 +29,7 @@
<!-- plugins -->
<Directory Id="openrtp_plugins" Name="plugins">
- <Component Id="OpenrtpPlugins" Guid="D0424CEE-F86B-11E0-B4B9-001BDC004C2E">
+ <Component Id="OpenrtpPlugins" Guid="F72859C0-ADA6-11E3-BA96-9A48C58E0395">
<File Id="OpenrtpPlugins0000" Name="com.ibm.icu.nl_ja_3.8.1.v20080530.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\com.ibm.icu.nl_ja_3.8.1.v20080530.jar">
</File>
@@ -125,210 +126,167 @@
<File Id="OpenrtpPlugins0031" Name="org.eclipse.core.resources_3.4.2.R34x_v20090126.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.resources_3.4.2.R34x_v20090126.jar">
</File>
- <File Id="OpenrtpPlugins0032" Name="org.eclipse.core.runtime.nl_ja_3.4.0.v20080512.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.runtime.nl_ja_3.4.0.v20080512.jar">
- </File>
- <File Id="OpenrtpPlugins0033" Name="org.eclipse.core.runtime_3.4.0.v20080512.jar"
+ <File Id="OpenrtpPlugins0032" Name="org.eclipse.core.runtime_3.4.0.v20080512.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.runtime_3.4.0.v20080512.jar">
</File>
- <File Id="OpenrtpPlugins0034" Name="org.eclipse.draw2d_3.4.2.v20090114-1330.jar"
+ <File Id="OpenrtpPlugins0033" Name="org.eclipse.draw2d_3.4.2.v20090114-1330.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.draw2d_3.4.2.v20090114-1330.jar">
</File>
- <File Id="OpenrtpPlugins0035" Name="org.eclipse.emf.common_2.4.0.v200902171115.jar"
+ <File Id="OpenrtpPlugins0034" Name="org.eclipse.emf.common_2.4.0.v200902171115.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.emf.common_2.4.0.v200902171115.jar">
</File>
- <File Id="OpenrtpPlugins0036" Name="org.eclipse.emf.ecore.xmi_2.4.1.v200902171115.jar"
+ <File Id="OpenrtpPlugins0035" Name="org.eclipse.emf.ecore.xmi_2.4.1.v200902171115.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.emf.ecore.xmi_2.4.1.v200902171115.jar">
</File>
- <File Id="OpenrtpPlugins0037" Name="org.eclipse.emf.ecore_2.4.2.v200902171115.jar"
+ <File Id="OpenrtpPlugins0036" Name="org.eclipse.emf.ecore_2.4.2.v200902171115.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.emf.ecore_2.4.2.v200902171115.jar">
</File>
- <File Id="OpenrtpPlugins0038" Name="org.eclipse.equinox.app.nl_ja_1.1.0.v20080421-2006.jar"
+ <File Id="OpenrtpPlugins0037" Name="org.eclipse.equinox.app.nl_ja_1.1.0.v20080421-2006.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.app.nl_ja_1.1.0.v20080421-2006.jar">
</File>
- <File Id="OpenrtpPlugins0039" Name="org.eclipse.equinox.app_1.1.0.v20080421-2006.jar"
+ <File Id="OpenrtpPlugins0038" Name="org.eclipse.equinox.app_1.1.0.v20080421-2006.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.app_1.1.0.v20080421-2006.jar">
</File>
- <File Id="OpenrtpPlugins0040" Name="org.eclipse.equinox.common.nl_ja_3.4.0.v20080421-2006.jar"
+ <File Id="OpenrtpPlugins0039" Name="org.eclipse.equinox.common.nl_ja_3.4.0.v20080421-2006.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.common.nl_ja_3.4.0.v20080421-2006.jar">
</File>
- <File Id="OpenrtpPlugins0041" Name="org.eclipse.equinox.common_3.4.0.v20080421-2006.jar"
+ <File Id="OpenrtpPlugins0040" Name="org.eclipse.equinox.common_3.4.0.v20080421-2006.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.common_3.4.0.v20080421-2006.jar">
</File>
- <File Id="OpenrtpPlugins0042" Name="org.eclipse.equinox.launcher.nl_ja_1.0.101.R34x_v20081125.jar"
+ <File Id="OpenrtpPlugins0041" Name="org.eclipse.equinox.launcher.nl_ja_1.0.101.R34x_v20081125.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.launcher.nl_ja_1.0.101.R34x_v20081125.jar">
</File>
- <File Id="OpenrtpPlugins0043" Name="org.eclipse.equinox.launcher_1.0.101.R34x_v20081125.jar"
+ <File Id="OpenrtpPlugins0042" Name="org.eclipse.equinox.launcher_1.0.101.R34x_v20081125.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.launcher_1.0.101.R34x_v20081125.jar">
</File>
- <File Id="OpenrtpPlugins0044" Name="org.eclipse.equinox.preferences.nl_ja_3.2.201.R34x_v20080709.jar"
+ <File Id="OpenrtpPlugins0043" Name="org.eclipse.equinox.preferences.nl_ja_3.2.201.R34x_v20080709.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.preferences.nl_ja_3.2.201.R34x_v20080709.jar">
</File>
- <File Id="OpenrtpPlugins0045" Name="org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar"
+ <File Id="OpenrtpPlugins0044" Name="org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar">
</File>
- <File Id="OpenrtpPlugins0046" Name="org.eclipse.equinox.registry.nl_ja_3.4.0.v20080516-0950.jar"
+ <File Id="OpenrtpPlugins0045" Name="org.eclipse.equinox.registry.nl_ja_3.4.0.v20080516-0950.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.registry.nl_ja_3.4.0.v20080516-0950.jar">
</File>
- <File Id="OpenrtpPlugins0047" Name="org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar"
+ <File Id="OpenrtpPlugins0046" Name="org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar">
</File>
- <File Id="OpenrtpPlugins0048" Name="org.eclipse.gef_3.4.1.v20080806.jar"
+ <File Id="OpenrtpPlugins0047" Name="org.eclipse.gef_3.4.1.v20080806.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.gef_3.4.1.v20080806.jar">
</File>
- <File Id="OpenrtpPlugins0049" Name="org.eclipse.help.nl_ja_3.3.102.v20081014_34x.jar"
+ <File Id="OpenrtpPlugins0048" Name="org.eclipse.help.nl_ja_3.3.102.v20081014_34x.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.help.nl_ja_3.3.102.v20081014_34x.jar">
</File>
- <File Id="OpenrtpPlugins0050" Name="org.eclipse.help_3.3.102.v20081014_34x.jar"
+ <File Id="OpenrtpPlugins0049" Name="org.eclipse.help_3.3.102.v20081014_34x.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.help_3.3.102.v20081014_34x.jar">
</File>
- <File Id="OpenrtpPlugins0051" Name="org.eclipse.jface.databinding.nl_ja_1.2.1.M20080827-0800a.jar"
+ <File Id="OpenrtpPlugins0050" Name="org.eclipse.jface.databinding.nl_ja_1.2.1.M20080827-0800a.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.jface.databinding.nl_ja_1.2.1.M20080827-0800a.jar">
</File>
- <File Id="OpenrtpPlugins0052" Name="org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar"
+ <File Id="OpenrtpPlugins0051" Name="org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar">
</File>
- <File Id="OpenrtpPlugins0053" Name="org.eclipse.jface.nl_ja_3.4.2.M20090107-0800.jar"
+ <File Id="OpenrtpPlugins0052" Name="org.eclipse.jface.nl_ja_3.4.2.M20090107-0800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.jface.nl_ja_3.4.2.M20090107-0800.jar">
</File>
- <File Id="OpenrtpPlugins0054" Name="org.eclipse.jface.text.nl_ja_3.4.2.r342_v20081119-0800.jar"
+ <File Id="OpenrtpPlugins0053" Name="org.eclipse.jface.text.nl_ja_3.4.2.r342_v20081119-0800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.jface.text.nl_ja_3.4.2.r342_v20081119-0800.jar">
</File>
- <File Id="OpenrtpPlugins0055" Name="org.eclipse.jface.text_3.4.2.r342_v20081119-0800.jar"
+ <File Id="OpenrtpPlugins0054" Name="org.eclipse.jface.text_3.4.2.r342_v20081119-0800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.jface.text_3.4.2.r342_v20081119-0800.jar">
</File>
- <File Id="OpenrtpPlugins0056" Name="org.eclipse.jface_3.4.2.M20090107-0800.jar"
+ <File Id="OpenrtpPlugins0055" Name="org.eclipse.jface_3.4.2.M20090107-0800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.jface_3.4.2.M20090107-0800.jar">
</File>
- <File Id="OpenrtpPlugins0057" Name="org.eclipse.osgi.nl_ja_3.4.3.R34x_v20081215-1030.jar"
+ <File Id="OpenrtpPlugins0056" Name="org.eclipse.osgi.nl_ja_3.4.3.R34x_v20081215-1030.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.osgi.nl_ja_3.4.3.R34x_v20081215-1030.jar">
</File>
- <File Id="OpenrtpPlugins0058" Name="org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar"
+ <File Id="OpenrtpPlugins0057" Name="org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar">
</File>
- <File Id="OpenrtpPlugins0059" Name="org.eclipse.swt.nl_ja_3.4.2.v3452b.jar"
+ <File Id="OpenrtpPlugins0058" Name="org.eclipse.swt.nl_ja_3.4.2.v3452b.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.swt.nl_ja_3.4.2.v3452b.jar">
</File>
- <File Id="OpenrtpPlugins0060" Name="org.eclipse.swt.win32.win32.x86_3.4.1.v3452b.jar"
+ <File Id="OpenrtpPlugins0059" Name="org.eclipse.swt.win32.win32.x86_3.4.1.v3452b.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.swt.win32.win32.x86_3.4.1.v3452b.jar">
</File>
- <File Id="OpenrtpPlugins0061" Name="org.eclipse.swt_3.4.2.v3452b.jar"
+ <File Id="OpenrtpPlugins0060" Name="org.eclipse.swt_3.4.2.v3452b.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.swt_3.4.2.v3452b.jar">
</File>
- <File Id="OpenrtpPlugins0062" Name="org.eclipse.text.nl_ja_3.4.0.v20080605-1800.jar"
+ <File Id="OpenrtpPlugins0061" Name="org.eclipse.text.nl_ja_3.4.0.v20080605-1800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.text.nl_ja_3.4.0.v20080605-1800.jar">
</File>
- <File Id="OpenrtpPlugins0063" Name="org.eclipse.text_3.4.0.v20080605-1800.jar"
+ <File Id="OpenrtpPlugins0062" Name="org.eclipse.text_3.4.0.v20080605-1800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.text_3.4.0.v20080605-1800.jar">
</File>
- <File Id="OpenrtpPlugins0064" Name="org.eclipse.ui.editors.nl_ja_3.4.0.v20080603-2000.jar"
+ <File Id="OpenrtpPlugins0063" Name="org.eclipse.ui.editors.nl_ja_3.4.0.v20080603-2000.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.editors.nl_ja_3.4.0.v20080603-2000.jar">
</File>
- <File Id="OpenrtpPlugins0065" Name="org.eclipse.ui.editors_3.4.0.v20080603-2000.jar"
+ <File Id="OpenrtpPlugins0064" Name="org.eclipse.ui.editors_3.4.0.v20080603-2000.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.editors_3.4.0.v20080603-2000.jar">
</File>
- <File Id="OpenrtpPlugins0066" Name="org.eclipse.ui.ide.nl_ja_3.4.2.M20090127-1700.jar"
+ <File Id="OpenrtpPlugins0065" Name="org.eclipse.ui.ide.nl_ja_3.4.2.M20090127-1700.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.ide.nl_ja_3.4.2.M20090127-1700.jar">
</File>
- <File Id="OpenrtpPlugins0067" Name="org.eclipse.ui.ide_3.4.2.M20090127-1700.jar"
+ <File Id="OpenrtpPlugins0066" Name="org.eclipse.ui.ide_3.4.2.M20090127-1700.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.ide_3.4.2.M20090127-1700.jar">
</File>
- <File Id="OpenrtpPlugins0068" Name="org.eclipse.ui.nl_ja_3.4.2.M20090204-0800.jar"
+ <File Id="OpenrtpPlugins0067" Name="org.eclipse.ui.nl_ja_3.4.2.M20090204-0800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.nl_ja_3.4.2.M20090204-0800.jar">
</File>
- <File Id="OpenrtpPlugins0069" Name="org.eclipse.ui.views.nl_ja_3.3.1.M20081112-0800.jar"
+ <File Id="OpenrtpPlugins0068" Name="org.eclipse.ui.views.nl_ja_3.3.1.M20081112-0800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.views.nl_ja_3.3.1.M20081112-0800.jar">
</File>
- <File Id="OpenrtpPlugins0070" Name="org.eclipse.ui.views_3.3.1.M20081112-0800.jar"
+ <File Id="OpenrtpPlugins0069" Name="org.eclipse.ui.views_3.3.1.M20081112-0800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.views_3.3.1.M20081112-0800.jar">
</File>
- <File Id="OpenrtpPlugins0071" Name="org.eclipse.ui.win32_3.2.100.v20080408-0800.jar"
+ <File Id="OpenrtpPlugins0070" Name="org.eclipse.ui.win32_3.2.100.v20080408-0800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.win32_3.2.100.v20080408-0800.jar">
</File>
- <File Id="OpenrtpPlugins0072" Name="org.eclipse.ui.workbench.nl_ja_3.4.2.M20090127-1700.jar"
+ <File Id="OpenrtpPlugins0071" Name="org.eclipse.ui.workbench.nl_ja_3.4.2.M20090127-1700.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.workbench.nl_ja_3.4.2.M20090127-1700.jar">
</File>
- <File Id="OpenrtpPlugins0073" Name="org.eclipse.ui.workbench.texteditor.nl_ja_3.4.1.r341_v20080827-1100.jar"
+ <File Id="OpenrtpPlugins0072" Name="org.eclipse.ui.workbench.texteditor.nl_ja_3.4.1.r341_v20080827-1100.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.workbench.texteditor.nl_ja_3.4.1.r341_v20080827-1100.jar">
</File>
- <File Id="OpenrtpPlugins0074" Name="org.eclipse.ui.workbench.texteditor_3.4.1.r341_v20080827-1100.jar"
+ <File Id="OpenrtpPlugins0073" Name="org.eclipse.ui.workbench.texteditor_3.4.1.r341_v20080827-1100.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.workbench.texteditor_3.4.1.r341_v20080827-1100.jar">
</File>
- <File Id="OpenrtpPlugins0075" Name="org.eclipse.ui.workbench_3.4.2.M20090127-1700.jar"
+ <File Id="OpenrtpPlugins0074" Name="org.eclipse.ui.workbench_3.4.2.M20090127-1700.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui.workbench_3.4.2.M20090127-1700.jar">
</File>
- <File Id="OpenrtpPlugins0076" Name="org.eclipse.ui_3.4.2.M20090204-0800.jar"
+ <File Id="OpenrtpPlugins0075" Name="org.eclipse.ui_3.4.2.M20090204-0800.jar"
DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.ui_3.4.2.M20090204-0800.jar">
</File>
- </Component>
- <!-- org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610 -->
- <Directory Id="openrtp_plugins_org_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610" Name="org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610">
- <Component Id="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610" Guid="D04978E1-F86B-11E0-91E8-001BDC004C2E">
- <File Id="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v200806100000" Name="about.html"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\\about.html">
- </File>
- <File Id="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v200806100001" Name="fragment.properties"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\\fragment.properties">
- </File>
- <File Id="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v200806100002" Name="runtime_registry_compatibility.jar"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\\runtime_registry_compatibility.jar">
- </File>
- </Component>
- <!-- META_INF -->
- <Directory Id="_META_INF" Name="META_INF">
- <Component Id="Meta_inf" Guid="D04978E1-F86B-11E0-9624-001BDC004C2E">
- <File Id="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610Meta_inf0000" Name="eclipse.inf"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\\META-INF\\eclipse.inf">
- </File>
- <File Id="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610Meta_inf0001" Name="ECLIPSE.RSA"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\\META-INF\\ECLIPSE.RSA">
- </File>
- <File Id="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610Meta_inf0002" Name="ECLIPSE.SF"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\\META-INF\\ECLIPSE.SF">
- </File>
- <File Id="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610Meta_inf0003" Name="MANIFEST.MF"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\\META-INF\\MANIFEST.MF">
- </File>
- </Component>
+ </Component>
+ <Directory Id="org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610" Name="org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610">
+ <Component Id="org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610" DiskId="1" Guid="9B406546-ADAC-458F-8868-4D8E286A179F">
+ <File Id="about.html" Name="about.html" Source="C:\distribution\OpenRTP\RTSystemEditor\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\about.html" />
+ <File Id="fragment.properties" Name="fragment.properties" Source="C:\distribution\OpenRTP\RTSystemEditor\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\fragment.properties" />
+ <File Id="runtime_registry_compatibility.jar" Name="runtime_registry_compatibility.jar" Source="C:\distribution\OpenRTP\RTSystemEditor\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\runtime_registry_compatibility.jar" />
+ </Component>
+ <Directory Id="META_INF" Name="META-INF">
+ <Component Id="META_INF" DiskId="1" Guid="2FC7BBAC-7BE2-43A6-B281-45E5321BA6CD">
+ <File Id="eclipse.inf" Name="eclipse.inf" Source="C:\distribution\OpenRTP\RTSystemEditor\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\META-INF\eclipse.inf" />
+ <File Id="MANIFEST.MF" Name="MANIFEST.MF" Source="C:\distribution\OpenRTP\RTSystemEditor\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610\META-INF\MANIFEST.MF" />
+ </Component>
</Directory>
</Directory>
- <!-- org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731 -->
- <Directory Id="openrtp_plugins_org_eclipse_equinox_launcher_win32_win32_x86_1_0_101_R34x_v20080731" Name="org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731">
- <Component Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731" Guid="D04E33CF-F86B-11E0-8687-001BDC004C2E">
- <File Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v200807310000" Name="about.html"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\\about.html">
- </File>
- <File Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v200807310001" Name="eclipse_1115.dll"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\\eclipse_1115.dll">
- </File>
- <File Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v200807310002" Name="launcher.win32.win32.x86.properties"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\\launcher.win32.win32.x86.properties">
- </File>
- </Component>
- <!-- META_INF -->
- <Directory Id="openrtp_plugins_org_eclipse_equinox_launcher_win32_win32_x86_1_0_101_R34x_v20080731_META_INF" Name="META-INF">
- <Component Id="Meta_inf_2" Guid="D04E33CF-F86B-11E0-91DD-001BDC004C2E">
- <File Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731Meta_inf0000" Name="eclipse.inf"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\\META-INF\\eclipse.inf">
- </File>
- <File Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731Meta_inf0001" Name="ECLIPSE.RSA"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\\META-INF\\ECLIPSE.RSA">
- </File>
- <File Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731Meta_inf0002" Name="ECLIPSE.SF"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\\META-INF\\ECLIPSE.SF">
- </File>
- <File Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731Meta_inf0003" Name="MANIFEST.MF"
- DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\plugins\\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\\META-INF\\MANIFEST.MF">
- </File>
- </Component>
+ <Directory Id="org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731" Name="org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731">
+ <Component Id="org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731" DiskId="1" Guid="1F0FFE6B-831F-41a3-A32E-7756BA008366">
+ <File Id="about.html_1" Name="about.html" Source="C:\distribution\OpenRTP\RTSystemEditor\plugins\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\about.html" />
+ <File Id="launcher.win32.win32.x86.properties" Name="launcher.win32.win32.x86.properties" Source="C:\distribution\OpenRTP\RTSystemEditor\plugins\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\launcher.win32.win32.x86.properties" />
+ <File Id="eclipse_1115.dll" Name="eclipse_1115.dll" Source="C:\distribution\OpenRTP\RTSystemEditor\plugins\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\eclipse_1115.dll" />
+ </Component>
+ <Directory Id="META_INF_2" Name="META-INF_2">
+ <Component Id="META_INF_2" DiskId="1" Guid="FBF62DCE-8E21-49e6-944A-49C8503B1360">
+ <File Id="eclipse.inf_1" Name="eclipse.inf" Source="C:\distribution\OpenRTP\RTSystemEditor\plugins\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\META-INF_2\eclipse.inf" />
+ <File Id="MANIFEST.MF_1" Name="MANIFEST.MF" Source="C:\distribution\OpenRTP\RTSystemEditor\plugins\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\META-INF_2\MANIFEST.MF" />
+ </Component>
</Directory>
-
</Directory>
-
-
</Directory>
-
</Directory>
</Directory>
Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/OpenRTP_inc.wxs.in
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/OpenRTP_inc.wxs.in 2015-10-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/OpenRTP_inc.wxs.in 2015-10-28 02:50:04 UTC (rev 735)
@@ -38,52 +38,7 @@
</File>
{% endfor %}
</Component>
- <!-- org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610 -->
- <Directory Id="openrtp_plugins_org_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610" Name="org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610">
- <Component Id="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610" Guid="{% OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610.GUID %}">
- {% for file in OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
- <!-- META_INF -->
- <Directory Id="_META_INF" Name="META_INF">
- <Component Id="Meta_inf" Guid="{% OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610Meta_inf.GUID %}">
- {% for file in OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610Meta_inf.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
- </Directory>
- </Directory>
- <!-- org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731 -->
- <Directory Id="openrtp_plugins_org_eclipse_equinox_launcher_win32_win32_x86_1_0_101_R34x_v20080731" Name="org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731">
- <Component Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731" Guid="{% OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731.GUID %}">
- {% for file in OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
- <!-- META_INF -->
- <Directory Id="openrtp_plugins_org_eclipse_equinox_launcher_win32_win32_x86_1_0_101_R34x_v20080731_META_INF" Name="META-INF">
- <Component Id="Meta_inf_2" Guid="{% OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731Meta_inf.GUID %}">
- {% for file in OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731Meta_inf.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
- </Directory>
-
- </Directory>
-
-
-
</Directory>
-
</Directory>
</Directory>
Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/openrtpwxs.py
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/openrtpwxs.py 2015-10-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/openrtpwxs.py 2015-10-28 02:50:04 UTC (rev 735)
@@ -18,10 +18,10 @@
("", "*.jar *.exe .eclipseproduct"),
("configuration", "*.ini *.jar"),
("plugins", "*.jar"),
- ("plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610", "*.*"),
- ("plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF", "*.*"),
- ("plugins/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731", "*.*"),
- ("plugins/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF", "*.*"),
+# ("plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610", "*.*"),
+# ("plugins/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF", "*.*"),
+# ("plugins/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731", "*.*"),
+# ("plugins/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF", "*.*"),
]
import os
@@ -74,7 +74,7 @@
"-o", dir_name + ".yaml",
"-p", base_dir + path]
cmd += flist
-
+ #print cmd
makewxs.main(cmd)
@@ -82,5 +82,5 @@
"-o", "OpenRTP_inc.wxs",
"-i", "OpenRTP_inc.wxs.in"]
cmd += glob.glob("*.yaml")
-print "cmd:",cmd
+#print "cmd:",cmd
makewxs.main(cmd)
Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_hu-hu.wxl
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_hu-hu.wxl 2015-10-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_hu-hu.wxl 2015-10-28 02:50:04 UTC (rev 735)
@@ -10,7 +10,7 @@
You must not remove this notice, or any other, from this software.
-->
-<WixLocalization Culture="hu-hu" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+<WixLocalization Culture="hu-hu" Codepage="1250" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="WixUIBack" Overridable="yes">&Vissza</String>
<String Id="WixUINext" Overridable="yes">&Tov叩bb</String>
<String Id="WixUICancel" Overridable="yes">&M辿gse</String>
@@ -596,4 +596,4 @@
<String Id="UITextVolumeCostRequired" Overridable="yes">Sz端ks辿ges</String>
<String Id="UITextVolumeCostSize" Overridable="yes">Lemez m辿rete</String>
<String Id="UITextVolumeCostVolume" Overridable="yes">K旦tet</String>
-</WixLocalization>
\ No newline at end of file
+</WixLocalization>
Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_ja-jp.wxl
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_ja-jp.wxl 2015-10-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_ja-jp.wxl 2015-10-28 02:50:04 UTC (rev 735)
@@ -2,7 +2,7 @@
<!--
Copyright (c) Microsoft Corporation. All rights reserved.
-->
-<WixLocalization Culture="ja-jp" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+<WixLocalization Culture="ja-jp" Codepage="932" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="WixUIBack" Overridable="yes">戻る(&B)</String>
<String Id="WixUINext" Overridable="yes">次ã¸(&N)</String>
<String Id="WixUICancel" Overridable="yes">ã‚ャンセル</String>
Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_ko-kr.wxl
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_ko-kr.wxl 2015-10-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_ko-kr.wxl 2015-10-28 02:50:04 UTC (rev 735)
@@ -2,7 +2,7 @@
<!--
Copyright (c) Microsoft Corporation. All rights reserved.
-->
-<WixLocalization Culture="ko-kr" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+<WixLocalization Culture="ko-kr" Codepage="949" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="WixUIBack" Overridable="yes">뒤로(&B)</String>
<String Id="WixUINext" Overridable="yes">다ìŒ(&N)</String>
<String Id="WixUICancel" Overridable="yes">취소</String>
Modified: branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_zh-tw.wxl
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_zh-tw.wxl 2015-10-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_zh-tw.wxl 2015-10-28 02:50:04 UTC (rev 735)
@@ -10,7 +10,7 @@
You must not remove this notice, or any other, from this software.
-->
-<WixLocalization Culture="zh-tw" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+<WixLocalization Culture="zh-tw" Codepage="950" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="WixUIBack" Overridable="yes">上一æ¥(&B)</String>
<String Id="WixUINext" Overridable="yes">下一æ¥(&N)</String>
<String Id="WixUICancel" Overridable="yes">å–消</String>
@@ -565,4 +565,4 @@
<String Id="UITextVolumeCostRequired" Overridable="yes">所需</String>
<String Id="UITextVolumeCostSize" Overridable="yes">ç£ç¢Ÿç©ºé–“</String>
<String Id="UITextVolumeCostVolume" Overridable="yes">目錄</String>
-</WixLocalization>
\ No newline at end of file
+</WixLocalization>
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-28 02:38:33 UTC (rev 734)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/build.cmd 2015-10-28 02:50:04 UTC (rev 735)
@@ -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