[openrtm-commit:01645] r746 - in branches/RELENG_1_1: . jp.go.aist.rtm.RTC jp.go.aist.rtm.RTC/installer/win32 jp.go.aist.rtm.RTC/installer/win32/OpenRTP jp.go.aist.rtm.RTC/src/Extension/EC/logical_time
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2015年 10月 29日 (木) 16:25:59 JST
Author: kawauchi
Date: 2015-10-29 16:25:59 +0900 (Thu, 29 Oct 2015)
New Revision: 746
Modified:
branches/RELENG_1_1/
branches/RELENG_1_1/buildInstaller.bat
branches/RELENG_1_1/buildTests.sh
branches/RELENG_1_1/jp.go.aist.rtm.RTC/
branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml
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/src/Extension/EC/logical_time/LogicalTimeTriggeredEC.java
Log:
[compat,merge] r702,703,706-716,721,722 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
+ /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
Modified: branches/RELENG_1_1/buildInstaller.bat
===================================================================
--- branches/RELENG_1_1/buildInstaller.bat 2015-10-29 07:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/buildInstaller.bat 2015-10-29 07:25:59 UTC (rev 746)
@@ -1,5 +1,5 @@
cd jp.go.aist.rtm.RTC
-call ant javaInstaller -lib %ANT_HOME%\lib\
+call ant buildInstaller -lib %ANT_HOME%\lib\
if ERRORLEVEL 1 goto error_end
cd ..
exit /b 0
Modified: branches/RELENG_1_1/buildTests.sh
===================================================================
--- branches/RELENG_1_1/buildTests.sh 2015-10-29 07:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/buildTests.sh 2015-10-29 07:25:59 UTC (rev 746)
@@ -41,7 +41,8 @@
#
#
cd jp.go.aist.rtm.RTC
-ant buildTests -lib $ANT_HOME/lib/
+ant compile_tests -lib $ANT_HOME/lib/
+ant junit -lib $ANT_HOME/lib/
if [ $? -ne 0 ];
then
exit 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/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
+ /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
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:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/build.xml 2015-10-29 07:25:59 UTC (rev 746)
@@ -163,6 +163,18 @@
</target>
+ <target name="buildInstaller">
+
+ <taskdef name="jsmoothgen"
+ classname="net.charabia.jsmoothgen.ant.JSmoothGen"
+ classpath="${dir.jsmooth}/lib/jsmoothgen-ant.jar"/>
+ <antcall target="createExe" />
+
+ <antcall target="javaInstaller" />
+
+ </target>
+
+
<target name="buildAllLinux">
<antcall target="idlCompile" />
@@ -811,7 +823,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"/>
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:15:20 UTC (rev 745)
+++ 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)
@@ -11,9 +11,9 @@
<Package Id="*"
Keywords="Installer"
Description="{% Package.Description %}"
- InstallerVersion="300"
+ InstallerVersion="{% Package.InstallerVersion %}"
Languages='$(var.language)'
- Compressed="yes"
+ Compressed="{% Package.Compressed %}"
SummaryCodepage='$(var.codepage)' />
<!-- Property -->
@@ -44,7 +44,7 @@
<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">
+ <DirectorySearch Id="CheckFileDir3" Path ="{% Product.ShortVersion %}">
<FileSearch Id="CheckFile" Name="RTSystemEditorRCP.exe" />
</DirectorySearch>
</DirectorySearch>
@@ -65,7 +65,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' />
@@ -112,6 +112,7 @@
<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"
@@ -191,6 +192,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 +1043,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"
@@ -1241,9 +1245,15 @@
<!-- 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">
+ <Component Id="JavaMenuFolder" Guid="4F6569FA-8492-441c-AF92-9E4B65C738EC">
+ <RemoveFolder Id='JavaMenuFolder' On='uninstall' />
+ </Component>
<Directory Id="ToolsMenuFolder" Name="tools">
- </Directory>
+ </Directory>
<Directory Id="Components" Name="components">
<Directory Id="ExpMenuFolder" Name="examples">
</Directory>
@@ -1366,10 +1376,16 @@
<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>
<?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-29 07:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/OpenRTP_inc.wxs 2015-10-29 07:25:59 UTC (rev 746)
@@ -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-29 07:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/OpenRTP_inc.wxs.in 2015-10-29 07:25:59 UTC (rev 746)
@@ -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-29 07:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/OpenRTP/openrtpwxs.py 2015-10-29 07:25:59 UTC (rev 746)
@@ -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-29 07:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_hu-hu.wxl 2015-10-29 07:25:59 UTC (rev 746)
@@ -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-29 07:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_ja-jp.wxl 2015-10-29 07:25:59 UTC (rev 746)
@@ -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-29 07:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_ko-kr.wxl 2015-10-29 07:25:59 UTC (rev 746)
@@ -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-29 07:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/installer/win32/WixUI_zh-tw.wxl 2015-10-29 07:25:59 UTC (rev 746)
@@ -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/src/Extension/EC/logical_time/LogicalTimeTriggeredEC.java
===================================================================
--- branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/Extension/EC/logical_time/LogicalTimeTriggeredEC.java 2015-10-29 07:15:20 UTC (rev 745)
+++ branches/RELENG_1_1/jp.go.aist.rtm.RTC/src/Extension/EC/logical_time/LogicalTimeTriggeredEC.java 2015-10-29 07:25:59 UTC (rev 746)
@@ -1641,7 +1641,7 @@
*
* @param manager Managerオブジェクト
*/
- public static void ExtTrigExecutionContextInit(Manager manager) {
+ public static void registerModule() {
ExecutionContextFactory<ExecutionContextBase,String> factory
= ExecutionContextFactory.instance();
factory.addFactory("Extension.EC.logical_time.LogicalTimeTriggeredEC",
More information about the openrtm-commit
mailing list