[openrtm-commit:01617] r621 - in branches/RELENG_1_1/OpenRTM-aist-Python: . installer

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-10-27 16:16:19 +0900 (Tue, 27 Oct 2015)
New Revision: 621

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/
   branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
Log:
[compat,merge] r620 merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568,570-586,591-605,607-610,614,617
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568,570-586,591-605,607-610,614,617,620

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2015-10-27 07:10:56 UTC (rev 620)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2015-10-27 07:16:19 UTC (rev 621)
@@ -453,6 +453,11 @@
 				   Name="{% Product.Name %}">
 		  <Directory Id="Version"
 					 Name="{% Product.ShortVersion %}">
+            <Component Id="ENV_ROOT" Guid="61F1F7A1-7945-11E5-A548-D670D757CAAC">
+              <CreateFolder />
+              <Environment Id='RTM_ROOT' Name='RTM_ROOT' Action='create'
+                  System='yes' Value='[Version]' />
+            </Component>
 
             <!-- JRE -->
             <?if $(env.INCLUDE_JRE) = YES ?>
@@ -1145,6 +1150,7 @@
 
       <!-- runtime -->
       <Feature Id="Rtm_Runtime" Level="1" Title="Utility">
+        <ComponentRef Id="ENV_ROOT"/>
         <ComponentRef Id="Rtm_Bin"/>
         <ComponentRef Id="Rtm_Bin2"/>
       </Feature>