[openrtm-commit:01652] r752 - in trunk/jp.go.aist.rtm.RTC: Source/examples Source/examples/RTMExamples bin/RTMExamples installer/win32

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-11-09 18:41:51 +0900 (Mon, 09 Nov 2015)
New Revision: 752

Removed:
   trunk/jp.go.aist.rtm.RTC/Source/examples/RTMExamples/SinCosOut/
   trunk/jp.go.aist.rtm.RTC/Source/examples/SinCosOut.bat
   trunk/jp.go.aist.rtm.RTC/bin/RTMExamples/SinCosOut/
Modified:
   trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in
   trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py
Log:
[compat,installer,->RELENG_1_1] SinCosOut sample has been removed from installer of Windows.

Deleted: trunk/jp.go.aist.rtm.RTC/Source/examples/SinCosOut.bat
===================================================================
--- trunk/jp.go.aist.rtm.RTC/Source/examples/SinCosOut.bat	2015-11-05 09:34:55 UTC (rev 751)
+++ trunk/jp.go.aist.rtm.RTC/Source/examples/SinCosOut.bat	2015-11-09 09:41:51 UTC (rev 752)
@@ -1,3 +0,0 @@
- at call set_classpath.bat
-java RTMExamples.SinCosOut.SinCosOutComp -f RTMExamples/SinCosOut/rtc.conf
-pause;

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	2015-11-05 09:34:55 UTC (rev 751)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in	2015-11-09 09:41:51 UTC (rev 752)
@@ -1231,20 +1231,6 @@
                     </Component>
                   </Directory>
 
-                  <!-- SinCosOut -->
-                  <Directory Id="SinCosOut" Name="SinCosOut">
-                    <Component Id="RtmSourceExamplesRtmexamplesSincosout" 
-                               Guid="{% RtmSourceExamplesRtmexamplesSincosout.GUID %}">
-                      <RemoveFolder Id='RtmSourceExamplesRtmexamplesSincosout_f' On='uninstall' />
-                      {% for file in RtmSourceExamplesRtmexamplesSincosout.Files %}
-                      <File Id="{% file.Id %}"
-                            Name="{% file.Name %}" DiskId="1"
-                            Source="{% file.Source %}">
-                      </File>
-                      {% endfor %}
-                    </Component>
-                  </Directory>
-
                 <!-- end of RTMExamples -->
                 </Directory>
 
@@ -1390,7 +1376,6 @@
         <ComponentRef Id="RtmSourceExamplesRtmexamplesSeqioView"/>
         <ComponentRef Id="RtmSourceExamplesRtmexamplesSimpleio"/>
         <ComponentRef Id="RtmSourceExamplesRtmexamplesSimpleservice"/>
-        <ComponentRef Id="RtmSourceExamplesRtmexamplesSincosout"/>
       </Feature>
     
     </Feature>

Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py	2015-11-05 09:34:55 UTC (rev 751)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTMjavawxs.py	2015-11-09 09:41:51 UTC (rev 752)
@@ -35,7 +35,6 @@
     ("Source/examples/RTMExamples/SeqIO/view",                          "*.class *.java"),
     ("Source/examples/RTMExamples/SimpleIO",                            "*.class *.java *.conf"),
     ("Source/examples/RTMExamples/SimpleService",                       "*.class *.java *.conf *.idl"),
-    ("Source/examples/RTMExamples/SinCosOut",                           "*.class *.java *.conf"),
     ("Source/JavaDoc",                                                  "*.html *.css package-list"),
     ("Source/JavaDoc/_SDOPackage",                                      "*.html"),
     ("Source/JavaDoc/_SDOPackage/class-use",                            "*.html"),
@@ -113,9 +112,7 @@
     ("Source/JavaDocEn/RTMExamples/SimpleIO",                           "*.html"),
     ("Source/JavaDocEn/RTMExamples/SimpleIO/class-use",                 "*.html"),
     ("Source/JavaDocEn/RTMExamples/SimpleService",                      "*.html"),
-    ("Source/JavaDocEn/RTMExamples/SimpleService/class-use",            "*.html"),
-    ("Source/JavaDocEn/RTMExamples/SinCosOut",                          "*.html"),
-    ("Source/JavaDocEn/RTMExamples/SinCosOut/class-use",                "*.html")
+    ("Source/JavaDocEn/RTMExamples/SimpleService/class-use",            "*.html")
 ]
 
 ## Resource path
@@ -155,7 +152,7 @@
 bat_dir = base_dir + "Source\\examples\\"
 bat_list = ["Composite.bat", "ConfigSample.bat", "ConsoleIn.bat", "ConsoleOut.bat", 
             "GUIIn.bat", "MyServiceConsumer.bat", "MyServiceProvider.bat", 
-            "SeqIn.bat", "SeqOut.bat", "SinCosOut.bat", "set_classpath.bat"]
+            "SeqIn.bat", "SeqOut.bat", "set_classpath.bat"]
 bin_cnt = len(bat_list)
 bin_list = []
 for i in range(bin_cnt):