[openrtm-commit:00386] r551 - in trunk/jp.go.aist.rtm.RTC: . installer/win32

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-09-06 14:33:59 +0900 (Tue, 06 Sep 2011)
New Revision: 551

Modified:
   trunk/jp.go.aist.rtm.RTC/build.xml
   trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in
   trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py
   trunk/jp.go.aist.rtm.RTC/installer/win32/WixUI_ja-jp.wxl
Log:
Included idl files in msi package.  refs #2180

Modified: trunk/jp.go.aist.rtm.RTC/build.xml
===================================================================
--- trunk/jp.go.aist.rtm.RTC/build.xml	2011-08-24 08:39:37 UTC (rev 550)
+++ trunk/jp.go.aist.rtm.RTC/build.xml	2011-09-06 05:33:59 UTC (rev 551)
@@ -335,6 +335,21 @@
 
 	<target name="javaInstaller"  description="インストーラを作成します">
 
+		<!-- copy idl files -->
+		<mkdir dir="installer/resources/Source/rtm_java/idl" />
+
+		<mkdir dir="installer/resources/Source/rtm_java/idl/device_interfaces" />
+
+		<copy todir="installer/resources/Source/rtm_java/idl">
+
+			<fileset dir="idl" />
+		</copy>
+
+		<copy todir="installer/resources/Source/rtm_java/idl/device_interfaces">
+
+			<fileset dir="idl/device_interfaces" />
+		</copy>
+
 		<!-- コマンド実行 -->		
 		<exec dir="installer/win32" executable="cmd">
 

Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in	2011-08-24 08:39:37 UTC (rev 550)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in	2011-09-06 05:33:59 UTC (rev 551)
@@ -146,6 +146,32 @@
               </Component>
             </Directory>
 
+            <!-- idl -->
+            <Directory Id="RTM_JAVA" Name="rtm_java">
+              <Directory Id="RTMidl" Name="idl">
+                <Component Id="RtmSourceRtm_javaIdl" Guid="{% RtmSourceRtm_javaIdl.GUID %}">
+                  <RemoveFolder Id='RtmIdl_f' On='uninstall' />
+                  {% for file in RtmSourceRtm_javaIdl.Files %}
+                  <File Id="{% file.Id %}"
+                      Name="{% file.Name %}" DiskId="1"
+                      Source="{% file.Source %}">
+                  </File>
+                  {% endfor %}
+                </Component>
+                <Directory Id="RTMidl_device_interfaces" Name="device_interfaces">
+                  <Component Id="RtmSourceRtm_javaIdlDevice_interfaces" Guid="{% RtmSourceRtm_javaIdlDevice_interfaces.GUID %}">
+                    <RemoveFolder Id='RtmIdlDevice_interfaces_f' On='uninstall' />
+                    {% for file in RtmSourceRtm_javaIdlDevice_interfaces.Files %}
+                    <File Id="{% file.Id %}"
+                      Name="{% file.Name %}" DiskId="1"
+                      Source="{% file.Source %}">
+                    </File>
+                    {% endfor %}
+                  </Component>
+                </Directory>
+              </Directory>
+            </Directory>
+
             <!-- doc -->
             <Directory Id="docs" Name="doc">
 
@@ -1228,6 +1254,11 @@
         <ComponentRef Id="RtmSourceJar"/>
       </Feature>
 
+      <!-- idl -->
+      <Feature Id="Rtm_Idl" Level="1" Title="Idl">
+        <ComponentRef Id="RtmSourceRtm_javaIdl"/>
+        <ComponentRef Id="RtmSourceRtm_javaIdlDevice_interfaces"/>
+      </Feature>
       <!-- documents -->
       <Feature Id="Rtm_Docs" Level="1" Title="Documents">
         <ComponentRef Id="RtmSourceJavadoc"/>

Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py	2011-08-24 08:39:37 UTC (rev 550)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py	2011-09-06 05:33:59 UTC (rev 551)
@@ -20,6 +20,8 @@
 import makewxs
 
 data = [
+    ("Source/rtm_java/idl",                       "*.idl"),
+    ("Source/rtm_java/idl/device_interfaces",                       "*.idl"),
     ("Source/jar",                                                      "*.jar"),
     ("Source/examples/bat",                                             "*.bat"),
     ("Source/examples/bin",                                             "*.exe *.vbs *.bat *.conf"),

Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/WixUI_ja-jp.wxl
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/WixUI_ja-jp.wxl	2011-08-24 08:39:37 UTC (rev 550)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/WixUI_ja-jp.wxl	2011-09-06 05:33:59 UTC (rev 551)
@@ -202,7 +202,7 @@
     <String Id="SetupTypeDlgTypicalButtonTooltip" Overridable="yes">標準インストール</String>
     <String Id="SetupTypeDlgCustomButton" Overridable="yes">カスタム(&U)</String>
     <String Id="SetupTypeDlgCustomButtonTooltip" Overridable="yes">カスタム インストール</String>
-    <String Id="SetupTypeDlgCompleteButton" Overridable="yes">完了(&O)</String>
+    <String Id="SetupTypeDlgCompleteButton" Overridable="yes">完全(&O)</String>
     <String Id="SetupTypeDlgCompleteButtonTooltip" Overridable="yes">完全インストール</String>
     <String Id="SetupTypeDlgBannerBitmap" Overridable="yes">WixUI_Bmp_Banner</String>
     <String Id="SetupTypeDlgTitle" Overridable="yes">{\WixUI_Font_Title}セットアップの種類の選択</String>