[openrtm-commit:01649] r750 - trunk/jp.go.aist.rtm.RTC/installer/win32

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-11-05 13:21:24 +0900 (Thu, 05 Nov 2015)
New Revision: 750

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.yaml.in
Log:
[compat,installer,->RELENG_1_1] UpgradeCode has been corrected that were same in msi of 32bit / 64bit.

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-04 07:29:49 UTC (rev 749)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in	2015-11-05 04:21:24 UTC (rev 750)
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   
+  <?if $(env.ARCH) = x86 ?>
   <Product Name='$(env.PRODUCT_NAME)'
            Id="{% Product.Id %}"
            Language='$(var.language)'
            Codepage='$(var.codepage)'
            Version="{% Product.Version %}"
            Manufacturer="{% Product.Manufacturer %}"
-	   UpgradeCode="{% Product.UpgradeCode %}">
+           UpgradeCode="{% Product.UpgradeCode_x86 %}">
+  <?else?>
+  <Product Name='$(env.PRODUCT_NAME)'
+           Id="{% Product.Id %}"
+           Language='$(var.language)'
+           Codepage='$(var.codepage)'
+           Version="{% Product.Version %}"
+           Manufacturer="{% Product.Manufacturer %}"
+           UpgradeCode="{% Product.UpgradeCode_x86_64 %}">
+  <?endif ?>
+
     <Package Id="*" 
              Keywords="Installer"
              Description="{% Package.Description %}"
@@ -39,7 +50,11 @@
     </SetProperty>-->
 
     <!-- Upgrade -->
-    <Upgrade Id="{% Product.UpgradeCode %}">
+    <?if $(env.ARCH) = x86 ?>
+    <Upgrade Id="{% Product.UpgradeCode_x86 %}">
+    <?else?>
+    <Upgrade Id="{% Product.UpgradeCode_x86_64 %}">
+    <?endif ?>
       <UpgradeVersion OnlyDetect="yes"
                       Minimum="1.1.0.1"
                       Maximum="1.2.0"
@@ -53,7 +68,12 @@
       <UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND'
                       Minimum='1.1.0' IncludeMinimum='yes'
                       Maximum='1.2.0' IncludeMaximum='no' />
+    <?if $(env.ARCH) = x86 ?>
     </Upgrade>
+    <?else?>
+    </Upgrade>
+    <?endif ?>
+
     <InstallExecuteSequence>
       <RemoveExistingProducts Before="InstallInitialize"/>
     </InstallExecuteSequence>
@@ -1383,5 +1403,9 @@
     <!-- WixUI_Mondo -->
     <UIRef Id="WixUI_Mondo_RTM" />
 
+  <?if $(env.ARCH) = x86 ?>
   </Product>
+  <?else?>
+  </Product>
+  <?endif ?>
 </Wix>

Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.yaml.in
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.yaml.in	2015-11-04 07:29:49 UTC (rev 749)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.yaml.in	2015-11-05 04:21:24 UTC (rev 750)
@@ -7,7 +7,8 @@
   Version: 1.1.1
   ShortVersion: 1.1
   Manufacturer: AIST
-  UpgradeCode: A8C8006F-E9D8-4528-AF4F-B8AE2D25AB47
+  UpgradeCode_x86: A8C8006F-E9D8-4528-AF4F-B8AE2D25AB47
+  UpgradeCode_x86_64: FFA49C40-82CE-11E5-93B2-005056C00008
 Package:
   Description: OpenRTM-aist-Java Installer
   InstallerVersion: "300"