[openrtm-commit:01353] r596 - trunk/OpenRTM-aist-Python/installer

[openrtm ＠ openrtm.org]

Author: ga
Date: 2014-03-15 01:33:31 +0900 (Sat, 15 Mar 2014)
New Revision: 596

Modified:
   trunk/OpenRTM-aist-Python/installer/build.cmd
   trunk/OpenRTM-aist-Python/installer/omniORBpy26_inc.wxs.in
   trunk/OpenRTM-aist-Python/installer/omniORBpy26wxs.py
Log:
the version of omniORBpy for Python2.6 has been changed to 3.5 from 3.4.

Modified: trunk/OpenRTM-aist-Python/installer/build.cmd
===================================================================
--- trunk/OpenRTM-aist-Python/installer/build.cmd	2014-02-27 15:57:24 UTC (rev 595)
+++ trunk/OpenRTM-aist-Python/installer/build.cmd	2014-03-14 16:33:31 UTC (rev 596)
@@ -23,7 +23,7 @@
 @rem ------------------------------------------------------------
 @set DISTRIBUTION=C:\distribution
 @set OPENRTM_PY=%DISTRIBUTION%\OpenRTM-aist-Python-1.1.0
- at set OMNIORB_PY26=%DISTRIBUTION%\omniORBpy-3.4-Python2.6
+ at 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
 

Modified: trunk/OpenRTM-aist-Python/installer/omniORBpy26_inc.wxs.in
===================================================================
--- trunk/OpenRTM-aist-Python/installer/omniORBpy26_inc.wxs.in	2014-02-27 15:57:24 UTC (rev 595)
+++ trunk/OpenRTM-aist-Python/installer/omniORBpy26_inc.wxs.in	2014-03-14 16:33:31 UTC (rev 596)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <!-- omniORBpy3.4 supports -->
+  <!-- omniORBpy3.5 supports -->
   <!-- Python26 directory -->
       <Component Id="Py26BinX86_win32" Guid="{% Py26BinX86_win32.GUID %}">
         {% for file in Py26BinX86_win32.Files %}

Modified: trunk/OpenRTM-aist-Python/installer/omniORBpy26wxs.py
===================================================================
--- trunk/OpenRTM-aist-Python/installer/omniORBpy26wxs.py	2014-02-27 15:57:24 UTC (rev 595)
+++ trunk/OpenRTM-aist-Python/installer/omniORBpy26wxs.py	2014-03-14 16:33:31 UTC (rev 596)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# @brief WiX wxs file generator for omniORBpy3.4-Python2.6
+# @brief WiX wxs file generator for omniORBpy3.5-Python2.6
 # @date $Date$
 # @author Norkai Ando <n-ando at aist.go.jp>
 #
@@ -20,7 +20,7 @@
 import makewxs
 
 data = [
-    ("",                                             "THIS_IS_OMNIORBPY_3_4"),
+    ("",                                             "THIS_IS_OMNIORBPY_3_5"),
     ("bin/x86_win32",                                             "*.dll *.exe"),
     ("bin/dll",                                                   "*.dll"),
     ("lib/x86_win32",                                             "*.pyd"),
@@ -124,7 +124,7 @@
 ##
 base_dir = os.getenv("OMNIORB_PY26")
 if base_dir == None:
-    base_dir = "C:\\distribution\\omniORBpy-3.4-Python2.6\\"
+    base_dir = "C:\\distribution\\omniORBpy-3.5-Python2.6\\"
 else:
     base_dir = base_dir.replace("\"", "")
     base_dir += "\\"