[openrtm-commit:01418] r600 - trunk/OpenRTM-aist-Python/installer

[openrtm ＠ openrtm.org]

Author: ga
Date: 2014-03-29 23:13:18 +0900 (Sat, 29 Mar 2014)
New Revision: 600

Modified:
   trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
   trunk/OpenRTM-aist-Python/installer/build.cmd
   trunk/OpenRTM-aist-Python/installer/omniORBpy26wxs.py
   trunk/OpenRTM-aist-Python/installer/omniORBpy27wxs.py
Log:
Supported 64-bit.

Modified: trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
===================================================================
--- trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2014-03-20 17:10:48 UTC (rev 599)
+++ trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2014-03-29 14:13:18 UTC (rev 600)
@@ -1,7 +1,11 @@
 <?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"?>
-  <Product Name="{% Product.Name %}-{% Product.Version %} for Python" 
+  <?endif ?>
+  <Product Name='$(var.ProductName)'
            Id="{% Product.Id %}"
            Language='$(var.language)'
            Codepage='$(var.codepage)'
@@ -30,10 +34,12 @@
       </DirectorySearch>
     </Property>
 
+    <?if $(env.ARCH) = x86_64 ?>
     <Property Id="PYTHON26">
       <RegistrySearch Id="Python26"
                       Root="HKLM"
                       Key="SOFTWARE\Python\PythonCore\2.6\InstallPath"
+					  Win64="yes"
                       Type="raw" />
     </Property>
 
@@ -41,9 +47,25 @@
       <RegistrySearch Id="Python27"
                       Root="HKLM"
                       Key="SOFTWARE\Python\PythonCore\2.7\InstallPath"
+					  Win64="yes"
                       Type="raw" />
     </Property>
+	<?else?>
+    <Property Id="PYTHON26">
+      <RegistrySearch Id="Python26"
+                      Root="HKLM"
+                      Key="SOFTWARE\Python\PythonCore\2.6\InstallPath"
+                      Type="raw" />
+    </Property>
 
+    <Property Id="PYTHON27">
+      <RegistrySearch Id="Python27"
+                      Root="HKLM"
+                      Key="SOFTWARE\Python\PythonCore\2.7\InstallPath"
+                      Type="raw" />
+    </Property>
+	<?endif ?>
+
     <SetProperty Id="PYTHON26DIR" After="AppSearch" Value="[PYTHON26]">
     </SetProperty>
 

Modified: trunk/OpenRTM-aist-Python/installer/build.cmd
===================================================================
--- trunk/OpenRTM-aist-Python/installer/build.cmd	2014-03-20 17:10:48 UTC (rev 599)
+++ trunk/OpenRTM-aist-Python/installer/build.cmd	2014-03-29 14:13:18 UTC (rev 600)
@@ -8,7 +8,12 @@
 @set TARGET=OpenRTM-aist-Python
 @set TARGET_WXS=%TARGET%.wxs
 @set TARGET_WIXOBJ=%TARGET%.wixobj
- at set TARGET_FULL=%TARGET%-%VERSION%
+echo off
+if "x%ARCH%" == "xx86_64" (
+   @set TARGET_FULL=%TARGET%-%VERSION%-RELEASE_64
+) else (
+   @set TARGET_FULL=%TARGET%-%VERSION%-RELEASE
+)
 
 @rem ------------------------------------------------------------
 @rem WixUI Customization Settings
@@ -23,8 +28,14 @@
 @rem ------------------------------------------------------------
 @set DISTRIBUTION=C:\distribution
 @set OPENRTM_PY=%DISTRIBUTION%\OpenRTM-aist-Python-1.1.0
- at set OMNIORB_PY26=%DISTRIBUTION%\omniORBpy-3.5-Python2.6
- at set OMNIORB_PY27=%DISTRIBUTION%\omniORBpy-3.7-Python2.7
+if "x%ARCH%" == "xx86_64" (
+   @set OMNIORB_PY26=%DISTRIBUTION%\omniORBpy-3.5-win64-python26
+   @set OMNIORB_PY27=%DISTRIBUTION%\omniORBpy-3.7-win64-python27
+) else (
+   @set OMNIORB_PY26=%DISTRIBUTION%\omniORBpy-3.5-Python2.6
+   @set OMNIORB_PY27=%DISTRIBUTION%\omniORBpy-3.7-Python2.7
+)
+
 @set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
 
 @rem ------------------------------------------------------------

Modified: trunk/OpenRTM-aist-Python/installer/omniORBpy26wxs.py
===================================================================
--- trunk/OpenRTM-aist-Python/installer/omniORBpy26wxs.py	2014-03-20 17:10:48 UTC (rev 599)
+++ trunk/OpenRTM-aist-Python/installer/omniORBpy26wxs.py	2014-03-29 14:13:18 UTC (rev 600)
@@ -123,8 +123,13 @@
 ## Resource path
 ##
 base_dir = os.getenv("OMNIORB_PY26")
+arch = os.getenv("ARCH")
 if base_dir == None:
+  if arch == "x86_64":
+    base_dir = "C:\\distribution\\omniORBpy-3.5-win64-Python2.6\\"
+  else:
     base_dir = "C:\\distribution\\omniORBpy-3.5-Python2.6\\"
+
 else:
     base_dir = base_dir.replace("\"", "")
     base_dir += "\\"

Modified: trunk/OpenRTM-aist-Python/installer/omniORBpy27wxs.py
===================================================================
--- trunk/OpenRTM-aist-Python/installer/omniORBpy27wxs.py	2014-03-20 17:10:48 UTC (rev 599)
+++ trunk/OpenRTM-aist-Python/installer/omniORBpy27wxs.py	2014-03-29 14:13:18 UTC (rev 600)
@@ -123,7 +123,11 @@
 ## Resource path
 ##
 base_dir = os.getenv("OMNIORB_PY27")
+arch = os.getenv("ARCH")
 if base_dir == None:
+  if arch == "x86_64":
+    base_dir = "C:\\distribution\\omniORBpy-3.7-win64-Python2.7\\"
+  else:
     base_dir = "C:\\distribution\\omniORBpy-3.7-Python2.7\\"
 else:
     base_dir = base_dir.replace("\"", "")