[openrtm-commit:00193] r2186 - in trunk/OpenRTM-aist/win32/OpenRTM-aist/installer: . OpenCV2.1 OpenRTP omniORB

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-06-17 21:32:56 +0900 (Fri, 17 Jun 2011)
New Revision: 2186

Modified:
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/omniORB/omniORB_inc.wxs.in
Log:
In order to coexist older versions, 
- Environment variable setting has been changed not to use %RTM_ROOT%
  and so on.
- Now start menu folder has version number with product name.


Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in	2011-06-17 12:27:23 UTC (rev 2185)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in	2011-06-17 12:32:56 UTC (rev 2186)
@@ -17,7 +17,7 @@
       <Component Id="OpenCVBin" Guid="{% OpenCVBin.GUID %}">
 	    <Environment Id="OpenCVUpdatePath" Name="PATH" Action="set"
 			         System="yes" Part="last"
-			         Value="%OPENCV_ROOT%\bin" />
+			         Value="[OpenCV_bin]" />
 	      {% for file in OpenCVBin.Files %}
 	        <File Id="{% file.Id %}" Name="{% file.Name %}"
 		          DiskId="1" Source="{% file.Source %}">

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in	2011-06-17 12:27:23 UTC (rev 2185)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in	2011-06-17 12:32:56 UTC (rev 2186)
@@ -54,7 +54,7 @@
 			     System='yes' Part='all' Value='[Version]' />
 		<Environment Id='UpdatePath' Name='PATH' Action='set'
 			     System='yes' Part='last'
-			     Value='%RTM_ROOT%\bin' />
+			     Value='[bin]' />
 		{% for file in Bin.Files %}
 		<File Id="{% file.Id %}"
 		      Name="{% file.Name %}" DiskId="1"
@@ -322,7 +322,7 @@
       <!-- プログラムフォルダ -->
       <Directory Id="ProgramMenuFolder">
 	<Directory Id="AppMenuFolder"
-		   Name="{% Product.Name %}">
+		   Name="{% Product.Name %} {% Product.ShortVersion %}">
 	  <Directory Id="CxxMenuFolder" Name="C++">
 	    <Directory Id="ToolsMenuFolder" Name="tools">
 	    </Directory>
@@ -341,7 +341,8 @@
 
 
     <!-- OpenRTM-aist -->
-    <Feature Id="OpenRTM" Level="1" Title="OpenRTM-aist (C++)">
+    <Feature Id="OpenRTM" Level="1" Title="OpenRTM-aist (C++)"
+	     ConfigurableDirectory="INSTALLLOCATION">
       <!-- runtime -->
       <Feature Id="Runtime" Level="1" Title="Runtime Environment">
 	<ComponentRef Id="Bin"/>

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs	2011-06-17 12:27:23 UTC (rev 2185)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTP/OpenRTP_inc.wxs	2011-06-17 12:32:56 UTC (rev 2186)
@@ -10,7 +10,8 @@
 	      DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\RTSystemEditorRCP.exe">
 	  	  <Shortcut Id="Openrtp0000" Directory="ToolsMenuFolder"
 		    Name="RTSystemEditor"
-		    Show="normal" WorkingDirectory="tools"/>
+		    Arguments="-data "%USERPROFILE%\workspace""
+		    Show="normal" WorkingDirectory="OpenRTPVersion"/>
 	  	</File>
 		<File Id="Openrtp0001" Name=".eclipseproduct"
 	      DiskId="1" Source="C:\\distribution\\OpenRTP\\RTSystemEditor\\.eclipseproduct">

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/omniORB/omniORB_inc.wxs.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/omniORB/omniORB_inc.wxs.in	2011-06-17 12:27:23 UTC (rev 2185)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/omniORB/omniORB_inc.wxs.in	2011-06-17 12:32:56 UTC (rev 2186)
@@ -19,7 +19,7 @@
           <Component Id="OmniBinScripts" Guid="{% OmniBinScripts.GUID %}">
 	    <Environment Id="OmniUpdatePath" Name="PATH" Action="set"
 			 System="yes" Part="last"
-			 Value="%OMNI_ROOT%\bin\x86_win32" />
+			 Value="[omni_bin]x86_win32" />
 	    {% for file in OmniBinScripts.Files %}
 	    <File Id="{% file.Id %}" Name="{% file.Name %}"
 		  DiskId="1" Source="{% file.Source %}">