[openrtm-commit:01611] r615 - in branches/RELENG_1_1/OpenRTM-aist-Python: . installer packages/deb/debian packages/rpm

openrtm ＠ openrtm.org openrtm ＠ openrtm.org
2015年 10月 21日 (水) 18:45:17 JST 

Author: kawauchi
Date: 2015-10-21 18:45:17 +0900 (Wed, 21 Oct 2015)
New Revision: 615

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/
   branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
   branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.yaml.in
   branches/RELENG_1_1/OpenRTM-aist-Python/installer/build.cmd
   branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/changelog
   branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in
   branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
Log:
[compat,merge] r614 merged.


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568,570-586,591-605,607-610
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568,570-586,591-605,607-610,614

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2015-10-21 09:38:45 UTC (rev 614)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in	2015-10-21 09:45:17 UTC (rev 615)
@@ -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 %}"
@@ -56,7 +67,11 @@
     <SetProperty Id="PYTHON27DIR" After="AppSearch" Value="[PYTHON27]">
     </SetProperty>
 
-    <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.0.0"
                       Maximum="1.1.0"
@@ -70,7 +85,11 @@
       <UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND'
                       Minimum='1.0.0' IncludeMinimum='yes'
                       Maximum='1.1.0' IncludeMaximum='no' />
+    <?if $(env.ARCH) = x86 ?>
     </Upgrade>
+    <?else?>
+    </Upgrade>
+    <?endif ?>
 
     <InstallExecuteSequence>
       <RemoveExistingProducts Before="InstallInitialize"/>
@@ -1197,5 +1216,9 @@
     <CustomAction Id='REMOVEFOLDER_RTM' Directory="INSTALLLOCATION"
                   ExeCommand='cmd.exe /C RMDIR /Q /S {% Product.ShortVersion %}\\examples\\Python' Return='ignore' />
 
+  <?if $(env.ARCH) = x86 ?>
   </Product>
+  <?else?>
+  </Product>
+  <?endif ?>
 </Wix>

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.yaml.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.yaml.in	2015-10-21 09:38:45 UTC (rev 614)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.yaml.in	2015-10-21 09:45:17 UTC (rev 615)
@@ -4,10 +4,12 @@
   Id: __GUID__
   Language: "1041"
   Codepage: "932"
-  Version: 1.1.0
+  Version: 1.1.1
   ShortVersion: 1.1
   Manufacturer: AIST
-  UpgradeCode: 958ED570-5471-4E82-8378-01C6068F31C2
+  UpgradeCode_x86: 958ED570-5471-4E82-8378-01C6068F31C2
+  UpgradeCode_x86_64: F7D63C00-76EC-11E5-A8C6-005056C00008
+
 Package:
   Description: OpenRTM-aist-Python Installer
   InstallerVersion: "300"

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/build.cmd
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/build.cmd	2015-10-21 09:38:45 UTC (rev 614)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/build.cmd	2015-10-21 09:45:17 UTC (rev 615)
@@ -5,14 +5,15 @@
 @rem ------------------------------------------------------------
 if not DEFINED ARCH       set ARCH=x86_64
 if not DEFINED INCLUDE_JRE  set INCLUDE_JRE=YES
+if not DEFINED RTM_PY_VER  set RTM_PY_VER=1.1.1
+
 @set PATH_OLD=%PATH%
 @set INCLUDE_OPENRTP=YES
- at set VERSION=1.1.0
 @set TARGET=OpenRTM-aist-Python
 @set TARGET_WXS=%TARGET%.wxs
 @set TARGET_WIXOBJ=%TARGET%.wixobj
 echo off
- at set TARGET_FULL=%TARGET%_%VERSION%-RELEASE_%ARCH%
+ at set TARGET_FULL=%TARGET%_%RTM_PY_VER%-RELEASE_%ARCH%
 if "x%ARCH%" == "xx86_64" (
    @set PYTHON_DIR=C:\Python27_x64
    @set OS_ARCH=64-bit OS
@@ -21,7 +22,7 @@
    @set OS_ARCH=32-bit OS
 )
 @set PATH=%WIX%bin;%PYTHON_DIR%;%PATH%
- at set PRODUCT_NAME=OpenRTM-aist-%VERSION%-RELEASE (%OS_ARCH%) for Python
+ at set PRODUCT_NAME=OpenRTM-aist-%RTM_PY_VER%-RELEASE (%OS_ARCH%) for Python
 
 @rem ------------------------------------------------------------
 @rem WixUI Customization Settings
@@ -35,7 +36,7 @@
 @rem default distribution package folder
 @rem ------------------------------------------------------------
 @set DISTRIBUTION=C:\distribution
- at set OPENRTM_PY=%DISTRIBUTION%\OpenRTM-aist-Python-1.1.0
+ at set OPENRTM_PY=%DISTRIBUTION%\%TARGET%-%RTM_PY_VER%
 if "x%ARCH%" == "xx86_64" (
    @set OMNIORB_PY26=%DISTRIBUTION%\omniORBpy-3.5-win64-python26
    @set OMNIORB_PY27=%DISTRIBUTION%\omniORBpy-3.7-win64-python27
@@ -44,8 +45,6 @@
    @set OMNIORB_PY27=%DISTRIBUTION%\omniORBpy-3.7-Python2.7
 )
 
- at set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
-
 @rem ------------------------------------------------------------
 @rem Supported languages
 @rem   supported languages have to be specified
@@ -80,38 +79,6 @@
 python omniORBpy27wxs.py
 python OpenRTMpywxs.py
 
- at rem ------------------------------------------------------------
- at rem Generate RTSystemEditor wxs file
- at rem
- at rem RTSystemEditorRCP.exe should be under %RTSE_ROOT%
- at rem
- at rem ------------------------------------------------------------
- at rem *** RTSystemEditorRCP has been changed to use the merge module.
- at rem *** So this process has been deleted.
- at rem if "x%RTSE_ROOT%" == "x" (
- at rem    echo Envrionment variable "RTSE_ROOT" is not set. Abort.
- at rem    goto END
- at rem )
- at rem if not exist "%RTSE_ROOT%\RTSystemEditorRCP.exe" (
- at rem    echo RTSystemEditorRCP.exe does not found. Abort
- at rem    goto END
- at rem )
- at rem set INCLUDE_RTSE=YES
- at rem set INCLUDE_OPENRTP=YES
- at rem 
- at rem if not exist OpenRTP_inc.wxs (
- at rem    cd OpenRTP
- at rem    copy ..\makewxs.py .
- at rem    copy ..\yat.py .
- at rem    echo Generating OpenRTP_inc.wxs......
- at rem @rem   openrtpwxs.py
- at rem @rem   set PYTHONPATH=%TMP_PYTHONPATH%
- at rem    copy OpenRTP_inc.wxs ..
- at rem    del makewxs.py yat.py
- at rem    del *.yaml
- at rem    cd ..
- at rem )
-
 @rem ============================================================
 @rem compile wxs file and link msi
 @rem ============================================================

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/changelog
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/changelog	2015-10-21 09:38:45 UTC (rev 614)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/changelog	2015-10-21 09:45:17 UTC (rev 615)
@@ -1,3 +1,9 @@
+openrtm-aist-python (1.1.1-0) precise; urgency=low
+
+  * 1.1.1-0 (1.1.1-RELEASE). OpenRTM-aist-1.1.1-RELEASE
+
+ -- Noriaki Ando <n-ando at aist.go.jp>  Wed, 21 Oct 2015 15:40:25 +0900
+
 openrtm-aist-python (1.1.0-2) experimental; urgency=low
 
   * 1.1.0-2 (1.1.0-RELEASE). OpenRTM-aist-1.1.0-RELEASE

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in	2015-10-21 09:38:45 UTC (rev 614)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in	2015-10-21 09:45:17 UTC (rev 615)
@@ -19,7 +19,7 @@
 Name: OpenRTM-aist-Python
 Version: %{version}
 Release: %{pkgver}.%{distname}
-Summary: Python modules for OpenRTM-aist-1.1.0
+Summary: Python modules for OpenRTM-aist
 Group: Applications/System
 License: LGPL
 URL: http://openrtm.org
@@ -88,7 +88,7 @@
 %files
 %defattr(-,root,root)
 %{python_sitelib}/OpenRTM-aist.pth
-%{python_sitelib}/OpenRTM_aist_Python-1.1.0-py%{python_version}.egg-info
+%{python_sitelib}/OpenRTM_aist_Python-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/OpenRTM_aist
 %attr(755,root,root) %{_bindir}/*
 
@@ -109,6 +109,9 @@
 #------------------------------------------------------------
 # changelog section
 %changelog
+* Wed Oct 21 2015  <n-ando at aist.go.jp> 1.1.1
+- 1.1.1-RELEASE
+
 * Wed May 01 2013  <n-ando at aist.go.jp> 1.1.0
 - 1.1.0-RELEASE
 

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/setup.py	2015-10-21 09:38:45 UTC (rev 614)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/setup.py	2015-10-21 09:45:17 UTC (rev 615)
@@ -80,7 +80,7 @@
 #==============================
 pkg_major_version = "1"
 pkg_minor_version = "1"
-pkg_revision_num  = "0"
+pkg_revision_num  = "1"
 
 #============================================================
 # MODIFICATION IS ALLOWED IF IT IS NEED TO MODIFY.


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478
/trunk/OpenRTM-aist-Python/setup.py:559,565-568,570-586,591-605
   + /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478
/trunk/OpenRTM-aist-Python/setup.py:559,565-568,570-586,591-605,614

More information about the openrtm-commit mailing list