[openrtm-commit:01513] r602 - trunk/OpenRTM-aist-Python/installer

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-01-16 17:10:06 +0900 (Fri, 16 Jan 2015)
New Revision: 602

Modified:
   trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
   trunk/OpenRTM-aist-Python/installer/build.cmd
Log:
[compat, installer] Product name, msi file name, start menu has been changed.

Modified: trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
===================================================================
--- trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2014-12-19 02:58:18 UTC (rev 601)
+++ trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2015-01-16 08:10:06 UTC (rev 602)
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   
-  <?if $(env.ARCH) = x86_64 ?>
-  <?define ProductName = "{% Product.Name %}-{% Product.Version %} for Python (64 bit)"?>
-  <?else?>
-  <?define ProductName = "{% Product.Name %}-{% Product.Version %} for Python"?>
-  <?endif ?>
-  <Product Name='$(var.ProductName)'
+  <Product Name='$(env.PRODUCT_NAME)'
            Id="{% Product.Id %}"
            Language='$(var.language)'
            Codepage='$(var.codepage)'
@@ -450,8 +445,8 @@
                       Name="{% file.Name %}" DiskId="1"
                       Source="{% file.Source %}">
                   {% if file.Name is rtm-naming.py %}
-                  <Shortcut Id="rtmnaming.py" Directory="ToolsMenuFolder"
-                            Name="Start Naming Service"
+                  <Shortcut Id="rtmnaming.py" Directory="CommonToolsMenuFolder"
+                            Name="Start Python Naming Service"
                             Show="normal" WorkingDirectory="bin"/>
                   {% endif %}
                 </File>
@@ -857,15 +852,17 @@
         <Directory Id="AppMenuFolder"
 				   Name="{% Product.Name %} {% Product.ShortVersion %}">
           <Directory Id="PythonMenuFolder" Name="Python">
-            <Directory Id="ToolsMenuFolder" Name="tools">
+            <Directory Id="ToolsMenuFolder" Name="Tools">
             </Directory>
-            <Directory Id="Components" Name="components">
-              <Directory Id="ExpMenuFolder" Name="examples">
+            <Directory Id="Components" Name="Components">
+              <Directory Id="ExpMenuFolder" Name="Examples">
               </Directory>
             </Directory>
-            <Directory Id="DocMenuFolder" Name="documents">
+            <Directory Id="DocMenuFolder" Name="Documents">
             </Directory>
           </Directory>
+          <Directory Id="CommonToolsMenuFolder" Name="Tools">
+          </Directory>
         </Directory>
       </Directory>
 

Modified: trunk/OpenRTM-aist-Python/installer/build.cmd
===================================================================
--- trunk/OpenRTM-aist-Python/installer/build.cmd	2014-12-19 02:58:18 UTC (rev 601)
+++ trunk/OpenRTM-aist-Python/installer/build.cmd	2015-01-16 08:10:06 UTC (rev 602)
@@ -12,11 +12,13 @@
 @set TARGET_WXS=%TARGET%.wxs
 @set TARGET_WIXOBJ=%TARGET%.wixobj
 echo off
+ at set TARGET_FULL=%TARGET%_%VERSION%-RELEASE_%ARCH%
 if "x%ARCH%" == "xx86_64" (
-   @set TARGET_FULL=%TARGET%-%VERSION%-RELEASE_64
+   @set OS_ARCH=64-bit OS
 ) else (
-   @set TARGET_FULL=%TARGET%-%VERSION%-RELEASE
+   @set OS_ARCH=32-bit OS
 )
+ at set PRODUCT_NAME=OpenRTM-aist-%VERSION%-RELEASE (%OS_ARCH%) for Python
 
 @rem ------------------------------------------------------------
 @rem WixUI Customization Settings