[openrtm-commit:00732] r519 - in branches/RELENG_1_0/OpenRTM-aist-Python: . OpenRTM_aist installer

openrtm ＠ openrtm.org openrtm ＠ openrtm.org
2012年 2月 20日 (月) 15:28:43 JST 

Author: kurihara
Date: 2012-02-20 15:28:43 +0900 (Mon, 20 Feb 2012)
New Revision: 519

Modified:
   branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/version.py
   branches/RELENG_1_0/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
   branches/RELENG_1_0/OpenRTM-aist-Python/installer/OpenRTMpywxs.py
   branches/RELENG_1_0/OpenRTM-aist-Python/installer/Readme.txt
   branches/RELENG_1_0/OpenRTM-aist-Python/installer/build.cmd
   branches/RELENG_1_0/OpenRTM-aist-Python/setup.py
Log:
Update for 1.0.2.

Modified: branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/version.py
===================================================================
--- branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/version.py	2012-02-20 06:22:00 UTC (rev 518)
+++ branches/RELENG_1_0/OpenRTM-aist-Python/OpenRTM_aist/version.py	2012-02-20 06:28:43 UTC (rev 519)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: euc-jp -*-
 
-openrtm_name    = "OpenRTM-aist-1.0.0"
-openrtm_version = "1.0.0"
+openrtm_name    = "OpenRTM-aist-1.0.2"
+openrtm_version = "1.0.2"
 corba_name      = "omniORB"

Modified: branches/RELENG_1_0/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
===================================================================
--- branches/RELENG_1_0/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2012-02-20 06:22:00 UTC (rev 518)
+++ branches/RELENG_1_0/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2012-02-20 06:28:43 UTC (rev 519)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   
-  <?define ProductName = "OpenRTM-aist-1.0.1 for Python"?>
-  <Product Name="OpenRTM-aist-1.0.1 for Python" 
+  <?define ProductName = "OpenRTM-aist-1.0.2 for Python"?>
+  <Product Name="OpenRTM-aist-1.0.2 for Python" 
            Id="11043B94-16BA-11DF-97DA-001C23DA0BDA"
            Language='$(var.language)'
            Codepage='$(var.codepage)'
-           Version="1.0.0" 
+           Version="1.0.2" 
            Manufacturer="AIST"
            UpgradeCode="958ED570-5471-4E82-8378-01C6068F31C2">
     <Package Id="*" 
@@ -63,17 +63,17 @@
     <!-- アップグレード -->
     <Upgrade Id="958ED570-5471-4E82-8378-01C6068F31C2">
       <UpgradeVersion OnlyDetect="yes"
-                      Minimum="1.0.0"
+                      Minimum="1.0.2"
                       Maximum="1.1.0"
                       Property="NEWERVERSIONDETECTED"
                       IncludeMinimum="no" /> 
       <UpgradeVersion OnlyDetect="no"
-                      Minimum="1.0.0"
+                      Minimum="1.0.2"
                       Maximum="1.0.0.1"
                       Property="OLDERVERSIONBEINGUPGRADED"
                       IncludeMaximum="no" /> 
       <UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND'
-                      Minimum='1.0.0' IncludeMinimum='yes'
+                      Minimum='1.0.2' IncludeMinimum='yes'
                       Maximum='1.1.0' IncludeMaximum='no' />
     </Upgrade>
 

Modified: branches/RELENG_1_0/OpenRTM-aist-Python/installer/OpenRTMpywxs.py
===================================================================
--- branches/RELENG_1_0/OpenRTM-aist-Python/installer/OpenRTMpywxs.py	2012-02-20 06:22:00 UTC (rev 518)
+++ branches/RELENG_1_0/OpenRTM-aist-Python/installer/OpenRTMpywxs.py	2012-02-20 06:28:43 UTC (rev 519)
@@ -65,7 +65,7 @@
 ##
 base_dir = os.getenv("OPENRTM_PY")
 if base_dir == None:
-    base_dir = "C:\\distribution\\OpenRTM-aist-Python-1.0.0\\"
+    base_dir = "C:\\distribution\\OpenRTM-aist-Python-1.0.2\\"
 else:
     base_dir = base_dir.replace("\"", "")
     base_dir += "\\"

Modified: branches/RELENG_1_0/OpenRTM-aist-Python/installer/Readme.txt
===================================================================
--- branches/RELENG_1_0/OpenRTM-aist-Python/installer/Readme.txt	2012-02-20 06:22:00 UTC (rev 518)
+++ branches/RELENG_1_0/OpenRTM-aist-Python/installer/Readme.txt	2012-02-20 06:28:43 UTC (rev 519)
@@ -36,7 +36,7 @@
 
 @@C:\distribution
 @@@@„ 
-@@@@„¥„Ÿ OpenRTM-aist-Python-1.0.0
+@@@@„¥„Ÿ OpenRTM-aist-Python-1.0.2
 @@@@„ @@„¥„Ÿ doc@@¦doxygen
 @@@@„ @@„ @@„¥„Ÿ ClassReference-jp
 @@@@„ @@„ @@„¤„Ÿ ClassReference-en
@@ -80,7 +80,7 @@
 @@@@  @@@@@„¤„Ÿ x86_win32
 
 
-@@(1) OpenRTM-aist-Python-1.0.0 ‚́A
+@@(1) OpenRTM-aist-Python-1.0.2 ‚́A
 @@@@Python”ÅOpenRTM-aist‚̃Cƒ“ƒXƒg[ƒ‹‘Ώۃtƒ@ƒCƒ‹‚Å‚ ‚èA
 @@@@doxygen‚É‚æ‚èì¬‚³‚ꂽƒŠƒtƒ@ƒŒƒ“ƒXƒtƒ@ƒCƒ‹(¦doxygen)‚ƁA
         IDLƒRƒ“ƒpƒCƒ‹‚ðs‚¤‚½‚߂̃tƒ@ƒCƒ‹(¦idlcompiler)‚ƁA
@@ -144,9 +144,9 @@
 
 @@[ƒrƒ‹ƒhŒã‚ÉŽg—p‚·‚éƒtƒ@ƒCƒ‹]
 @@@@„ 
-@@@@„¥„Ÿ OpenRTM-aist-Python-1.0.0.msi@‰pŒê‚̃Cƒ“ƒXƒg[ƒ‰[
+@@@@„¥„Ÿ OpenRTM-aist-Python-1.0.2.msi@‰pŒê‚̃Cƒ“ƒXƒg[ƒ‰[
 @@@@„ 
-@@@@„¤„Ÿ OpenRTM-aist-Python-1.0.0_**-**.msi@Še‘Œê–ˆ‚̃Cƒ“ƒXƒg[ƒ‰[
+@@@@„¤„Ÿ OpenRTM-aist-Python-1.0.2_**-**.msi@Še‘Œê–ˆ‚̃Cƒ“ƒXƒg[ƒ‰[
 
 @@@¦build.cmd ‚ðŽÀs‚·‚é‚ƁA•¡”‚̃eƒ“ƒ|ƒ‰ƒŠƒtƒ@ƒCƒ‹‚Æmsiƒtƒ@ƒCƒ‹‚ª
 @@@@ì¬‚³‚ê‚Ü‚·B

Modified: branches/RELENG_1_0/OpenRTM-aist-Python/installer/build.cmd
===================================================================
--- branches/RELENG_1_0/OpenRTM-aist-Python/installer/build.cmd	2012-02-20 06:22:00 UTC (rev 518)
+++ branches/RELENG_1_0/OpenRTM-aist-Python/installer/build.cmd	2012-02-20 06:28:43 UTC (rev 519)
@@ -4,7 +4,7 @@
 @rem   usually only %TARGET% might be changed
 @rem ------------------------------------------------------------
 @set PATH=%WIX%\bin;%PATH%
- at set VERSION=1.0.1
+ at set VERSION=1.0.2
 @set TARGET=OpenRTM-aist-Python
 @set TARGET_WXS=%TARGET%.wxs
 @set TARGET_WIXOBJ=%TARGET%.wixobj
@@ -22,7 +22,7 @@
 @rem default distribution package folder
 @rem ------------------------------------------------------------
 @set DISTRIBUTION=C:\distribution
- at set OPENRTM_PY=%DISTRIBUTION%\OpenRTM-aist-Python-1.0.0
+ at set OPENRTM_PY=%DISTRIBUTION%\OpenRTM-aist-Python-1.0.2
 @set OMNIORB_PY24=%DISTRIBUTION%\omniORBpy-3.0-Python2.4
 @set OMNIORB_PY25=%DISTRIBUTION%\omniORBpy-3.4-Python2.5
 @set OMNIORB_PY26=%DISTRIBUTION%\omniORBpy-3.4-Python2.6

Modified: branches/RELENG_1_0/OpenRTM-aist-Python/setup.py
===================================================================
--- branches/RELENG_1_0/OpenRTM-aist-Python/setup.py	2012-02-20 06:22:00 UTC (rev 518)
+++ branches/RELENG_1_0/OpenRTM-aist-Python/setup.py	2012-02-20 06:28:43 UTC (rev 519)
@@ -484,7 +484,7 @@
 ##############################################################################################
 
 pkg_name      = "OpenRTM-aist-Python"
-pkg_version   = "1.0.0"
+pkg_version   = "1.0.2"
 pkg_desc      = "Python modules for OpenRTM-aist-1.0"
 pkg_author    = "Shinji Kurihara and Noriaki Ando"
 pkg_email     = "n-ando at aist.go.jp"
@@ -503,8 +503,8 @@
 
 cwd_ = os.getcwd()
 
-if cwd_.find("OpenRTM-aist-Python-example-1.0.0") != -1 or \
-      cwd_.find("openrtm-aist-python-example-1.0.0") != -1:
+if cwd_.find("OpenRTM-aist-Python-example-1.0.2") != -1 or \
+      cwd_.find("openrtm-aist-python-example-1.0.2") != -1:
 
   examples_install = True

openrtm-commit メーリングリストの案内