[openrtm-commit:01607] r613 - in branches/RELENG_1_1/OpenRTM-aist-Python: . installer installer/install_scripts packages/deb/debian packages/rpm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2015年 10月 19日 (月) 13:48:18 JST
Author: kawauchi
Date: 2015-10-19 13:48:18 +0900 (Mon, 19 Oct 2015)
New Revision: 613
Added:
branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy27_inc.wxs.in
branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy27wxs.py
Modified:
branches/RELENG_1_1/OpenRTM-aist-Python/
branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in
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/OpenRTMpywxs.py
branches/RELENG_1_1/OpenRTM-aist-Python/installer/Readme.txt
branches/RELENG_1_1/OpenRTM-aist-Python/installer/build.cmd
branches/RELENG_1_1/OpenRTM-aist-Python/installer/idlcompile.py
branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh
branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh
branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh
branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy26_inc.wxs.in
branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy26wxs.py
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/changelog
branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/control
branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in
branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/rpm_build.sh
branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
Log:
[compat,merge] r591-605 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,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
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in 2015-10-19 04:48:18 UTC (rev 613)
@@ -2,10 +2,11 @@
include MANIFEST.in
include setup.py
include README
+include installer *
recursive-include packages Makefile
recursive-include packages/deb *.sh copyright changelog rules README* compat control control.* files
recursive-include packages/rpm *.sh openrtm-aist.spec.in openrtm-aist_fc19.spec.in
-recursive-include installer *.rtf *.in *.wxs *.vbs *.bmp *.txt *.sh *.wxl *.cmd *.py
+recursive-include installer *.rtf *.in *.wxs *.vbs *.bmp *.txt *.sh *.wxl *.cmd *.py *.bat
recursive-include OpenRTM_aist *.conf *.exe *.idl *.py *.pth *.sh
recursive-include OpenRTM_aist *.bat *.exe *.sample README
recursive-include OpenRTM_aist/docs *.css *.gif *.png *.html *.hhc *.hhk *.hhp
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-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in 2015-10-19 04:48:18 UTC (rev 613)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?define ProductName = "{% Product.Name %}-{% Product.Version %} for Python"?>
- <Product Name="{% Product.Name %}-{% Product.Version %} for Python"
+ <Product Name='$(env.PRODUCT_NAME)'
Id="{% Product.Id %}"
Language='$(var.language)'
Codepage='$(var.codepage)'
@@ -19,31 +18,23 @@
<!-- Property -->
<Property Id='USERPROFILEDIR' Value='%USERPROFILE%' />
- <!-- RTSE Property-->
- <Property Id="RTSE_FILEEXISTS">
- <DirectorySearch Id="CheckFileDir" Path="C:\Program Files\OpenRTM-aist\{% Product.ShortVersion %}">
- <DirectorySearch Id="CheckFileDir2" Path ="OpenRTP">
- <DirectorySearch Id="CheckFileDir3" Path ="{% Product.ShortVersion %}\RTSystemEditor">
- <FileSearch Id="CheckFile" Name="RTSystemEditorRCP.exe" />
- </DirectorySearch>
- </DirectorySearch>
- </DirectorySearch>
- </Property>
-
- <Property Id="PYTHON24">
- <RegistrySearch Id="Python24"
+ <?if $(env.ARCH) = x86_64 ?>
+ <Property Id="PYTHON26">
+ <RegistrySearch Id="Python26"
Root="HKLM"
- Key="SOFTWARE\Python\PythonCore\2.4\InstallPath"
+ Key="SOFTWARE\Python\PythonCore\2.6\InstallPath"
+ Win64="yes"
Type="raw" />
</Property>
- <Property Id="PYTHON25">
- <RegistrySearch Id="Python25"
+ <Property Id="PYTHON27">
+ <RegistrySearch Id="Python27"
Root="HKLM"
- Key="SOFTWARE\Python\PythonCore\2.5\InstallPath"
+ Key="SOFTWARE\Python\PythonCore\2.7\InstallPath"
+ Win64="yes"
Type="raw" />
</Property>
-
+ <?else?>
<Property Id="PYTHON26">
<RegistrySearch Id="Python26"
Root="HKLM"
@@ -51,13 +42,18 @@
Type="raw" />
</Property>
- <SetProperty Id="PYTHON24DIR" After="AppSearch" Value="[PYTHON24]">
- </SetProperty>
+ <Property Id="PYTHON27">
+ <RegistrySearch Id="Python27"
+ Root="HKLM"
+ Key="SOFTWARE\Python\PythonCore\2.7\InstallPath"
+ Type="raw" />
+ </Property>
+ <?endif ?>
- <SetProperty Id="PYTHON25DIR" After="AppSearch" Value="[PYTHON25]">
+ <SetProperty Id="PYTHON26DIR" After="AppSearch" Value="[PYTHON26]">
</SetProperty>
- <SetProperty Id="PYTHON26DIR" After="AppSearch" Value="[PYTHON26]">
+ <SetProperty Id="PYTHON27DIR" After="AppSearch" Value="[PYTHON27]">
</SetProperty>
<Upgrade Id="{% Product.UpgradeCode %}">
@@ -79,26 +75,22 @@
<InstallExecuteSequence>
<RemoveExistingProducts Before="InstallInitialize"/>
- <Custom Action="IDLCOMPILE_PY24" After='InstallFinalize'>
- NOT Installed AND PYTHON24
- </Custom>
- <Custom Action="IDLCOMPILE_PY25" After='InstallFinalize'>
- NOT Installed AND PYTHON25
- </Custom>
<Custom Action="IDLCOMPILE_PY26" After='InstallFinalize'>
NOT Installed AND PYTHON26
</Custom>
- <Custom Action="REMOVEFOLDER_PY24" Before='InstallInitialize'>
- Installed AND PYTHON24
+ <Custom Action="IDLCOMPILE_PY27" After='InstallFinalize'>
+ NOT Installed AND PYTHON27
</Custom>
- <Custom Action="REMOVEFOLDER_PY25" Before='InstallInitialize'>
- Installed AND PYTHON25
- </Custom>
+
<Custom Action="REMOVEFOLDER_PY26" Before='InstallInitialize'>
Installed AND PYTHON26
</Custom>
+ <Custom Action="REMOVEFOLDER_PY27" Before='InstallInitialize'>
+ Installed AND PYTHON27
+ </Custom>
+
<Custom Action="REMOVEFOLDER_RTM" Before='InstallInitialize'>Installed</Custom>
</InstallExecuteSequence>
@@ -108,25 +100,25 @@
<!-- enable this value when you want register to ALL User -->
<!-- <Property Id="ALLUSERS" Value="1" /> -->
- <Condition Message="[ProductName] requires python 2.4, 2.5 or 2.6">
- <![CDATA[Installed OR (PYTHON24 <> "" OR PYTHON25 <> "" OR PYTHON26 <> "")]]>
+ <Condition Message="[ProductName] requires python 2.6 or 2.7">
+ <![CDATA[Installed OR (PYTHON26 <> "" OR PYTHON27 <> "")]]>
</Condition>
<Directory Id="TARGETDIR" Name="SourceDir">
- <!-- for Python24 -->
- <Directory Id="PYTHON24DIR" Name="[[PYTHON24]]">
+ <!-- for Python26 -->
+ <Directory Id="PYTHON26DIR" Name="[[PYTHON26]]">
<!-- omniORBpy components -->
- <?include omniORBpy24_inc.wxs ?>
+ <?include omniORBpy26_inc.wxs ?>
<!-- end of omniORBpy -->
<!-- rtcprof -->
- <Component Id="Py24_RtmOpenrtm_aistUtilsRtcprof"
- Guid="{% RtmOpenrtm_aist24UtilsRtcprof.GUID %}">
- <RemoveFile Id='Py24_RtmOpenrtm_aistUtilsRtcprof' On='uninstall' Name='*.pyc' />
- <RemoveFile Id='Py24_RtmOpenrtm_aistUtilsRtcprof_2' On='uninstall' Name='rtc*.log' />
- {% for file in RtmOpenrtm_aist24UtilsRtcprof.Files %}
+ <Component Id="Py26_RtmOpenrtm_aistUtilsRtcprof"
+ Guid="{% RtmOpenrtm_aist26UtilsRtcprof.GUID %}">
+ <RemoveFile Id='Py26_RtmOpenrtm_aistUtilsRtcprof' On='uninstall' Name='*.pyc' />
+ <RemoveFile Id='Py26_RtmOpenrtm_aistUtilsRtcprof_2' On='uninstall' Name='rtc*.log' />
+ {% for file in RtmOpenrtm_aist26UtilsRtcprof.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -134,9 +126,9 @@
</Component>
<!-- rtcd -->
- <Component Id="Py24_RtmOpenrtm_aistUtilsRtcd"
- Guid="{% RtmOpenrtm_aist24UtilsRtcd.GUID %}">
- {% for file in RtmOpenrtm_aist24UtilsRtcd.Files %}
+ <Component Id="Py26_RtmOpenrtm_aistUtilsRtcd"
+ Guid="{% RtmOpenrtm_aist26UtilsRtcd.GUID %}">
+ {% for file in RtmOpenrtm_aist26UtilsRtcd.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
{% if file.Name is rtcd.py %}
@@ -144,25 +136,25 @@
Name="Start RTC daemon"
Arguments=' -d -f "[Version]examples\Python\rtcd.conf"'
Show="normal" WorkingDirectory="bin"/>
- {% endif %}
+ {% endif %}
{% if file.Name is rtcd.conf %}
<Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
Name="rtc.conf for RTC daemon"
Show="normal" WorkingDirectory="bin"/>
- {% endif %}
+ {% endif %}
</File>
{% endfor %}
</Component>
<!-- Lib -->
- <Directory Id="py24Lib" Name="Lib">
+ <Directory Id="py26Lib" Name="Lib">
<!-- site-packages -->
- <Directory Id="Py24_site_packages" Name="site-packages">
+ <Directory Id="Py26_site_packages" Name="site-packages">
- <Component Id="Py24_RtmOpenrtm_aistRoot"
- Guid="{% RtmOpenrtm_aist24Root.GUID %}">
- <RemoveFile Id='Py24_RtmOpenrtm_aistRoot' On='uninstall' Name='*.pyc' />
- {% for file in RtmOpenrtm_aist24Root.Files %}
+ <Component Id="Py26_RtmOpenrtm_aistRoot"
+ Guid="{% RtmOpenrtm_aist26Root.GUID %}">
+ <RemoveFile Id='Py26_RtmOpenrtm_aistRoot' On='uninstall' Name='*.pyc' />
+ {% for file in RtmOpenrtm_aist26Root.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -170,12 +162,12 @@
</Component>
<!-- OpenRTM_aist -->
- <Directory Id="Py24_OpenRTM_aist" Name="OpenRTM_aist">
- <Component Id="Py24_RtmOpenrtm_aist"
- Guid="{% RtmOpenrtm_aist24.GUID %}">
- <RemoveFile Id='Py24_RtmOpenrtm_aist' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py24_RtmOpenrtm_aist_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist24.Files %}
+ <Directory Id="Py26_OpenRTM_aist" Name="OpenRTM_aist">
+ <Component Id="Py26_RtmOpenrtm_aist"
+ Guid="{% RtmOpenrtm_aist26.GUID %}">
+ <RemoveFile Id='Py26_RtmOpenrtm_aist' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py26_RtmOpenrtm_aist_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist26.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -183,12 +175,12 @@
</Component>
<!-- rtc-template -->
- <Directory Id="Py24_rtc_template" Name="rtc-template">
- <Component Id="Py24_RtmOpenrtm_aistRtctemplate"
- Guid="{% RtmOpenrtm_aist24UtilsRtctemplate.GUID %}">
- <RemoveFile Id='Py24_RtmOpenrtm_aistRtctemplate' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py24_RtmOpenrtm_aistRtctemplate_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist24UtilsRtctemplate.Files %}
+ <Directory Id="Py26_rtc_template" Name="rtc-template">
+ <Component Id="Py26_RtmOpenrtm_aistRtctemplate"
+ Guid="{% RtmOpenrtm_aist26UtilsRtctemplate.GUID %}">
+ <RemoveFile Id='Py26_RtmOpenrtm_aistRtctemplate' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py26_RtmOpenrtm_aistRtctemplate_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist26UtilsRtctemplate.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -197,34 +189,34 @@
</Directory>
<!-- observer -->
- <Directory Id="Py24_ext" Name="ext">
- <Component Id="Py24_RtmOpenrtm_aistExt"
- Guid="{% RtmOpenrtm_aist24Ext.GUID %}">
- <RemoveFile Id='Py24_RtmOpenrtm_aistExt' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py24_RtmOpenrtm_aistExt_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist24Ext.Files %}
+ <Directory Id="Py26_ext" Name="ext">
+ <Component Id="Py26_RtmOpenrtm_aistExt"
+ Guid="{% RtmOpenrtm_aist26Ext.GUID %}">
+ <RemoveFile Id='Py26_RtmOpenrtm_aistExt' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py26_RtmOpenrtm_aistExt_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist26Ext.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
{% endfor %}
</Component>
- <Directory Id="Py24_sdo" Name="sdo">
- <Component Id="Py24_RtmOpenrtm_aistExtSdo"
- Guid="{% RtmOpenrtm_aist24ExtSdo.GUID %}">
- <RemoveFile Id='Py24_RtmOpenrtm_aistExtSdo' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py24_RtmOpenrtm_aistExtSdo_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist24ExtSdo.Files %}
+ <Directory Id="Py26_sdo" Name="sdo">
+ <Component Id="Py26_RtmOpenrtm_aistExtSdo"
+ Guid="{% RtmOpenrtm_aist26ExtSdo.GUID %}">
+ <RemoveFile Id='Py26_RtmOpenrtm_aistExtSdo' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py26_RtmOpenrtm_aistExtSdo_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist26ExtSdo.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
{% endfor %}
</Component>
- <Directory Id="Py24_observer" Name="observer">
- <Component Id="Py24_RtmOpenrtm_aistExtSdoObserver"
- Guid="{% RtmOpenrtm_aist24ExtSdoObserver.GUID %}">
- <RemoveFile Id='Py24_RtmOpenrtm_aistExtSdoObserver' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py24_RtmOpenrtm_aistExtSdoObserver_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist24ExtSdoObserver.Files %}
+ <Directory Id="Py26_observer" Name="observer">
+ <Component Id="Py26_RtmOpenrtm_aistExtSdoObserver"
+ Guid="{% RtmOpenrtm_aist26ExtSdoObserver.GUID %}">
+ <RemoveFile Id='Py26_RtmOpenrtm_aistExtSdoObserver' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py26_RtmOpenrtm_aistExtSdoObserver_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist26ExtSdoObserver.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -236,12 +228,12 @@
</Directory>
<!-- RTM_IDL -->
- <Directory Id="Py24_RTM_IDL" Name="RTM_IDL">
- <Component Id="Py24_RtmOpenrtm_aistRtm_idl"
- Guid="{% RtmOpenrtm_aist24Rtm_idl.GUID %}">
- <RemoveFile Id='Py24_RtmOpenrtm_aistRtm_idl' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py24_RtmOpenrtm_aistRtm_idl_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist24Rtm_idl.Files %}
+ <Directory Id="Py26_RTM_IDL" Name="RTM_IDL">
+ <Component Id="Py26_RtmOpenrtm_aistRtm_idl"
+ Guid="{% RtmOpenrtm_aist26Rtm_idl.GUID %}">
+ <RemoveFile Id='Py26_RtmOpenrtm_aistRtm_idl' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py26_RtmOpenrtm_aistRtm_idl_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist26Rtm_idl.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -249,12 +241,12 @@
</Component>
<!-- device_interfaces -->
- <Directory Id="Py24_device_interfaces" Name="device_interfaces">
- <Component Id="Py24_RtmOpenrtm_aistRtm_idlDevice_interfaces"
- Guid="{% RtmOpenrtm_aist24Rtm_idlDevice_interfaces.GUID %}">
- <RemoveFile Id='Py24_RtmOpenrtm_aistRtm_idlDevice_interfaces' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py24_RtmOpenrtm_aistRtm_idlDevice_interfaces_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist24Rtm_idlDevice_interfaces.Files %}
+ <Directory Id="Py26_device_interfaces" Name="device_interfaces">
+ <Component Id="Py26_RtmOpenrtm_aistRtm_idlDevice_interfaces"
+ Guid="{% RtmOpenrtm_aist26Rtm_idlDevice_interfaces.GUID %}">
+ <RemoveFile Id='Py26_RtmOpenrtm_aistRtm_idlDevice_interfaces' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py26_RtmOpenrtm_aistRtm_idlDevice_interfaces_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist26Rtm_idlDevice_interfaces.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -273,19 +265,18 @@
</Directory>
</Directory>
-
- <!-- for Python25 -->
- <Directory Id="PYTHON25DIR" Name="[[PYTHON25]]">
+ <!-- for Python27 -->
+ <Directory Id="PYTHON27DIR" Name="[[PYTHON27]]">
<!-- omniORBpy components -->
- <?include omniORBpy25_inc.wxs ?>
+ <?include omniORBpy27_inc.wxs ?>
<!-- end of omniORBpy -->
<!-- rtcprof -->
- <Component Id="Py25_RtmOpenrtm_aistUtilsRtcprof"
- Guid="{% RtmOpenrtm_aist25UtilsRtcprof.GUID %}">
- <RemoveFile Id='Py25_RtmOpenrtm_aistUtilsRtcprof' On='uninstall' Name='*.pyc' />
- <RemoveFile Id='Py25_RtmOpenrtm_aistUtilsRtcprof_2' On='uninstall' Name='rtc*.log' />
- {% for file in RtmOpenrtm_aist25UtilsRtcprof.Files %}
+ <Component Id="Py27_RtmOpenrtm_aistUtilsRtcprof"
+ Guid="{% RtmOpenrtm_aist27UtilsRtcprof.GUID %}">
+ <RemoveFile Id='Py27_RtmOpenrtm_aistUtilsRtcprof' On='uninstall' Name='*.pyc' />
+ <RemoveFile Id='Py27_RtmOpenrtm_aistUtilsRtcprof_2' On='uninstall' Name='rtc*.log' />
+ {% for file in RtmOpenrtm_aist27UtilsRtcprof.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -293,9 +284,9 @@
</Component>
<!-- rtcd -->
- <Component Id="Py25_RtmOpenrtm_aistUtilsRtcd"
- Guid="{% RtmOpenrtm_aist25UtilsRtcd.GUID %}">
- {% for file in RtmOpenrtm_aist25UtilsRtcd.Files %}
+ <Component Id="Py27_RtmOpenrtm_aistUtilsRtcd"
+ Guid="{% RtmOpenrtm_aist27UtilsRtcd.GUID %}">
+ {% for file in RtmOpenrtm_aist27UtilsRtcd.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
{% if file.Name is rtcd.py %}
@@ -303,165 +294,6 @@
Name="Start RTC daemon"
Arguments=' -d -f "[Version]examples\Python\rtcd.conf"'
Show="normal" WorkingDirectory="bin"/>
- {% endif %}
- {% if file.Name is rtcd.conf %}
- <Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
- Name="rtc.conf for RTC daemon"
- Show="normal" WorkingDirectory="bin"/>
- {% endif %}
- </File>
- {% endfor %}
- </Component>
-
- <!-- Lib -->
- <Directory Id="py25Lib" Name="Lib">
- <!-- site-packages -->
- <Directory Id="Py25_site_packages" Name="site-packages">
-
- <Component Id="Py25_RtmOpenrtm_aistRoot"
- Guid="{% RtmOpenrtm_aist25Root.GUID %}">
- <RemoveFile Id='Py25_RtmOpenrtm_aistRoot' On='uninstall' Name='*.pyc' />
- {% for file in RtmOpenrtm_aist25Root.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
-
- <!-- OpenRTM_aist -->
- <Directory Id="Py25_OpenRTM_aist" Name="OpenRTM_aist">
- <Component Id="Py25_RtmOpenrtm_aist"
- Guid="{% RtmOpenrtm_aist25.GUID %}">
- <RemoveFile Id='Py25_RtmOpenrtm_aist' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py25_RtmOpenrtm_aist_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist25.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
-
- <!-- rtc-template -->
- <Directory Id="Py25_rtc_template" Name="rtc-template">
- <Component Id="Py25_RtmOpenrtm_aistRtctemplate"
- Guid="{% RtmOpenrtm_aist25UtilsRtctemplate.GUID %}">
- <RemoveFile Id='Py25_RtmOpenrtm_aistRtctemplate' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py25_RtmOpenrtm_aistRtctemplate_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist25UtilsRtctemplate.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
- </Directory>
-
- <!-- observer -->
- <Directory Id="Py25_ext" Name="ext">
- <Component Id="Py25_RtmOpenrtm_aistExt"
- Guid="{% RtmOpenrtm_aist25Ext.GUID %}">
- <RemoveFile Id='Py25_RtmOpenrtm_aistExt' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py25_RtmOpenrtm_aistExt_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist25Ext.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
- <Directory Id="Py25_sdo" Name="sdo">
- <Component Id="Py25_RtmOpenrtm_aistExtSdo"
- Guid="{% RtmOpenrtm_aist25ExtSdo.GUID %}">
- <RemoveFile Id='Py25_RtmOpenrtm_aistExtSdo' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py25_RtmOpenrtm_aistExtSdo_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist25ExtSdo.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
- <Directory Id="Py25_observer" Name="observer">
- <Component Id="Py25_RtmOpenrtm_aistExtSdoObserver"
- Guid="{% RtmOpenrtm_aist25ExtSdoObserver.GUID %}">
- <RemoveFile Id='Py25_RtmOpenrtm_aistExtSdoObserver' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py25_RtmOpenrtm_aistExtSdoObserver_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist25ExtSdoObserver.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
- </Directory>
-
- </Directory>
- </Directory>
-
- <!-- RTM_IDL -->
- <Directory Id="Py25_RTM_IDL" Name="RTM_IDL">
- <Component Id="Py25_RtmOpenrtm_aistRtm_idl"
- Guid="{% RtmOpenrtm_aist25Rtm_idl.GUID %}">
- <RemoveFile Id='Py25_RtmOpenrtm_aistRtm_idl' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py25_RtmOpenrtm_aistRtm_idl_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist25Rtm_idl.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
-
- <!-- device_interfaces -->
- <Directory Id="Py25_device_interfaces" Name="device_interfaces">
- <Component Id="Py25_RtmOpenrtm_aistRtm_idlDevice_interfaces"
- Guid="{% RtmOpenrtm_aist25Rtm_idlDevice_interfaces.GUID %}">
- <RemoveFile Id='Py25_RtmOpenrtm_aistRtm_idlDevice_interfaces' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py25_RtmOpenrtm_aistRtm_idlDevice_interfaces_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist25Rtm_idlDevice_interfaces.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
- </Directory>
- </Directory>
-
- <!-- end of OpenRTM_aist -->
- </Directory>
-
- <!-- end of site-packages -->
- </Directory>
-
- <!-- end of Lib -->
- </Directory>
- </Directory>
-
-
- <!-- for Python26 -->
- <Directory Id="PYTHON26DIR" Name="[[PYTHON26]]">
- <!-- omniORBpy components -->
- <?include omniORBpy26_inc.wxs ?>
- <!-- end of omniORBpy -->
-
- <!-- rtcprof -->
- <Component Id="Py26_RtmOpenrtm_aistUtilsRtcprof"
- Guid="{% RtmOpenrtm_aist26UtilsRtcprof.GUID %}">
- <RemoveFile Id='Py26_RtmOpenrtm_aistUtilsRtcprof' On='uninstall' Name='*.pyc' />
- <RemoveFile Id='Py26_RtmOpenrtm_aistUtilsRtcprof_2' On='uninstall' Name='rtc*.log' />
- {% for file in RtmOpenrtm_aist26UtilsRtcprof.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- </File>
- {% endfor %}
- </Component>
-
- <!-- rtcd -->
- <Component Id="Py26_RtmOpenrtm_aistUtilsRtcd"
- Guid="{% RtmOpenrtm_aist26UtilsRtcd.GUID %}">
- {% for file in RtmOpenrtm_aist26UtilsRtcd.Files %}
- <File Id="{% file.Id %}" Name="{% file.Name %}"
- DiskId="1" Source="{% file.Source %}">
- {% if file.Name is rtcd.py %}
- <Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
- Name="Start RTC daemon"
- Arguments=' -d -f "[Version]examples\Python\rtcd.conf"'
- Show="normal" WorkingDirectory="bin"/>
{% endif %}
{% if file.Name is rtcd.conf %}
<Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
@@ -473,14 +305,14 @@
</Component>
<!-- Lib -->
- <Directory Id="py26Lib" Name="Lib">
+ <Directory Id="py27Lib" Name="Lib">
<!-- site-packages -->
- <Directory Id="Py26_site_packages" Name="site-packages">
+ <Directory Id="Py27_site_packages" Name="site-packages">
- <Component Id="Py26_RtmOpenrtm_aistRoot"
- Guid="{% RtmOpenrtm_aist26Root.GUID %}">
- <RemoveFile Id='Py26_RtmOpenrtm_aistRoot' On='uninstall' Name='*.pyc' />
- {% for file in RtmOpenrtm_aist26Root.Files %}
+ <Component Id="Py27_RtmOpenrtm_aistRoot"
+ Guid="{% RtmOpenrtm_aist27Root.GUID %}">
+ <RemoveFile Id='Py27_RtmOpenrtm_aistRoot' On='uninstall' Name='*.pyc' />
+ {% for file in RtmOpenrtm_aist27Root.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -488,12 +320,12 @@
</Component>
<!-- OpenRTM_aist -->
- <Directory Id="Py26_OpenRTM_aist" Name="OpenRTM_aist">
- <Component Id="Py26_RtmOpenrtm_aist"
- Guid="{% RtmOpenrtm_aist26.GUID %}">
- <RemoveFile Id='Py26_RtmOpenrtm_aist' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py26_RtmOpenrtm_aist_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist26.Files %}
+ <Directory Id="Py27_OpenRTM_aist" Name="OpenRTM_aist">
+ <Component Id="Py27_RtmOpenrtm_aist"
+ Guid="{% RtmOpenrtm_aist27.GUID %}">
+ <RemoveFile Id='Py27_RtmOpenrtm_aist' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27_RtmOpenrtm_aist_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist27.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -501,12 +333,12 @@
</Component>
<!-- rtc-template -->
- <Directory Id="Py26_rtc_template" Name="rtc-template">
- <Component Id="Py26_RtmOpenrtm_aistRtctemplate"
- Guid="{% RtmOpenrtm_aist26UtilsRtctemplate.GUID %}">
- <RemoveFile Id='Py26_RtmOpenrtm_aistRtctemplate' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py26_RtmOpenrtm_aistRtctemplate_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist26UtilsRtctemplate.Files %}
+ <Directory Id="Py27_rtc_template" Name="rtc-template">
+ <Component Id="Py27_RtmOpenrtm_aistRtctemplate"
+ Guid="{% RtmOpenrtm_aist27UtilsRtctemplate.GUID %}">
+ <RemoveFile Id='Py27_RtmOpenrtm_aistRtctemplate' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27_RtmOpenrtm_aistRtctemplate_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist27UtilsRtctemplate.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -515,34 +347,34 @@
</Directory>
<!-- observer -->
- <Directory Id="Py26_ext" Name="ext">
- <Component Id="Py26_RtmOpenrtm_aistExt"
- Guid="{% RtmOpenrtm_aist26Ext.GUID %}">
- <RemoveFile Id='Py26_RtmOpenrtm_aistExt' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py26_RtmOpenrtm_aistExt_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist26Ext.Files %}
+ <Directory Id="Py27_ext" Name="ext">
+ <Component Id="Py27_RtmOpenrtm_aistExt"
+ Guid="{% RtmOpenrtm_aist27Ext.GUID %}">
+ <RemoveFile Id='Py27_RtmOpenrtm_aistExt' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27_RtmOpenrtm_aistExt_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist27Ext.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
{% endfor %}
</Component>
- <Directory Id="Py26_sdo" Name="sdo">
- <Component Id="Py26_RtmOpenrtm_aistExtSdo"
- Guid="{% RtmOpenrtm_aist26ExtSdo.GUID %}">
- <RemoveFile Id='Py26_RtmOpenrtm_aistExtSdo' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py26_RtmOpenrtm_aistExtSdo_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist26ExtSdo.Files %}
+ <Directory Id="Py27_sdo" Name="sdo">
+ <Component Id="Py27_RtmOpenrtm_aistExtSdo"
+ Guid="{% RtmOpenrtm_aist27ExtSdo.GUID %}">
+ <RemoveFile Id='Py27_RtmOpenrtm_aistExtSdo' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27_RtmOpenrtm_aistExtSdo_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist27ExtSdo.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
{% endfor %}
</Component>
- <Directory Id="Py26_observer" Name="observer">
- <Component Id="Py26_RtmOpenrtm_aistExtSdoObserver"
- Guid="{% RtmOpenrtm_aist26ExtSdoObserver.GUID %}">
- <RemoveFile Id='Py26_RtmOpenrtm_aistExtSdoObserver' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py26_RtmOpenrtm_aistExtSdoObserver_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist26ExtSdoObserver.Files %}
+ <Directory Id="Py27_observer" Name="observer">
+ <Component Id="Py27_RtmOpenrtm_aistExtSdoObserver"
+ Guid="{% RtmOpenrtm_aist27ExtSdoObserver.GUID %}">
+ <RemoveFile Id='Py27_RtmOpenrtm_aistExtSdoObserver' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27_RtmOpenrtm_aistExtSdoObserver_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist27ExtSdoObserver.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -554,12 +386,12 @@
</Directory>
<!-- RTM_IDL -->
- <Directory Id="Py26_RTM_IDL" Name="RTM_IDL">
- <Component Id="Py26_RtmOpenrtm_aistRtm_idl"
- Guid="{% RtmOpenrtm_aist26Rtm_idl.GUID %}">
- <RemoveFile Id='Py26_RtmOpenrtm_aistRtm_idl' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py26_RtmOpenrtm_aistRtm_idl_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist26Rtm_idl.Files %}
+ <Directory Id="Py27_RTM_IDL" Name="RTM_IDL">
+ <Component Id="Py27_RtmOpenrtm_aistRtm_idl"
+ Guid="{% RtmOpenrtm_aist27Rtm_idl.GUID %}">
+ <RemoveFile Id='Py27_RtmOpenrtm_aistRtm_idl' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27_RtmOpenrtm_aistRtm_idl_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist27Rtm_idl.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -567,12 +399,12 @@
</Component>
<!-- device_interfaces -->
- <Directory Id="Py26_device_interfaces" Name="device_interfaces">
- <Component Id="Py26_RtmOpenrtm_aistRtm_idlDevice_interfaces"
- Guid="{% RtmOpenrtm_aist26Rtm_idlDevice_interfaces.GUID %}">
- <RemoveFile Id='Py26_RtmOpenrtm_aistRtm_idlDevice_interfaces' On='uninstall' Name='*.pyc' />
- <RemoveFolder Id='Py26_RtmOpenrtm_aistRtm_idlDevice_interfaces_f' On='uninstall' />
- {% for file in RtmOpenrtm_aist26Rtm_idlDevice_interfaces.Files %}
+ <Directory Id="Py27_device_interfaces" Name="device_interfaces">
+ <Component Id="Py27_RtmOpenrtm_aistRtm_idlDevice_interfaces"
+ Guid="{% RtmOpenrtm_aist27Rtm_idlDevice_interfaces.GUID %}">
+ <RemoveFile Id='Py27_RtmOpenrtm_aistRtm_idlDevice_interfaces' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27_RtmOpenrtm_aistRtm_idlDevice_interfaces_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aist27Rtm_idlDevice_interfaces.Files %}
<File Id="{% file.Id %}" Name="{% file.Name %}"
DiskId="1" Source="{% file.Source %}">
</File>
@@ -593,12 +425,23 @@
<!-- Program Files -->
+ <?if $(env.ARCH) = x86 ?>
<Directory Id="ProgramFilesFolder" SourceName="PFILE">
+ <?else?>
+ <Directory Id="ProgramFiles64Folder" SourceName="PFILE">
+ <?endif ?>
<Directory Id="INSTALLLOCATION"
Name="{% Product.Name %}">
<Directory Id="Version"
Name="{% Product.ShortVersion %}">
+ <!-- JRE -->
+ <?if $(env.INCLUDE_JRE) = YES ?>
+ <Merge Id="Msi_JRE_OpenJDK" Language="1041"
+ SourceFile="JRE_OpenJDK7_$(env.ARCH).msm" DiskId="1" />
+ <?endif ?>
+ <!-- end of JRE -->
+
<!-- bin -->
<Directory Id="bin" Name="bin">
<Component Id="Rtm_Bin" Guid="{% RtmOpenrtm_aistUtilsRtmnaming.GUID %}">
@@ -609,8 +452,8 @@
Name="{% file.Name %}" DiskId="1"
Source="{% file.Source %}">
{% if file.Name is rtm-naming.py %}
- <Shortcut Id="rtmnaming.py" Directory="ToolsMenuFolder"
- Name="Start Naming Service"
+ <Shortcut Id="rtmnaming.py" Directory="CommonToolsMenuFolder"
+ Name="Start Python Naming Service"
Show="normal" WorkingDirectory="bin"/>
{% endif %}
</File>
@@ -618,11 +461,11 @@
</Component>
- <Component Id="Rtm_Bin2" Guid="{% RtmIdlcompiler.GUID %}">
+ <Component Id="Rtm_Bin2" Guid="{% RtmInstaller.GUID %}">
<RemoveFile Id='Rtm_Bin2' On='uninstall' Name='*.pyc' />
<RemoveFolder Id='Rtm_Bin2_f' On='uninstall' />
- {% for file in RtmIdlcompiler.Files %}
+ {% for file in RtmInstaller.Files %}
<File Id="{% file.Id %}"
Name="{% file.Name %}" DiskId="1"
Source="{% file.Source %}">
@@ -640,10 +483,10 @@
<!-- classref_jp -->
<Directory Id="classref_jp" Name="classref_jp">
- <Component Id="RtmDocsClassreferencejpHtml"
- Guid="{% RtmDocsClassreferencejpHtml.GUID %}">
- <RemoveFolder Id='RtmDocsClassreferencejpHtml_f' On='uninstall' />
- {% for file in RtmDocsClassreferencejpHtml.Files %}
+ <Component Id="RtmOpenrtm_aistDocsClassreferencejpHtml"
+ Guid="{% RtmOpenrtm_aistDocsClassreferencejpHtml.GUID %}">
+ <RemoveFolder Id='RtmOpenrtm_aistDocsClassreferencejpHtml_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aistDocsClassreferencejpHtml.Files %}
<File Id="{% file.Id %}"
Name="{% file.Name %}" DiskId="1"
Source="{% file.Source %}">
@@ -659,10 +502,10 @@
<!-- classref_en -->
<Directory Id="classref_en" Name="classref_en">
- <Component Id="RtmDocsClassreferenceenHtml"
- Guid="{% RtmDocsClassreferenceenHtml.GUID %}">
- <RemoveFolder Id='RtmDocsClassreferenceenHtml_f' On='uninstall' />
- {% for file in RtmDocsClassreferenceenHtml.Files %}
+ <Component Id="RtmOpenrtm_aistDocsClassreferenceenHtml"
+ Guid="{% RtmOpenrtm_aistDocsClassreferenceenHtml.GUID %}">
+ <RemoveFolder Id='RtmOpenrtm_aistDocsClassreferenceenHtml_f' On='uninstall' />
+ {% for file in RtmOpenrtm_aistDocsClassreferenceenHtml.Files %}
<File Id="{% file.Id %}"
Name="{% file.Name %}" DiskId="1"
Source="{% file.Source %}">
@@ -995,279 +838,44 @@
<!-- end of examples -->
</Directory>
- <!-- rtmtools components -->
- <?if $(env.INCLUDE_OPENRTP) = YES ?>
- <?include OpenRTP_inc.wxs ?>
- <?endif ?>
- <!-- end of rtmtools -->
+ <!-- rtmtools components -->
+ <?if $(env.INCLUDE_OPENRTP) = YES ?>
+ <Merge Id="Msi_RTSystemEditorRCP" Language="1041"
+ SourceFile="RTSystemEditorRCP_$(env.ARCH).msm" DiskId="1" />
+ <?endif ?>
+ <!-- end of rtmtools -->
</Directory>
</Directory>
<!-- end of Program Files Folder -->
+ <?if $(env.ARCH) = "x86" ?>
</Directory>
+ <?else?>
+ </Directory>
+ <?endif?>
<Directory Id="ProgramMenuFolder">
<Directory Id="AppMenuFolder"
Name="{% Product.Name %} {% Product.ShortVersion %}">
<Directory Id="PythonMenuFolder" Name="Python">
- <Directory Id="ToolsMenuFolder" Name="tools">
+ <Directory Id="ToolsMenuFolder" Name="Tools">
</Directory>
- <Directory Id="Components" Name="components">
- <Directory Id="ExpMenuFolder" Name="examples">
+ <Directory Id="Components" Name="Components">
+ <Directory Id="ExpMenuFolder" Name="Examples">
</Directory>
</Directory>
- <Directory Id="DocMenuFolder" Name="documents">
+ <Directory Id="DocMenuFolder" Name="Documents">
</Directory>
</Directory>
+ <Directory Id="CommonToolsMenuFolder" Name="Tools">
+ </Directory>
</Directory>
</Directory>
<!-- end of SourceDir -->
</Directory>
- <!-- Function definition omniORBpy24 -->
- <Feature Id="omniORBpy24" Level="1" Title="OpenRTM-aist for Python 2.4"
- ConfigurableDirectory="PYTHON24DIR">
- <Condition Level="1"><![CDATA[ NOT PYTHON24 = ""]]></Condition>
- <Condition Level="0"><![CDATA[ NOT PYTHON24 <> ""]]></Condition>
-
- <!-- runtime -->
- <Feature Id="Py24_Runtime" Level="1" Title="omniORBpy for Python 2.4">
- <ComponentRef Id="Py24BinX86_win32"/>
- <ComponentRef Id="Py24LibX86_win32"/>
- <ComponentRef Id="Py24LibPython"/>
- <ComponentRef Id="Py24BinDll"/>
- <ComponentRef Id="Py24LibPythonCosnaming"/>
- <ComponentRef Id="Py24LibPythonCosnaming__poa"/>
- <ComponentRef Id="Py24LibPythonOmniidl"/>
- <ComponentRef Id="Py24LibPythonOmniidl_be"/>
- <ComponentRef Id="Py24LibPythonOmniorb"/>
- <ComponentRef Id="Py24LibPythonOmniorbCos"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoscollection"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoscollection__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoscompoundlifecycle"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoscompoundlifecycle__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoscontainment"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoscontainment__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoseventchanneladmin"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoseventchanneladmin__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoseventcomm"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoseventcomm__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosexternalization"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosexternalizationcontainment"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosexternalizationcontainment__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosexternalizationreference"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosexternalizationreference__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosexternalization__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosgraphs"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosgraphs__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoslifecycle"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoslifecyclecontainment"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoslifecyclecontainment__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoslifecyclereference"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoslifecyclereference__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCoslifecycle__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosnaming"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosnaming__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosnotification"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosnotification__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosnotifychanneladmin"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosnotifychanneladmin__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosnotifycomm"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosnotifycomm__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosnotifyfilter"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosnotifyfilter__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosobjectidentity"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosobjectidentity__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistenceddo"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistenceddo__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistenceds_cli"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistenceds_cli__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistencepds"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistencepds_da"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistencepds_da__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistencepds__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistencepid"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistencepid__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistencepo"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistencepom"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistencepom__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospersistencepo__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospropertyservice"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCospropertyservice__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosquery"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosquerycollection"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosquerycollection__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosquery__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosreference"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosreference__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosrelationships"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosrelationships__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosstream"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCosstream__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostime"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostimerevent"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostimerevent__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostime__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostrading"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostradingdynamic"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostradingdynamic__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostradingrepos"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostradingrepos__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostrading__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostypedeventchanneladmin"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostypedeventchanneladmin__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostypedeventcomm"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostypedeventcomm__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostypednotifychanneladmin"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostypednotifychanneladmin__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostypednotifycomm"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosCostypednotifycomm__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosLifecycleservice"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosLifecycleservice__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosRditesttypes"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosRditesttypes__poa"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosTimebase"/>
- <ComponentRef Id="Py24LibPythonOmniorbCosTimebase__poa"/>
- </Feature>
-
- <!-- OpenRTM_aist -->
- <Feature Id="Py24_OpenRTM_aist" Level="1" Title="OpenRTM-aist (Python)">
- <ComponentRef Id="Py24_RtmOpenrtm_aistUtilsRtcprof"/>
- <ComponentRef Id="Py24_RtmOpenrtm_aistUtilsRtcd"/>
- <ComponentRef Id="Py24_RtmOpenrtm_aistRoot"/>
- <ComponentRef Id="Py24_RtmOpenrtm_aist"/>
- <ComponentRef Id="Py24_RtmOpenrtm_aistRtctemplate"/>
- <ComponentRef Id="Py24_RtmOpenrtm_aistExt"/>
- <ComponentRef Id="Py24_RtmOpenrtm_aistExtSdo"/>
- <ComponentRef Id="Py24_RtmOpenrtm_aistExtSdoObserver"/>
- <ComponentRef Id="Py24_RtmOpenrtm_aistRtm_idl"/>
- <ComponentRef Id="Py24_RtmOpenrtm_aistRtm_idlDevice_interfaces"/>
- </Feature>
- </Feature>
-
- <!-- Function definition omniORBpy25 -->
- <Feature Id="omniORBpy25" Level="1" Title="OpenRTM-aist for Python 2.5"
- ConfigurableDirectory="PYTHON25DIR">
- <Condition Level="1"><![CDATA[ NOT PYTHON25 = ""]]></Condition>
- <Condition Level="0"><![CDATA[ NOT PYTHON25 <> ""]]></Condition>
-
- <!-- runtime -->
- <Feature Id="Py25_Runtime" Level="1" Title="omniORBpy for Python 2.5">
- <ComponentRef Id="Py25BinX86_win32"/>
- <ComponentRef Id="Py25LibX86_win32"/>
- <ComponentRef Id="Py25LibPython"/>
- <ComponentRef Id="Py25BinDll"/>
- <ComponentRef Id="Py25LibPythonCosnaming"/>
- <ComponentRef Id="Py25LibPythonCosnaming__poa"/>
- <ComponentRef Id="Py25LibPythonOmniidl"/>
- <ComponentRef Id="Py25LibPythonOmniidl_be"/>
- <ComponentRef Id="Py25LibPythonOmniorb"/>
- <ComponentRef Id="Py25LibPythonOmniorbCos"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoscollection"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoscollection__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoscompoundlifecycle"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoscompoundlifecycle__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoscontainment"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoscontainment__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoseventchanneladmin"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoseventchanneladmin__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoseventcomm"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoseventcomm__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosexternalization"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosexternalizationcontainment"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosexternalizationcontainment__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosexternalizationreference"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosexternalizationreference__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosexternalization__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosgraphs"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosgraphs__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoslifecycle"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoslifecyclecontainment"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoslifecyclecontainment__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoslifecyclereference"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoslifecyclereference__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCoslifecycle__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosnaming"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosnaming__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosnotification"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosnotification__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosnotifychanneladmin"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosnotifychanneladmin__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosnotifycomm"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosnotifycomm__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosnotifyfilter"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosnotifyfilter__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosobjectidentity"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosobjectidentity__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistenceddo"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistenceddo__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistenceds_cli"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistenceds_cli__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistencepds"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistencepds_da"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistencepds_da__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistencepds__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistencepid"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistencepid__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistencepo"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistencepom"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistencepom__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospersistencepo__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospropertyservice"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCospropertyservice__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosquery"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosquerycollection"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosquerycollection__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosquery__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosreference"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosreference__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosrelationships"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosrelationships__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosstream"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCosstream__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostime"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostimerevent"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostimerevent__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostime__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostrading"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostradingdynamic"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostradingdynamic__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostradingrepos"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostradingrepos__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostrading__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostypedeventchanneladmin"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostypedeventchanneladmin__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostypedeventcomm"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostypedeventcomm__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostypednotifychanneladmin"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostypednotifychanneladmin__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostypednotifycomm"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosCostypednotifycomm__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosLifecycleservice"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosLifecycleservice__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosRditesttypes"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosRditesttypes__poa"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosTimebase"/>
- <ComponentRef Id="Py25LibPythonOmniorbCosTimebase__poa"/>
- </Feature>
-
- <!-- OpenRTM_aist -->
- <Feature Id="Py25_OpenRTM_aist" Level="1" Title="OpenRTM-aist (Python)">
- <ComponentRef Id="Py25_RtmOpenrtm_aistUtilsRtcprof"/>
- <ComponentRef Id="Py25_RtmOpenrtm_aistUtilsRtcd"/>
- <ComponentRef Id="Py25_RtmOpenrtm_aistRoot"/>
- <ComponentRef Id="Py25_RtmOpenrtm_aist"/>
- <ComponentRef Id="Py25_RtmOpenrtm_aistRtctemplate"/>
- <ComponentRef Id="Py25_RtmOpenrtm_aistExt"/>
- <ComponentRef Id="Py25_RtmOpenrtm_aistExtSdo"/>
- <ComponentRef Id="Py25_RtmOpenrtm_aistExtSdoObserver"/>
- <ComponentRef Id="Py25_RtmOpenrtm_aistRtm_idl"/>
- <ComponentRef Id="Py25_RtmOpenrtm_aistRtm_idlDevice_interfaces"/>
- </Feature>
- </Feature>
-
<!-- Function definition omniORBpy26 -->
<Feature Id="omniORBpy26" Level="1" Title="OpenRTM-aist for Python 2.6"
ConfigurableDirectory="PYTHON26DIR">
@@ -1390,6 +998,128 @@
</Feature>
</Feature>
+ <!-- Function definition omniORBpy27 -->
+ <Feature Id="omniORBpy27" Level="1" Title="OpenRTM-aist for Python 2.7"
+ ConfigurableDirectory="PYTHON27DIR">
+ <Condition Level="1"><![CDATA[ NOT PYTHON27 = ""]]></Condition>
+ <Condition Level="0"><![CDATA[ NOT PYTHON27 <> ""]]></Condition>
+
+ <!-- runtime -->
+ <Feature Id="Py27_Runtime" Level="1" Title="omniORBpy for Python 2.7">
+ <ComponentRef Id="Py27BinX86_win32"/>
+ <ComponentRef Id="Py27LibX86_win32"/>
+ <ComponentRef Id="Py27LibPython"/>
+ <ComponentRef Id="Py27BinDll"/>
+ <ComponentRef Id="Py27LibPythonCosnaming"/>
+ <ComponentRef Id="Py27LibPythonCosnaming__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniidl"/>
+ <ComponentRef Id="Py27LibPythonOmniidl_be"/>
+ <ComponentRef Id="Py27LibPythonOmniorb"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCos"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoscollection"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoscollection__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoscompoundlifecycle"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoscompoundlifecycle__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoscontainment"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoscontainment__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoseventchanneladmin"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoseventchanneladmin__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoseventcomm"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoseventcomm__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosexternalization"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosexternalizationcontainment"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosexternalizationcontainment__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosexternalizationreference"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosexternalizationreference__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosexternalization__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosgraphs"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosgraphs__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoslifecycle"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoslifecyclecontainment"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoslifecyclecontainment__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoslifecyclereference"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoslifecyclereference__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCoslifecycle__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosnaming"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosnaming__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosnotification"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosnotification__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosnotifychanneladmin"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosnotifychanneladmin__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosnotifycomm"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosnotifycomm__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosnotifyfilter"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosnotifyfilter__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosobjectidentity"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosobjectidentity__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistenceddo"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistenceddo__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistenceds_cli"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistenceds_cli__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistencepds"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistencepds_da"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistencepds_da__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistencepds__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistencepid"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistencepid__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistencepo"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistencepom"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistencepom__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospersistencepo__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospropertyservice"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCospropertyservice__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosquery"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosquerycollection"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosquerycollection__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosquery__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosreference"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosreference__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosrelationships"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosrelationships__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosstream"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCosstream__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostime"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostimerevent"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostimerevent__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostime__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostrading"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostradingdynamic"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostradingdynamic__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostradingrepos"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostradingrepos__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostrading__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostypedeventchanneladmin"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostypedeventchanneladmin__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostypedeventcomm"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostypedeventcomm__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostypednotifychanneladmin"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostypednotifychanneladmin__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostypednotifycomm"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosCostypednotifycomm__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosLifecycleservice"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosLifecycleservice__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosRditesttypes"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosRditesttypes__poa"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosTimebase"/>
+ <ComponentRef Id="Py27LibPythonOmniorbCosTimebase__poa"/>
+ </Feature>
+
+ <!-- OpenRTM_aist -->
+ <Feature Id="Py27_OpenRTM_aist" Level="1" Title="OpenRTM-aist (Python)"
+ ConfigurableDirectory="INSTALLLOCATION">
+ <ComponentRef Id="Py27_RtmOpenrtm_aistUtilsRtcprof"/>
+ <ComponentRef Id="Py27_RtmOpenrtm_aistUtilsRtcd"/>
+ <ComponentRef Id="Py27_RtmOpenrtm_aistRoot"/>
+ <ComponentRef Id="Py27_RtmOpenrtm_aist"/>
+ <ComponentRef Id="Py27_RtmOpenrtm_aistRtctemplate"/>
+ <ComponentRef Id="Py27_RtmOpenrtm_aistExt"/>
+ <ComponentRef Id="Py27_RtmOpenrtm_aistExtSdo"/>
+ <ComponentRef Id="Py27_RtmOpenrtm_aistExtSdoObserver"/>
+ <ComponentRef Id="Py27_RtmOpenrtm_aistRtm_idl"/>
+ <ComponentRef Id="Py27_RtmOpenrtm_aistRtm_idlDevice_interfaces"/>
+ </Feature>
+ </Feature>
+
<!-- Function definition OpenRTM-aist -->
<Feature Id="ProductFeature" Level="1" Title="OpenRTM-aist (Python) common files"
ConfigurableDirectory="INSTALLLOCATION">
@@ -1402,8 +1132,8 @@
<!-- documents -->
<Feature Id="Rtm_Docs" Level="1" Title="Documents">
- <ComponentRef Id="RtmDocsClassreferencejpHtml"/>
- <ComponentRef Id="RtmDocsClassreferenceenHtml"/>
+ <ComponentRef Id="RtmOpenrtm_aistDocsClassreferencejpHtml"/>
+ <ComponentRef Id="RtmOpenrtm_aistDocsClassreferenceenHtml"/>
</Feature>
<!-- examples -->
@@ -1426,23 +1156,17 @@
</Feature>
+ <!-- JRE -->
+ <?if $(env.INCLUDE_JRE) = YES ?>
+ <Feature Id="JRE_OpenJDK" Level="1" Title="JRE for RTSystemEditorRCP 1.1">
+ <MergeRef Id="Msi_JRE_OpenJDK" />
+ </Feature>
+ <?endif ?>
+
<!-- OpenRTP tools -->
<?if $(env.INCLUDE_OPENRTP) = YES ?>
- <Feature Id="OpenRTP" Level="1" Title="OpenRT Platform Tool Chain"
- ConfigurableDirectory="INSTALLLOCATION">
- <Condition Level ="1"><![CDATA[ (RTSE_FILEEXISTS = "") ]]></Condition>
- <Condition Level ="0"><![CDATA[ (RTSE_FILEEXISTS <> "") ]]></Condition>
-
- <!-- rtse rcp -->
- <Feature Id="RTSystemEditor" Level="1" Title="RTSystemEditor">
- <ComponentRef Id="Openrtp" />
- <ComponentRef Id="OpenrtpConfiguration" />
- <ComponentRef Id="OpenrtpPlugins" />
- <ComponentRef Id="org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610" />
- <ComponentRef Id="META_INF" />
- <ComponentRef Id="org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731" />
- <ComponentRef Id="META_INF_2" />
- </Feature>
+ <Feature Id="RTSE_ONLY" Level="1" Title="RTSystemEditorRCP 1.1">
+ <MergeRef Id="Msi_RTSystemEditorRCP" />
</Feature>
<?endif ?>
@@ -1456,25 +1180,20 @@
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
- <CustomAction Id='IDLCOMPILE_PY24' Directory="PYTHON24DIR"
- ExeCommand='"[bin]idlcompile.bat" "[bin]idlcompile.py" 2.4 "[Version]examples\Python"'
- Return='asyncWait' />
-
- <CustomAction Id='IDLCOMPILE_PY25' Directory="PYTHON25DIR"
- ExeCommand='"[bin]idlcompile.bat" "[bin]idlcompile.py" 2.5 "[Version]examples\Python"'
- Return='asyncWait' />
-
<CustomAction Id='IDLCOMPILE_PY26' Directory="PYTHON26DIR"
ExeCommand='"[bin]idlcompile.bat" "[bin]idlcompile.py" 2.6 "[Version]examples\Python"'
Return='asyncWait' />
- <CustomAction Id='REMOVEFOLDER_PY24' Directory="PYTHON24DIR"
- ExeCommand='cmd.exe /C RMDIR /Q /S Lib\\site-packages\\OpenRTM_aist' Return='ignore' />
- <CustomAction Id='REMOVEFOLDER_PY25' Directory="PYTHON25DIR"
- ExeCommand='cmd.exe /C RMDIR /Q /S Lib\\site-packages\\OpenRTM_aist' Return='ignore' />
+ <CustomAction Id='IDLCOMPILE_PY27' Directory="PYTHON27DIR"
+ ExeCommand='"[bin]idlcompile.bat" "[bin]idlcompile.py" 2.7 "[Version]examples\Python"'
+ Return='asyncWait' />
+
<CustomAction Id='REMOVEFOLDER_PY26' Directory="PYTHON26DIR"
ExeCommand='cmd.exe /C RMDIR /Q /S Lib\\site-packages\\OpenRTM_aist' Return='ignore' />
+ <CustomAction Id='REMOVEFOLDER_PY27' Directory="PYTHON27DIR"
+ ExeCommand='cmd.exe /C RMDIR /Q /S Lib\\site-packages\\OpenRTM_aist' Return='ignore' />
+
<CustomAction Id='REMOVEFOLDER_RTM' Directory="INSTALLLOCATION"
ExeCommand='cmd.exe /C RMDIR /Q /S {% Product.ShortVersion %}\\examples\\Python' Return='ignore' />
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-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.yaml.in 2015-10-19 04:48:18 UTC (rev 613)
@@ -1,7 +1,7 @@
Product:
Name: OpenRTM-aist
ShortName: OpenRTM
- Id: 11043B94-16BA-11DF-97DA-001C23DA0BDA
+ Id: __GUID__
Language: "1041"
Codepage: "932"
Version: 1.1.0
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTMpywxs.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTMpywxs.py 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/OpenRTMpywxs.py 2015-10-19 04:48:18 UTC (rev 613)
@@ -20,9 +20,9 @@
import makewxs
data = [
- ("docs/ClassReference-jp/html", "*.css *.gif *.png *.html *.hhc *.hhk *.hhp"),
- ("docs/ClassReference-en/html", "*.css *.gif *.png *.html *.hhc *.hhk *.hhp"),
- ("idlcompiler", "idlcompile.bat idlcompile.py"),
+ ("OpenRTM_aist/docs/ClassReference-jp/html", "*.css *.gif *.png *.html *.hhc *.hhk *.hhp"),
+ ("OpenRTM_aist/docs/ClassReference-en/html", "*.css *.gif *.png *.html *.hhc *.hhk *.hhp"),
+ ("installer", "idlcompile.bat idlcompile.py"),
("OpenRTM_aist/utils/rtm-naming", "rtm-naming.py"),
("OpenRTM_aist/examples", "*.conf"),
("OpenRTM_aist/examples/AutoControl", "*.py *.conf"),
@@ -38,26 +38,6 @@
("OpenRTM_aist/examples/TkJoyStick", "*.py *.conf"),
("OpenRTM_aist/examples/TkLRFViewer", "*.py *.conf"),
("OpenRTM_aist/examples/Templates", "*.py *.xml"),
- ("OpenRTM_aist24", "*.py"),
- ("OpenRTM_aist24/ext", "*.py"),
- ("OpenRTM_aist24/ext/sdo", "*.py"),
- ("OpenRTM_aist24/ext/sdo/observer", "*.py *.idl rtc.conf setup.bat"),
- ("OpenRTM_aist24/utils/rtcd", "rtcd.py rtcd_python.bat rtcd_python.exe rtcd.conf"),
- ("OpenRTM_aist24/utils/rtcprof", "rtcprof.py rtcprof_python.bat"),
- ("OpenRTM_aist24/utils/rtc-template", "*.py"),
- ("OpenRTM_aist24/RTM_IDL", "*.py *.idl *.pth"),
- ("OpenRTM_aist24/RTM_IDL/device_interfaces", "*.py *.idl"),
- ("OpenRTM_aist24/root", "*.pth"),
- ("OpenRTM_aist25", "*.py"),
- ("OpenRTM_aist25/ext", "*.py"),
- ("OpenRTM_aist25/ext/sdo", "*.py"),
- ("OpenRTM_aist25/ext/sdo/observer", "*.py *.idl rtc.conf setup.bat"),
- ("OpenRTM_aist25/utils/rtcd", "rtcd.py rtcd_python.bat rtcd_python.exe rtcd.conf"),
- ("OpenRTM_aist25/utils/rtcprof", "rtcprof.py rtcprof_python.bat"),
- ("OpenRTM_aist25/utils/rtc-template", "*.py"),
- ("OpenRTM_aist25/RTM_IDL", "*.py *.idl *.pth"),
- ("OpenRTM_aist25/RTM_IDL/device_interfaces", "*.py *.idl"),
- ("OpenRTM_aist25/root", "*.pth"),
("OpenRTM_aist26", "*.py"),
("OpenRTM_aist26/ext", "*.py"),
("OpenRTM_aist26/ext/sdo", "*.py"),
@@ -67,7 +47,17 @@
("OpenRTM_aist26/utils/rtc-template", "*.py"),
("OpenRTM_aist26/RTM_IDL", "*.py *.idl *.pth"),
("OpenRTM_aist26/RTM_IDL/device_interfaces", "*.py *.idl"),
- ("OpenRTM_aist26/root", "*.pth")
+ ("OpenRTM_aist26/root", "*.pth"),
+ ("OpenRTM_aist27", "*.py"),
+ ("OpenRTM_aist27/ext", "*.py"),
+ ("OpenRTM_aist27/ext/sdo", "*.py"),
+ ("OpenRTM_aist27/ext/sdo/observer", "*.py *.idl rtc.conf setup.bat"),
+ ("OpenRTM_aist27/utils/rtcd", "rtcd.py rtcd_python.bat rtcd_python.exe rtcd.conf"),
+ ("OpenRTM_aist27/utils/rtcprof", "rtcprof.py rtcprof_python.bat"),
+ ("OpenRTM_aist27/utils/rtc-template", "*.py"),
+ ("OpenRTM_aist27/RTM_IDL", "*.py *.idl *.pth"),
+ ("OpenRTM_aist27/RTM_IDL/device_interfaces", "*.py *.idl"),
+ ("OpenRTM_aist27/root", "*.pth")
]
## Resource path
@@ -82,30 +72,23 @@
## make temporary files
##
src_dir = base_dir + "OpenRTM_aist"
-temp_dir24 = base_dir + "OpenRTM_aist24"
-temp_dir25 = base_dir + "OpenRTM_aist25"
temp_dir26 = base_dir + "OpenRTM_aist26"
+temp_dir27 = base_dir + "OpenRTM_aist27"
dll_list = glob.glob(base_dir + "bin\\x86_win32\\*.dll")
dll_cnt = len(dll_list)
-if os.path.exists(temp_dir24) :
- shutil.rmtree(temp_dir24)
-if os.path.exists(temp_dir25) :
- shutil.rmtree(temp_dir25)
if os.path.exists(temp_dir26) :
shutil.rmtree(temp_dir26)
-shutil.copytree(src_dir, temp_dir24)
-shutil.copytree(src_dir, temp_dir25)
+if os.path.exists(temp_dir27) :
+ shutil.rmtree(temp_dir27)
shutil.copytree(src_dir, temp_dir26)
+shutil.copytree(src_dir, temp_dir27)
-temp_dir24_root = base_dir + "OpenRTM_aist24\\root"
-temp_dir25_root = base_dir + "OpenRTM_aist25\\root"
temp_dir26_root = base_dir + "OpenRTM_aist26\\root"
-os.mkdir(temp_dir24_root)
-os.mkdir(temp_dir25_root)
+temp_dir27_root = base_dir + "OpenRTM_aist27\\root"
os.mkdir(temp_dir26_root)
-shutil.copy2(base_dir + "OpenRTM-aist.pth", temp_dir24_root)
-shutil.copy2(base_dir + "OpenRTM-aist.pth", temp_dir25_root)
+os.mkdir(temp_dir27_root)
shutil.copy2(base_dir + "OpenRTM-aist.pth", temp_dir26_root)
+shutil.copy2(base_dir + "OpenRTM-aist.pth", temp_dir27_root)
def path_to_dir_id(path, prefix):
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/Readme.txt
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/Readme.txt 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/Readme.txt 2015-10-19 04:48:18 UTC (rev 613)
@@ -22,8 +22,8 @@
@@–{ƒc[ƒ‹‚ðŽÀs‚·‚é‚É‚ÍA‰º‹Lƒ\ƒtƒgƒEƒGƒA‚ªƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚鎖‚ð
@@‘O’ñ‚Æ‚µ‚Ü‚·B
-@@@EPython2.4, 2.5, 2.6 ‚̉½‚ê‚©
-@@@EPyYAML-3.09.win32-py2.4, 2.5, 2.6 ‚̉½‚ê‚©
+@@@EPython2.6,2.7 ‚̉½‚ê‚©
+@@@EPyYAML-3.09.win32-py2.6,2.7 ‚̉½‚ê‚©
@@@EWiX3.5 Toolset
@@@EŠÂ‹«•Ï”‚ÌuPATHv‚ÆuPYTHONPATHv‚ÉAŽg—p‚·‚éPythonî•ñ‚ªÝ’è
@@@@‚³‚ê‚Ä‚¢‚鎖B
@@ -36,7 +36,7 @@
@@C:\distribution
@@@@„
-@@@@„¥„Ÿ OpenRTM-aist-Python-1.0.0
+@@@@„¥„Ÿ OpenRTM-aist-Python-1.1.0
@@@@„ @@„¥„Ÿ doc@@¦doxygen
@@@@„ @@„ @@„¥„Ÿ ClassReference-jp
@@@@„ @@„ @@„¤„Ÿ ClassReference-en
@@ -56,7 +56,7 @@
@@@@„ @@@@@@@@„¤„Ÿ rtm-naming
@@@@„
@@@@„
-@@@@„¥„Ÿ omniORBpy-3.0-Python2.4
+@@@@„¥„Ÿ omniORBpy-3.4-Python2.6
@@@@„ @@„¥„Ÿ bin
@@@@„ @@„ @@„¤„Ÿ x86_win32
@@@@„ @@„¤„Ÿ lib
@@ -64,15 +64,7 @@
@@@@„ @@@@@„¤„Ÿ x86_win32
@@@@„
@@@@„
-@@@@„¥„Ÿ omniORBpy-3.4-Python2.5
-@@@@„ @@„¥„Ÿ bin
-@@@@„ @@„ @@„¤„Ÿ x86_win32
-@@@@„ @@„¤„Ÿ lib
-@@@@„ @@@@@„¥„Ÿ Python
-@@@@„ @@@@@„¤„Ÿ x86_win32
-@@@@„
-@@@@„
-@@@@„¥„Ÿ omniORBpy-3.4-Python2.6
+@@@@„¥„Ÿ omniORBpy-3.7-Python2.7
@@@@ @@„¥„Ÿ bin
@@@@ @@„ @@„¤„Ÿ x86_win32
@@@@ @@„¤„Ÿ lib
@@ -80,25 +72,21 @@
@@@@ @@@@@„¤„Ÿ x86_win32
-@@(1) OpenRTM-aist-Python-1.0.0 ‚ÍA
+@@(1) OpenRTM-aist-Python-1.1.0 ‚Í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
@@@@python setup.py sdist ‚É‚æ‚è쬂³‚ꂽƒtƒ@ƒCƒ‹(¦sdist)‚ðŠÜ‚ÞB
-@@(2) omniORBpy-3.0-Python2.4 ‚ÍA
-@@@@Python2.4—pomniORBpy-3.0‚Å‚ ‚éB
-
-@@(3) omniORBpy-3.4-Python2.5 ‚ÍA
-@@@@Python2.5—pomniORBpy-3.4‚Å‚ ‚éB
-
-@@(4) omniORBpy-3.4-Python2.6 ‚ÍA
+@@(2) omniORBpy-3.4-Python2.6 ‚ÍA
@@@@Python2.6—pomniORBpy-3.4‚Å‚ ‚éB
+@@(3) omniORBpy-3.7-Python2.7 ‚ÍA
+@@@@Python2.7—pomniORBpy-3.7‚Å‚ ‚éB
@@¦ã‹L\¬‚ÍAmsi쬃oƒbƒ` build.cmd ‚Å’è‹`‚µ‚Ä‚¨‚èA•ÏX‰Â”\‚Å‚·B
-@@@•ÏX‚·‚éê‡Abuild.cmd, OpenRTMpywxs.py, omniORBpy24wxs.py,
-@@@omniORBpy25wxs.py, omniORBpy26wxs.py ‚Ì®‡‚ðŽæ‚Á‚ĉº‚³‚¢B
+@@@•ÏX‚·‚éê‡Abuild.cmd, OpenRTMpywxs.py, omniORBpy26wxs.py,
+ omniORBpy27wxs.py ‚Ì®‡‚ðŽæ‚Á‚ĉº‚³‚¢B
3. ƒtƒ@ƒCƒ‹\¬
@@ -121,14 +109,12 @@
@@@@„¥„Ÿ cleanup.cmd@@ƒeƒ“ƒ|ƒ‰ƒŠƒtƒ@ƒCƒ‹íœƒoƒbƒ`
@@@@„
@@@@„¥„Ÿ OpenRTM-aist-Python.wxs.in@OpenRTM-aist—pWiXƒeƒ“ƒvƒŒ[ƒg
-@@@@„¥„Ÿ omniORBpy24_inc.wxs.in@@@Python2.4—pWiXƒeƒ“ƒvƒŒ[ƒg
-@@@@„¥„Ÿ omniORBpy25_inc.wxs.in@@@Python2.5—pWiXƒeƒ“ƒvƒŒ[ƒg
@@@@„¥„Ÿ omniORBpy26_inc.wxs.in@@@Python2.6—pWiXƒeƒ“ƒvƒŒ[ƒg
+@@@@„¥„Ÿ omniORBpy27_inc.wxs.in@@@Python2.7—pWiXƒeƒ“ƒvƒŒ[ƒg
@@@@„
@@@@„¥„Ÿ OpenRTMpywxs.py@@@OpenRTM-aist—pwxsƒtƒ@ƒCƒ‹ƒWƒFƒlƒŒ[ƒ^
-@@@@„¥„Ÿ omniORBpy24wxs.py@@Python2.4—pwxsƒtƒ@ƒCƒ‹ƒWƒFƒlƒŒ[ƒ^
-@@@@„¥„Ÿ omniORBpy25wxs.py@@Python2.5—pwxsƒtƒ@ƒCƒ‹ƒWƒFƒlƒŒ[ƒ^
@@@@„¥„Ÿ omniORBpy26wxs.py@@Python2.6—pwxsƒtƒ@ƒCƒ‹ƒWƒFƒlƒŒ[ƒ^
+@@@@„¥„Ÿ omniORBpy27wxs.py@@Python2.7—pwxsƒtƒ@ƒCƒ‹ƒWƒFƒlƒŒ[ƒ^
@@@@„
@@@@„¥„Ÿ idlcompile.bat@@@IDLƒRƒ“ƒpƒCƒ‹‹N“®ƒoƒbƒ`
@@@@„¥„Ÿ idlcompile.py @@@IDLƒRƒ“ƒpƒCƒ‹ƒXƒNƒŠƒvƒg
@@ -144,9 +130,9 @@
@@[ƒrƒ‹ƒhŒã‚ÉŽg—p‚·‚éƒtƒ@ƒCƒ‹]
@@@@„
-@@@@„¥„Ÿ OpenRTM-aist-Python-1.0.0.msi@‰pŒê‚̃Cƒ“ƒXƒg[ƒ‰[
+@@@@„¥„Ÿ OpenRTM-aist-Python-1.1.0.msi@‰pŒê‚̃Cƒ“ƒXƒg[ƒ‰[
@@@@„
-@@@@„¤„Ÿ OpenRTM-aist-Python-1.0.0_**-**.msi@Še‘Œê–ˆ‚̃Cƒ“ƒXƒg[ƒ‰[
+@@@@„¤„Ÿ OpenRTM-aist-Python-1.1.0_**-**.msi@Še‘Œê–ˆ‚̃Cƒ“ƒXƒg[ƒ‰[
@@@¦build.cmd ‚ðŽÀs‚·‚é‚ÆA•¡”‚̃eƒ“ƒ|ƒ‰ƒŠƒtƒ@ƒCƒ‹‚Æmsiƒtƒ@ƒCƒ‹‚ª
@@@@쬂³‚ê‚Ü‚·B
@@ -156,11 +142,11 @@
4. ƒCƒ“ƒXƒg[ƒ‹“®ì
@(1) ƒCƒ“ƒXƒg[ƒ‹‚ðs‚¤ê‡AƒCƒ“ƒXƒg[ƒ‹æPC‚̃ŒƒWƒXƒgƒŠ‚ðƒ`ƒFƒbƒN‚µA
-@@@Python2.4, 2.5, 2.6 ‚̉½‚ê‚©‚ª“o˜^Ï‚Ý‚Å‚ ‚é‚©”»’肵‚Ü‚·B
+@@@Python2.6, 2.7 ‚̉½‚ê‚©‚ª“o˜^Ï‚Ý‚Å‚ ‚é‚©”»’肵‚Ü‚·B
@@@‰½‚ê‚à“o˜^‚³‚ê‚Ä‚¢‚È‚¯‚ê‚ÎAƒGƒ‰[ƒƒbƒZ[ƒW‚ð•\Ž¦‚µ‚ÄA
@@@ƒCƒ“ƒXƒg[ƒ‹‚ðI—¹‚µ‚Ü‚·B
-@(2) Python2.4, 2.5, 2.6 ‚̉½‚ê‚©‚ª“o˜^Ï‚Ý‚Å‚ ‚éê‡
+@(2) Python2.6, 2.7 ‚̉½‚ê‚©‚ª“o˜^Ï‚Ý‚Å‚ ‚éê‡
@@EPythonƒCƒ“ƒXƒg[ƒ‹ƒpƒX‚ÌŠeƒfƒBƒŒƒNƒgƒŠ‚Ö omniORBpy ‚ð
@@@ƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·B
@@ -185,7 +171,7 @@
@(1) ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðs‚¤ê‡AƒCƒ“ƒXƒg[ƒ‹ƒtƒ@ƒCƒ‹‚Æ‚Í•Ê‚ÉA
@@@PythonƒXƒNƒŠƒvƒgŽÀsŽž‚É쬂³‚ê‚é.pyc ƒtƒ@ƒCƒ‹A
-@@@Program Files\OpenRTM-aist\1.0\examples\Python ƒfƒBƒŒƒNƒgƒŠA
+@@@Program Files\OpenRTM-aist\1.1\examples\Python ƒfƒBƒŒƒNƒgƒŠA
@@@IDLƒRƒ“ƒpƒCƒ‹‚Å쬂³‚ꂽ Python**\Lib\site-packages\OpenRTM_aist
@@@ƒfƒBƒŒƒNƒgƒŠ‚È‚Ç‚ð휂µ‚Ü‚·B
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/build.cmd
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/build.cmd 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/build.cmd 2015-10-19 04:48:18 UTC (rev 613)
@@ -3,12 +3,25 @@
@rem Variable Settings
@rem usually only %TARGET% might be changed
@rem ------------------------------------------------------------
- at set PATH=%WIX%\bin;%PATH%
+if not DEFINED ARCH set ARCH=x86_64
+if not DEFINED INCLUDE_JRE set INCLUDE_JRE=YES
+ at set PATH_OLD=%PATH%
+ at set INCLUDE_OPENRTP=YES
@set VERSION=1.1.0
@set TARGET=OpenRTM-aist-Python
@set TARGET_WXS=%TARGET%.wxs
@set TARGET_WIXOBJ=%TARGET%.wixobj
- at set TARGET_FULL=%TARGET%-%VERSION%
+echo off
+ at set TARGET_FULL=%TARGET%_%VERSION%-RELEASE_%ARCH%
+if "x%ARCH%" == "xx86_64" (
+ @set PYTHON_DIR=C:\Python27_x64
+ @set OS_ARCH=64-bit OS
+) else (
+ @set PYTHON_DIR=C:\Python27
+ @set OS_ARCH=32-bit OS
+)
+ at set PATH=%WIX%bin;%PYTHON_DIR%;%PATH%
+ at set PRODUCT_NAME=OpenRTM-aist-%VERSION%-RELEASE (%OS_ARCH%) for Python
@rem ------------------------------------------------------------
@rem WixUI Customization Settings
@@ -23,9 +36,14 @@
@rem ------------------------------------------------------------
@set DISTRIBUTION=C:\distribution
@set OPENRTM_PY=%DISTRIBUTION%\OpenRTM-aist-Python-1.1.0
- at set OMNIORB_PY24=%DISTRIBUTION%\omniORBpy-3.0-Python2.4
- at set OMNIORB_PY25=%DISTRIBUTION%\omniORBpy-3.4-Python2.5
- at set OMNIORB_PY26=%DISTRIBUTION%\omniORBpy-3.4-Python2.6
+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 ------------------------------------------------------------
@@ -58,9 +76,8 @@
@rem ============================================================
@rem Make OpenRTM-aist-Python file list
@rem ============================================================
-python omniORBpy24wxs.py
-python omniORBpy25wxs.py
python omniORBpy26wxs.py
+python omniORBpy27wxs.py
python OpenRTMpywxs.py
@rem ------------------------------------------------------------
@@ -69,34 +86,40 @@
@rem RTSystemEditorRCP.exe should be under %RTSE_ROOT%
@rem
@rem ------------------------------------------------------------
-if "x%RTSE_ROOT%" == "x" (
- echo Envrionment variable "RTSE_ROOT" is not set. Abort.
- goto END
-)
-if not exist "%RTSE_ROOT%\RTSystemEditorRCP.exe" (
- echo RTSystemEditorRCP.exe does not found. Abort
- goto END
-)
-set INCLUDE_RTSE=YES
-set INCLUDE_OPENRTP=YES
+ 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 )
-if not exist OpenRTP_inc.wxs (
- cd OpenRTP
- copy ..\makewxs.py .
- copy ..\yat.py .
- echo Generating OpenRTP_inc.wxs......
- at rem openrtpwxs.py
- at rem set PYTHONPATH=%TMP_PYTHONPATH%
- copy OpenRTP_inc.wxs ..
- del makewxs.py yat.py
- del *.yaml
- cd ..
-)
-
@rem ============================================================
@rem compile wxs file and link msi
@rem ============================================================
-candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=1033 -dcodepage=1252
+if "x%ARCH%" == "xx86_64" (
+ candle.exe -arch x64 %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=1033 -dcodepage=1252
+) else (
+ candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=1033 -dcodepage=1252
+)
light.exe -ext WixUIExtension -loc WixUI_en-us.wxl ^
-out %TARGET_FULL%.msi %TARGET_WIXOBJ% %WIXUI_RTM_WIXOBJ%
@@ -113,7 +136,11 @@
@rem ------------------------------------------------------------
@rem compile wxs file and link msi
@rem
- candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=!LANG[%%i]! -dcodepage=!CODE[%%i]!
+ if "x%ARCH%" == "xx86_64" (
+ candle.exe -arch x64 %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=!LANG[%%i]! -dcodepage=!CODE[%%i]!
+ ) else (
+ candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=!LANG[%%i]! -dcodepage=!CODE[%%i]!
+ )
if exist WixUI_!LC[%%i]!.wxl (
light.exe -ext WixUIExtension -ext WixUtilExtension -loc WixUI_!LC[%%i]!.wxl ^
@@ -150,6 +177,7 @@
:END
del *.yaml
+ at set PATH=%PATH_OLD%
-pause;
+ at rem pause;
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/idlcompile.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/idlcompile.py 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/idlcompile.py 2015-10-19 04:48:18 UTC (rev 613)
@@ -2,14 +2,14 @@
#
# @brief IDL Compile for OpenRTM-aist-Python
#
-# Target Python version 2.4, 2.5, 2.6
+# Target Python version 2.6, 2.7
#
import os, glob, sys, _winreg
##--------------------------------------------------------------------
## commandline argument
-## argvs[1]: Python version (2.4, 2.5, 2.6)
+## argvs[1]: Python version (2.6, 2.7)
## argvs[2]: OpenRTM examples Path
##--------------------------------------------------------------------
argvs = sys.argv
@@ -87,34 +87,22 @@
##--------------------------------------------------------------------
-## Python 2.4
+## Python 2.6
##--------------------------------------------------------------------
-if (inst_ver == "all") or (inst_ver == "2.4"):
- py_ver = "2.4"
- py_key = "SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath"
+if (inst_ver == "all") or (inst_ver == "2.6"):
+ py_ver = "2.6"
+ py_key = "SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath"
ret = idl_compile(py_ver, py_key, examples_path)
if ret == False:
print "Python %s Not Installed." % py_ver
-
##--------------------------------------------------------------------
-## Python 2.5
+## Python 2.7
##--------------------------------------------------------------------
-if (inst_ver == "all") or (inst_ver == "2.5"):
- py_ver = "2.5"
- py_key = "SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath"
+if (inst_ver == "all") or (inst_ver == "2.7"):
+ py_ver = "2.7"
+ py_key = "SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath"
ret = idl_compile(py_ver, py_key, examples_path)
if ret == False:
print "Python %s Not Installed." % py_ver
-
-##--------------------------------------------------------------------
-## Python 2.6
-##--------------------------------------------------------------------
-if (inst_ver == "all") or (inst_ver == "2.6"):
- py_ver = "2.6"
- py_key = "SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath"
- ret = idl_compile(py_ver, py_key, examples_path)
- if ret == False:
- print "Python %s Not Installed." % py_ver
-
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh 2015-10-19 04:48:18 UTC (rev 613)
@@ -14,15 +14,10 @@
#---------------------------------------
set_package_list()
{
- if [ "$code_name" = "sarge" ] || [ "$code_name" = "etch" ] || [ "$code_name" = "lenny" ]; then
- omnipy="python python-omniorb2-omg python-omniorb2 omniidl4-python omniorb4-nameserver"
- elif [ "$code_name" = "squeeze" ]; then # 6.0
- omnipy="python python-omniorb-omg python-omniorb omniidl-python omniorb4-nameserver"
- else
- omnipy="python python-omniorb-omg python-omniorb omniidl-python omniorb-nameserver"
- fi
+ omnipy="python-omniorb-omg python-omniorb omniidl-python"
+ devel="python"
openrtm="openrtm-aist-python openrtm-aist-python-example"
- packages="$omnipy $openrtm"
+ packages="$devel $omnipy $openrtm"
u_packages="$omnipy $openrtm "
}
@@ -92,7 +87,7 @@
# リãƒã‚¸ãƒˆãƒªã‚µãƒ¼ãƒ
#---------------------------------------
create_srclist () {
- openrtm_repo="deb http://www.openrtm.org/pub/Linux/debian/ $code_name main"
+ openrtm_repo="deb http://openrtm.org/pub/Linux/debian/ $code_name main"
}
#---------------------------------------
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh 2015-10-19 04:48:18 UTC (rev 613)
@@ -17,16 +17,12 @@
# パッケージリスト
#---------------------------------------
version_num=`cat /etc/fedora-release | awk '/Fedora/{print $3}' -`
-if [ $version_num -ge 16 ] && [ $version_num -le 18 ]; then
- # ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ16,17,18ã®å ´åˆ
- omnipy="python python-devel openssl-devel doxygen omniORB-servers omniORBpy omniORBpy-devel omniORBpy-standard"
-else
- omnipy="python omniORB-servers omniORBpy omniORBpy-devel omniORBpy-standard"
-fi
+omnipy="omniORB-servers omniORBpy omniORBpy-devel omniORBpy-standard"
+devel="python"
openrtm="OpenRTM-aist-Python OpenRTM-aist-Python-example"
-packages="$omnipy $openrtm"
+packages="$devel $omnipy $openrtm"
+u_packages="$omnipy $openrtm "
-
#----------------------------------------
# root ã‹ã©ã†ã‹ã‚’ãƒã‚§ãƒƒã‚¯
#----------------------------------------
@@ -59,7 +55,7 @@
[openrtm]
name=Fedora \$releasever - \$basearch
failovermethod=priority
-baseurl=http://www.openrtm.org/pub/Linux/Fedora/releases/\$releasever/Fedora/\$basearch/os/Packages
+baseurl=http://openrtm.org/pub/Linux/Fedora/releases/\$releasever/Fedora/\$basearch/os/Packages
enabled=1
gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
@@ -145,7 +141,7 @@
#---------------------------------------
check_root
if test "x$1" = "x-u" ; then
- uninstall_packages `reverse $packages`
+ uninstall_packages `reverse $u_packages`
else
create_repo
install_packages $packages
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh 2015-10-19 04:48:18 UTC (rev 613)
@@ -26,14 +26,10 @@
#---------------------------------------
set_package_list()
{
- if [ "$code_name" = "hardy" ] || [ $code_name = "lucid" ]; then
- omnipy="python python-omniorb2-omg omniidl4-python omniorb4-nameserver"
- else
- # oneiric, precise, quantal
- omnipy="python python-pyorbit-omg omniidl-python omniorb-nameserver"
- fi
+ omnipy="python-pyorbit-omg omniidl-python"
+ devel="python"
openrtm="openrtm-aist-python$rtm_ver openrtm-aist-python-example$rtm_ver"
- packages="$omnipy $openrtm"
+ packages="$devel $omnipy $openrtm"
u_packages="$omnipy $openrtm "
}
@@ -104,7 +100,7 @@
# リãƒã‚¸ãƒˆãƒªã‚µãƒ¼ãƒ
#---------------------------------------
create_srclist () {
- openrtm_repo="deb http://www.openrtm.org/pub/Linux/ubuntu/ $code_name main"
+ openrtm_repo="deb http://openrtm.org/pub/Linux/ubuntu/ $code_name main"
}
#---------------------------------------
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy26_inc.wxs.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy26_inc.wxs.in 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy26_inc.wxs.in 2015-10-19 04:48:18 UTC (rev 613)
@@ -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: branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy26wxs.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy26wxs.py 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy26wxs.py 2015-10-19 04:48:18 UTC (rev 613)
@@ -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,6 +20,7 @@
import makewxs
data = [
+ ("", "THIS_IS_OMNIORBPY_3_5"),
("bin/x86_win32", "*.dll *.exe"),
("bin/dll", "*.dll"),
("lib/x86_win32", "*.pyd"),
@@ -122,8 +123,13 @@
## Resource path
##
base_dir = os.getenv("OMNIORB_PY26")
+arch = os.getenv("ARCH")
if base_dir == None:
- base_dir = "C:\\distribution\\omniORBpy-3.4-Python2.6\\"
+ 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 += "\\"
Copied: branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy27_inc.wxs.in (from rev 605, trunk/OpenRTM-aist-Python/installer/omniORBpy27_inc.wxs.in)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy27_inc.wxs.in (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy27_inc.wxs.in 2015-10-19 04:48:18 UTC (rev 613)
@@ -0,0 +1,1428 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+ <!-- omniORBpy3.7 supports -->
+ <!-- Python27 directory -->
+ <Component Id="Py27BinX86_win32" Guid="{% Py27BinX86_win32.GUID %}">
+ {% for file in Py27BinX86_win32.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+
+ <!-- Lib -->
+ <Directory Id="py27_lib" Name="Lib">
+
+ <!-- site-packages -->
+ <Directory Id="py27_lib_python" Name="site-packages">
+ <Component Id="Py27LibX86_win32" Guid="{% Py27LibX86_win32.GUID %}">
+ {% for file in Py27LibX86_win32.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ <Component Id="Py27LibPython" Guid="{% Py27LibPython.GUID %}">
+ {% for file in Py27LibPython.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+
+ <!-- choice of dll -->
+ <Component Id="Py27BinDll" Guid="{% Py27BinDll.GUID %}">
+ {% for file in Py27BinDll.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+
+ <!-- CosNaming -->
+ <Directory Id="py27_lib_python_CosNaming" Name="CosNaming">
+ <Component Id="Py27LibPythonCosnaming"
+ Guid="{% Py27LibPythonCosnaming.GUID %}">
+ <RemoveFile Id='Py27LibPythonCosnaming' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonCosnaming_f' On='uninstall' />
+ {% for file in Py27LibPythonCosnaming.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNaming__POA -->
+ <Directory Id="py27_lib_python_CosNaming__POA" Name="CosNaming__POA">
+ <Component Id="Py27LibPythonCosnaming__poa"
+ Guid="{% Py27LibPythonCosnaming__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonCosnaming__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonCosnaming__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonCosnaming__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- omniidl -->
+ <Directory Id="py27_lib_python_omniidl" Name="omniidl">
+ <Component Id="Py27LibPythonOmniidl"
+ Guid="{% Py27LibPythonOmniidl.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniidl' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniidl_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniidl.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- omniidl_be -->
+ <Directory Id="py27_lib_python_omniidl_be" Name="omniidl_be">
+ <Component Id="Py27LibPythonOmniidl_be"
+ Guid="{% Py27LibPythonOmniidl_be.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniidl_be' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniidl_be_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniidl_be.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- omniORB -->
+ <Directory Id="py27_lib_python_omniORB" Name="omniORB">
+ <Component Id="Py27LibPythonOmniorb"
+ Guid="{% Py27LibPythonOmniorb.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorb' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorb_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorb.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+
+ <!-- COS -->
+ <Directory Id="py27_lib_python_omniORB_COS" Name="COS">
+ <Component Id="Py27LibPythonOmniorbCos"
+ Guid="{% Py27LibPythonOmniorbCos.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCos' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCos_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCos.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+
+ <!-- CosCollection -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosCollection"
+ Name="CosCollection">
+ <Component Id="Py27LibPythonOmniorbCosCoscollection"
+ Guid="{% Py27LibPythonOmniorbCosCoscollection.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoscollection' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoscollection_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoscollection.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosCollection__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosCollection__POA"
+ Name="CosCollection__POA">
+ <Component Id="Py27LibPythonOmniorbCosCoscollection__poa"
+ Guid="{% Py27LibPythonOmniorbCosCoscollection__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoscollection__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoscollection__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoscollection__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosCompoundLifeCycle -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosCompoundLifeCycle"
+ Name="CosCompoundLifeCycle">
+ <Component Id="Py27LibPythonOmniorbCosCoscompoundlifecycle"
+ Guid="{% Py27LibPythonOmniorbCosCoscompoundlifecycle.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoscompoundlifecycle' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoscompoundlifecycle_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoscompoundlifecycle.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosCompoundLifeCycle__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosCompoundLifeCycle__POA"
+ Name="CosCompoundLifeCycle__POA">
+ <Component Id="Py27LibPythonOmniorbCosCoscompoundlifecycle__poa"
+ Guid="{% Py27LibPythonOmniorbCosCoscompoundlifecycle__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoscompoundlifecycle__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoscompoundlifecycle__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoscompoundlifecycle__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosContainment -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosContainment"
+ Name="CosContainment">
+ <Component Id="Py27LibPythonOmniorbCosCoscontainment"
+ Guid="{% Py27LibPythonOmniorbCosCoscontainment.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoscontainment' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoscontainment_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoscontainment.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosContainment__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosContainment__POA"
+ Name="CosContainment__POA">
+ <Component Id="Py27LibPythonOmniorbCosCoscontainment__poa"
+ Guid="{% Py27LibPythonOmniorbCosCoscontainment__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoscontainment__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoscontainment__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoscontainment__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosEventChannelAdmin -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosEventChannelAdmin"
+ Name="CosEventChannelAdmin">
+ <Component Id="Py27LibPythonOmniorbCosCoseventchanneladmin"
+ Guid="{% Py27LibPythonOmniorbCosCoseventchanneladmin.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoseventchanneladmin' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoseventchanneladmin_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoseventchanneladmin.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosEventChannelAdmin__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosEventChannelAdmin__POA"
+ Name="CosEventChannelAdmin__POA">
+ <Component Id="Py27LibPythonOmniorbCosCoseventchanneladmin__poa"
+ Guid="{% Py27LibPythonOmniorbCosCoseventchanneladmin__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoseventchanneladmin__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoseventchanneladmin__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoseventchanneladmin__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosEventComm -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosEventComm"
+ Name="CosEventComm">
+ <Component Id="Py27LibPythonOmniorbCosCoseventcomm"
+ Guid="{% Py27LibPythonOmniorbCosCoseventcomm.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoseventcomm' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoseventcomm_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoseventcomm.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosEventComm__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosEventComm__POA"
+ Name="CosEventComm__POA">
+ <Component Id="Py27LibPythonOmniorbCosCoseventcomm__poa"
+ Guid="{% Py27LibPythonOmniorbCosCoseventcomm__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoseventcomm__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoseventcomm__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoseventcomm__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosExternalization -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosExternalization"
+ Name="CosExternalization">
+ <Component Id="Py27LibPythonOmniorbCosCosexternalization"
+ Guid="{% Py27LibPythonOmniorbCosCosexternalization.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosexternalization' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosexternalization_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosexternalization.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosExternalizationContainment -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosExternalizationContainment"
+ Name="CosExternalizationContainment">
+ <Component Id="Py27LibPythonOmniorbCosCosexternalizationcontainment"
+ Guid="{% Py27LibPythonOmniorbCosCosexternalizationcontainment.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosexternalizationcontainment' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosexternalizationcontainment_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosexternalizationcontainment.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosExternalizationContainment__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosExternalizationContainment__POA"
+ Name="CosExternalizationContainment__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosexternalizationcontainment__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosexternalizationcontainment__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosexternalizationcontainment__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosexternalizationcontainment__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosexternalizationcontainment__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosExternalizationReference -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosExternalizationReference"
+ Name="CosExternalizationReference">
+ <Component Id="Py27LibPythonOmniorbCosCosexternalizationreference"
+ Guid="{% Py27LibPythonOmniorbCosCosexternalizationreference.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosexternalizationreference' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosexternalizationreference_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosexternalizationreference.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosExternalizationReference__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosExternalizationReference__POA"
+ Name="CosExternalizationReference__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosexternalizationreference__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosexternalizationreference__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosexternalizationreference__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosexternalizationreference__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosexternalizationreference__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosExternalization__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosExternalization__POA"
+ Name="CosExternalization__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosexternalization__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosexternalization__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosexternalization__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosexternalization__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosexternalization__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosGraphs -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosGraphs"
+ Name="CosGraphs">
+ <Component Id="Py27LibPythonOmniorbCosCosgraphs"
+ Guid="{% Py27LibPythonOmniorbCosCosgraphs.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosgraphs' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosgraphs_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosgraphs.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosGraphs__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosGraphs__POA"
+ Name="CosGraphs__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosgraphs__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosgraphs__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosgraphs__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosgraphs__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosgraphs__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosLifeCycle -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosLifeCycle"
+ Name="CosLifeCycle">
+ <Component Id="Py27LibPythonOmniorbCosCoslifecycle"
+ Guid="{% Py27LibPythonOmniorbCosCoslifecycle.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoslifecycle' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoslifecycle_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoslifecycle.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosLifeCycleContainment -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosLifeCycleContainment"
+ Name="CosLifeCycleContainment">
+ <Component Id="Py27LibPythonOmniorbCosCoslifecyclecontainment"
+ Guid="{% Py27LibPythonOmniorbCosCoslifecyclecontainment.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoslifecyclecontainment' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoslifecyclecontainment_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoslifecyclecontainment.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosLifeCycleContainment__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosLifeCycleContainment__POA"
+ Name="CosLifeCycleContainment__POA">
+ <Component Id="Py27LibPythonOmniorbCosCoslifecyclecontainment__poa"
+ Guid="{% Py27LibPythonOmniorbCosCoslifecyclecontainment__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoslifecyclecontainment__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoslifecyclecontainment__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoslifecyclecontainment__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosLifeCycleReference -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosLifeCycleReference"
+ Name="CosLifeCycleReference">
+ <Component Id="Py27LibPythonOmniorbCosCoslifecyclereference"
+ Guid="{% Py27LibPythonOmniorbCosCoslifecyclereference.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoslifecyclereference' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoslifecyclereference_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoslifecyclereference.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosLifeCycleReference__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosLifeCycleReference__POA"
+ Name="CosLifeCycleReference__POA">
+ <Component Id="Py27LibPythonOmniorbCosCoslifecyclereference__poa"
+ Guid="{% Py27LibPythonOmniorbCosCoslifecyclereference__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoslifecyclereference__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoslifecyclereference__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoslifecyclereference__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosLifeCycle__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosLifeCycle__POA"
+ Name="CosLifeCycle__POA">
+ <Component Id="Py27LibPythonOmniorbCosCoslifecycle__poa"
+ Guid="{% Py27LibPythonOmniorbCosCoslifecycle__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCoslifecycle__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCoslifecycle__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCoslifecycle__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNaming -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosNaming"
+ Name="CosNaming">
+ <Component Id="Py27LibPythonOmniorbCosCosnaming"
+ Guid="{% Py27LibPythonOmniorbCosCosnaming.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosnaming' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosnaming_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosnaming.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNaming__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosNaming__POA"
+ Name="CosNaming__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosnaming__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosnaming__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosnaming__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosnaming__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosnaming__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNotification -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosNotification"
+ Name="CosNotification">
+ <Component Id="Py27LibPythonOmniorbCosCosnotification"
+ Guid="{% Py27LibPythonOmniorbCosCosnotification.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosnotification' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosnotification_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosnotification.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNotification__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosNotification__POA"
+ Name="CosNotification__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosnotification__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosnotification__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosnotification__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosnotification__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosnotification__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNotifyChannelAdmin -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosNotifyChannelAdmin"
+ Name="CosNotifyChannelAdmin">
+ <Component Id="Py27LibPythonOmniorbCosCosnotifychanneladmin"
+ Guid="{% Py27LibPythonOmniorbCosCosnotifychanneladmin.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosnotifychanneladmin' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosnotifychanneladmin_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosnotifychanneladmin.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNotifyChannelAdmin__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosNotifyChannelAdmin__POA"
+ Name="CosNotifyChannelAdmin__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosnotifychanneladmin__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosnotifychanneladmin__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosnotifychanneladmin__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosnotifychanneladmin__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosnotifychanneladmin__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNotifyComm -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosNotifyComm"
+ Name="CosNotifyComm">
+ <Component Id="Py27LibPythonOmniorbCosCosnotifycomm"
+ Guid="{% Py27LibPythonOmniorbCosCosnotifycomm.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosnotifycomm' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosnotifycomm_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosnotifycomm.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNotifyComm__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosNotifyComm__POA"
+ Name="CosNotifyComm__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosnotifycomm__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosnotifycomm__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosnotifycomm__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosnotifycomm__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosnotifycomm__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNotifyFilter -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosNotifyFilter"
+ Name="CosNotifyFilter">
+ <Component Id="Py27LibPythonOmniorbCosCosnotifyfilter"
+ Guid="{% Py27LibPythonOmniorbCosCosnotifyfilter.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosnotifyfilter' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosnotifyfilter_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosnotifyfilter.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosNotifyFilter__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosNotifyFilter__POA"
+ Name="CosNotifyFilter__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosnotifyfilter__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosnotifyfilter__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosnotifyfilter__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosnotifyfilter__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosnotifyfilter__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosObjectIdentity -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosObjectIdentity"
+ Name="CosObjectIdentity">
+ <Component Id="Py27LibPythonOmniorbCosCosobjectidentity"
+ Guid="{% Py27LibPythonOmniorbCosCosobjectidentity.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosobjectidentity' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosobjectidentity_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosobjectidentity.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosObjectIdentity__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosObjectIdentity__POA"
+ Name="CosObjectIdentity__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosobjectidentity__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosobjectidentity__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosobjectidentity__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosobjectidentity__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosobjectidentity__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistenceDDO -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistenceDDO"
+ Name="CosPersistenceDDO">
+ <Component Id="Py27LibPythonOmniorbCosCospersistenceddo"
+ Guid="{% Py27LibPythonOmniorbCosCospersistenceddo.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistenceddo' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistenceddo_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistenceddo.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistenceDDO__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistenceDDO__POA"
+ Name="CosPersistenceDDO__POA">
+ <Component Id="Py27LibPythonOmniorbCosCospersistenceddo__poa"
+ Guid="{% Py27LibPythonOmniorbCosCospersistenceddo__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistenceddo__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistenceddo__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistenceddo__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistenceDS_CLI -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistenceDS_CLI"
+ Name="CosPersistenceDS_CLI">
+ <Component Id="Py27LibPythonOmniorbCosCospersistenceds_cli"
+ Guid="{% Py27LibPythonOmniorbCosCospersistenceds_cli.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistenceds_cli' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistenceds_cli_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistenceds_cli.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistenceDS_CLI__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistenceDS_CLI__POA"
+ Name="CosPersistenceDS_CLI__POA">
+ <Component Id="Py27LibPythonOmniorbCosCospersistenceds_cli__poa"
+ Guid="{% Py27LibPythonOmniorbCosCospersistenceds_cli__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistenceds_cli__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistenceds_cli__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistenceds_cli__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistencePDS -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistencePDS"
+ Name="CosPersistencePDS">
+ <Component Id="Py27LibPythonOmniorbCosCospersistencepds"
+ Guid="{% Py27LibPythonOmniorbCosCospersistencepds.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistencepds' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistencepds_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistencepds.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistencePDS_DA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistencePDS_DA"
+ Name="CosPersistencePDS_DA">
+ <Component Id="Py27LibPythonOmniorbCosCospersistencepds_da"
+ Guid="{% Py27LibPythonOmniorbCosCospersistencepds_da.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistencepds_da' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistencepds_da_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistencepds_da.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistencePDS_DA__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistencePDS_DA__POA"
+ Name="CosPersistencePDS_DA__POA">
+ <Component Id="Py27LibPythonOmniorbCosCospersistencepds_da__poa"
+ Guid="{% Py27LibPythonOmniorbCosCospersistencepds_da__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistencepds_da__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistencepds_da__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistencepds_da__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistencePDS__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistencePDS__POA"
+ Name="CosPersistencePDS__POA">
+ <Component Id="Py27LibPythonOmniorbCosCospersistencepds__poa"
+ Guid="{% Py27LibPythonOmniorbCosCospersistencepds__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistencepds__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistencepds__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistencepds__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistencePID -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistencePID"
+ Name="CosPersistencePID">
+ <Component Id="Py27LibPythonOmniorbCosCospersistencepid"
+ Guid="{% Py27LibPythonOmniorbCosCospersistencepid.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistencepid' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistencepid_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistencepid.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistencePID__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistencePID__POA"
+ Name="CosPersistencePID__POA">
+ <Component Id="Py27LibPythonOmniorbCosCospersistencepid__poa"
+ Guid="{% Py27LibPythonOmniorbCosCospersistencepid__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistencepid__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistencepid__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistencepid__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistencePO -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistencePO"
+ Name="CosPersistencePO">
+ <Component Id="Py27LibPythonOmniorbCosCospersistencepo"
+ Guid="{% Py27LibPythonOmniorbCosCospersistencepo.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistencepo' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistencepo_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistencepo.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistencePOM -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistencePOM"
+ Name="CosPersistencePOM">
+ <Component Id="Py27LibPythonOmniorbCosCospersistencepom"
+ Guid="{% Py27LibPythonOmniorbCosCospersistencepom.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistencepom' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistencepom_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistencepom.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistencePOM__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistencePOM__POA"
+ Name="CosPersistencePOM__POA">
+ <Component Id="Py27LibPythonOmniorbCosCospersistencepom__poa"
+ Guid="{% Py27LibPythonOmniorbCosCospersistencepom__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistencepom__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistencepom__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistencepom__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPersistencePO__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPersistencePO__POA"
+ Name="CosPersistencePO__POA">
+ <Component Id="Py27LibPythonOmniorbCosCospersistencepo__poa"
+ Guid="{% Py27LibPythonOmniorbCosCospersistencepo__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospersistencepo__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospersistencepo__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospersistencepo__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPropertyService -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPropertyService"
+ Name="CosPropertyService">
+ <Component Id="Py27LibPythonOmniorbCosCospropertyservice"
+ Guid="{% Py27LibPythonOmniorbCosCospropertyservice.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospropertyservice' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospropertyservice_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospropertyservice.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosPropertyService__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosPropertyService__POA"
+ Name="CosPropertyService__POA">
+ <Component Id="Py27LibPythonOmniorbCosCospropertyservice__poa"
+ Guid="{% Py27LibPythonOmniorbCosCospropertyservice__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCospropertyservice__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCospropertyservice__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCospropertyservice__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosQuery -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosQuery"
+ Name="CosQuery">
+ <Component Id="Py27LibPythonOmniorbCosCosquery"
+ Guid="{% Py27LibPythonOmniorbCosCosquery.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosquery' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosquery_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosquery.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosQueryCollection -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosQueryCollection"
+ Name="CosQueryCollection">
+ <Component Id="Py27LibPythonOmniorbCosCosquerycollection"
+ Guid="{% Py27LibPythonOmniorbCosCosquerycollection.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosquerycollection' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosquerycollection_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosquerycollection.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosQueryCollection__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosQueryCollection__POA"
+ Name="CosQueryCollection__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosquerycollection__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosquerycollection__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosquerycollection__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosquerycollection__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosquerycollection__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosQuery__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosQuery__POA"
+ Name="CosQuery__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosquery__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosquery__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosquery__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosquery__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosquery__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosReference -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosReference"
+ Name="CosReference">
+ <Component Id="Py27LibPythonOmniorbCosCosreference"
+ Guid="{% Py27LibPythonOmniorbCosCosreference.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosreference' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosreference_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosreference.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosReference__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosReference__POA"
+ Name="CosReference__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosreference__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosreference__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosreference__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosreference__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosreference__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosRelationships -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosRelationships"
+ Name="CosRelationships">
+ <Component Id="Py27LibPythonOmniorbCosCosrelationships"
+ Guid="{% Py27LibPythonOmniorbCosCosrelationships.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosrelationships' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosrelationships_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosrelationships.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosRelationships__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosRelationships__POA"
+ Name="CosRelationships__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosrelationships__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosrelationships__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosrelationships__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosrelationships__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosrelationships__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosStream -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosStream"
+ Name="CosStream">
+ <Component Id="Py27LibPythonOmniorbCosCosstream"
+ Guid="{% Py27LibPythonOmniorbCosCosstream.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosstream' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosstream_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosstream.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosStream__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosStream__POA"
+ Name="CosStream__POA">
+ <Component Id="Py27LibPythonOmniorbCosCosstream__poa"
+ Guid="{% Py27LibPythonOmniorbCosCosstream__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCosstream__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCosstream__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCosstream__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTime -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTime"
+ Name="CosTime">
+ <Component Id="Py27LibPythonOmniorbCosCostime"
+ Guid="{% Py27LibPythonOmniorbCosCostime.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostime' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostime_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostime.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTimerEvent -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTimerEvent"
+ Name="CosTimerEvent">
+ <Component Id="Py27LibPythonOmniorbCosCostimerevent"
+ Guid="{% Py27LibPythonOmniorbCosCostimerevent.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostimerevent' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostimerevent_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostimerevent.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTimerEvent__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTimerEvent__POA"
+ Name="CosTimerEvent__POA">
+ <Component Id="Py27LibPythonOmniorbCosCostimerevent__poa"
+ Guid="{% Py27LibPythonOmniorbCosCostimerevent__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostimerevent__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostimerevent__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostimerevent__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTime__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTime__POA"
+ Name="CosTime__POA">
+ <Component Id="Py27LibPythonOmniorbCosCostime__poa"
+ Guid="{% Py27LibPythonOmniorbCosCostime__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostime__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostime__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostime__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTrading -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTrading"
+ Name="CosTrading">
+ <Component Id="Py27LibPythonOmniorbCosCostrading"
+ Guid="{% Py27LibPythonOmniorbCosCostrading.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostrading' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostrading_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostrading.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTradingDynamic -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTradingDynamic"
+ Name="CosTradingDynamic">
+ <Component Id="Py27LibPythonOmniorbCosCostradingdynamic"
+ Guid="{% Py27LibPythonOmniorbCosCostradingdynamic.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostradingdynamic' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostradingdynamic_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostradingdynamic.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTradingDynamic__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTradingDynamic__POA"
+ Name="CosTradingDynamic__POA">
+ <Component Id="Py27LibPythonOmniorbCosCostradingdynamic__poa"
+ Guid="{% Py27LibPythonOmniorbCosCostradingdynamic__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostradingdynamic__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostradingdynamic__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostradingdynamic__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTradingRepos -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTradingRepos"
+ Name="CosTradingRepos">
+ <Component Id="Py27LibPythonOmniorbCosCostradingrepos"
+ Guid="{% Py27LibPythonOmniorbCosCostradingrepos.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostradingrepos' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostradingrepos_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostradingrepos.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTradingRepos__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTradingRepos__POA"
+ Name="CosTradingRepos__POA">
+ <Component Id="Py27LibPythonOmniorbCosCostradingrepos__poa"
+ Guid="{% Py27LibPythonOmniorbCosCostradingrepos__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostradingrepos__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostradingrepos__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostradingrepos__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTrading__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTrading__POA"
+ Name="CosTrading__POA">
+ <Component Id="Py27LibPythonOmniorbCosCostrading__poa"
+ Guid="{% Py27LibPythonOmniorbCosCostrading__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostrading__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostrading__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostrading__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTypedEventChannelAdmin -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTypedEventChannelAdmin"
+ Name="CosTypedEventChannelAdmin">
+ <Component Id="Py27LibPythonOmniorbCosCostypedeventchanneladmin"
+ Guid="{% Py27LibPythonOmniorbCosCostypedeventchanneladmin.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostypedeventchanneladmin' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostypedeventchanneladmin_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostypedeventchanneladmin.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTypedEventChannelAdmin__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTypedEventChannelAdmin__POA"
+ Name="CosTypedEventChannelAdmin__POA">
+ <Component Id="Py27LibPythonOmniorbCosCostypedeventchanneladmin__poa"
+ Guid="{% Py27LibPythonOmniorbCosCostypedeventchanneladmin__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostypedeventchanneladmin__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostypedeventchanneladmin__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostypedeventchanneladmin__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTypedEventComm -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTypedEventComm"
+ Name="CosTypedEventComm">
+ <Component Id="Py27LibPythonOmniorbCosCostypedeventcomm"
+ Guid="{% Py27LibPythonOmniorbCosCostypedeventcomm.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostypedeventcomm' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostypedeventcomm_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostypedeventcomm.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTypedEventComm__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTypedEventComm__POA"
+ Name="CosTypedEventComm__POA">
+ <Component Id="Py27LibPythonOmniorbCosCostypedeventcomm__poa"
+ Guid="{% Py27LibPythonOmniorbCosCostypedeventcomm__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostypedeventcomm__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostypedeventcomm__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostypedeventcomm__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTypedNotifyChannelAdmin -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTypedNotifyChannelAdmin"
+ Name="CosTypedNotifyChannelAdmin">
+ <Component Id="Py27LibPythonOmniorbCosCostypednotifychanneladmin"
+ Guid="{% Py27LibPythonOmniorbCosCostypednotifychanneladmin.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostypednotifychanneladmin' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostypednotifychanneladmin_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostypednotifychanneladmin.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTypedNotifyChannelAdmin__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTypedNotifyChannelAdmin__POA"
+ Name="CosTypedNotifyChannelAdmin__POA">
+ <Component Id="Py27LibPythonOmniorbCosCostypednotifychanneladmin__poa"
+ Guid="{% Py27LibPythonOmniorbCosCostypednotifychanneladmin__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostypednotifychanneladmin__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostypednotifychanneladmin__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostypednotifychanneladmin__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTypedNotifyComm -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTypedNotifyComm"
+ Name="CosTypedNotifyComm">
+ <Component Id="Py27LibPythonOmniorbCosCostypednotifycomm"
+ Guid="{% Py27LibPythonOmniorbCosCostypednotifycomm.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostypednotifycomm' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostypednotifycomm_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostypednotifycomm.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- CosTypedNotifyComm__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_CosTypedNotifyComm__POA"
+ Name="CosTypedNotifyComm__POA">
+ <Component Id="Py27LibPythonOmniorbCosCostypednotifycomm__poa"
+ Guid="{% Py27LibPythonOmniorbCosCostypednotifycomm__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosCostypednotifycomm__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosCostypednotifycomm__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosCostypednotifycomm__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- LifeCycleService -->
+ <Directory Id="py27_lib_python_omniORB_COS_LifeCycleService"
+ Name="LifeCycleService">
+ <Component Id="Py27LibPythonOmniorbCosLifecycleservice"
+ Guid="{% Py27LibPythonOmniorbCosLifecycleservice.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosLifecycleservice' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosLifecycleservice_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosLifecycleservice.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- LifeCycleService__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_LifeCycleService__POA"
+ Name="LifeCycleService__POA">
+ <Component Id="Py27LibPythonOmniorbCosLifecycleservice__poa"
+ Guid="{% Py27LibPythonOmniorbCosLifecycleservice__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosLifecycleservice__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosLifecycleservice__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosLifecycleservice__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- RDITestTypes -->
+ <Directory Id="py27_lib_python_omniORB_COS_RDITestTypes"
+ Name="RDITestTypes">
+ <Component Id="Py27LibPythonOmniorbCosRditesttypes"
+ Guid="{% Py27LibPythonOmniorbCosRditesttypes.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosRditesttypes' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosRditesttypes_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosRditesttypes.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- RDITestTypes__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_RDITestTypes__POA"
+ Name="RDITestTypes__POA">
+ <Component Id="Py27LibPythonOmniorbCosRditesttypes__poa"
+ Guid="{% Py27LibPythonOmniorbCosRditesttypes__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosRditesttypes__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosRditesttypes__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosRditesttypes__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- TimeBase -->
+ <Directory Id="py27_lib_python_omniORB_COS_TimeBase"
+ Name="TimeBase">
+ <Component Id="Py27LibPythonOmniorbCosTimebase"
+ Guid="{% Py27LibPythonOmniorbCosTimebase.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosTimebase' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosTimebase_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosTimebase.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ <!-- TimeBase__POA -->
+ <Directory Id="py27_lib_python_omniORB_COS_TimeBase__POA"
+ Name="TimeBase__POA">
+ <Component Id="Py27LibPythonOmniorbCosTimebase__poa"
+ Guid="{% Py27LibPythonOmniorbCosTimebase__poa.GUID %}">
+ <RemoveFile Id='Py27LibPythonOmniorbCosTimebase__poa' On='uninstall' Name='*.pyc' />
+ <RemoveFolder Id='Py27LibPythonOmniorbCosTimebase__poa_f' On='uninstall' />
+ {% for file in Py27LibPythonOmniorbCosTimebase__poa.Files %}
+ <File Id="{% file.Id %}" Name="{% file.Name %}"
+ DiskId="1" Source="{% file.Source %}">
+ </File>
+ {% endfor %}
+ </Component>
+ </Directory>
+
+ </Directory>
+ <!-- end of COS -->
+
+ </Directory>
+ <!-- end of omniORB -->
+
+ </Directory>
+ <!-- end of site-packages -->
+
+ </Directory>
+ <!-- end of Lib -->
+
+</Include>
+
Copied: branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy27wxs.py (from rev 605, trunk/OpenRTM-aist-Python/installer/omniORBpy27wxs.py)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy27wxs.py (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/omniORBpy27wxs.py 2015-10-19 04:48:18 UTC (rev 613)
@@ -0,0 +1,199 @@
+#!/usr/bin/env python
+#
+# @brief WiX wxs file generator for omniORBpy3.7-Python2.7
+# @date $Date$
+# @author Norkai Ando <n-ando at aist.go.jp>
+#
+# Copyright (C) 2010
+# Noriaki Ando
+# Intelligent Systems Research Institute,
+# National Institute of
+# Advanced Industrial Science and Technology (AIST), Japan
+# All rights reserved.
+#
+# $Id$
+#
+
+import os
+import shutil
+import glob
+import makewxs
+
+data = [
+ ("", "THIS_IS_OMNIORBPY_3_7"),
+ ("bin/x86_win32", "*.dll *.exe"),
+ ("bin/dll", "*.dll"),
+ ("lib/x86_win32", "*.pyd"),
+ ("lib/python/", "*.py"),
+ ("lib/python/CosNaming", "*.py"),
+ ("lib/python/CosNaming__POA", "*.py"),
+ ("lib/python/omniidl", "*.py"),
+ ("lib/python/omniidl_be", "*.py"),
+ ("lib/python/omniORB", "*.py"),
+ ("lib/python/omniORB/COS", "*.py *.pth"),
+ ("lib/python/omniORB/COS/CosCollection", "*.py"),
+ ("lib/python/omniORB/COS/CosCollection__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosCompoundLifeCycle", "*.py"),
+ ("lib/python/omniORB/COS/CosCompoundLifeCycle__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosContainment", "*.py"),
+ ("lib/python/omniORB/COS/CosContainment__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosEventChannelAdmin", "*.py"),
+ ("lib/python/omniORB/COS/CosEventChannelAdmin__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosEventComm", "*.py"),
+ ("lib/python/omniORB/COS/CosEventComm__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosExternalization", "*.py"),
+ ("lib/python/omniORB/COS/CosExternalizationContainment", "*.py"),
+ ("lib/python/omniORB/COS/CosExternalizationContainment__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosExternalizationReference", "*.py"),
+ ("lib/python/omniORB/COS/CosExternalizationReference__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosExternalization__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosGraphs", "*.py"),
+ ("lib/python/omniORB/COS/CosGraphs__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosLifeCycle", "*.py"),
+ ("lib/python/omniORB/COS/CosLifeCycleContainment", "*.py"),
+ ("lib/python/omniORB/COS/CosLifeCycleContainment__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosLifeCycleReference", "*.py"),
+ ("lib/python/omniORB/COS/CosLifeCycleReference__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosLifeCycle__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosNaming", "*.py"),
+ ("lib/python/omniORB/COS/CosNaming__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosNotification", "*.py"),
+ ("lib/python/omniORB/COS/CosNotification__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosNotifyChannelAdmin", "*.py"),
+ ("lib/python/omniORB/COS/CosNotifyChannelAdmin__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosNotifyComm", "*.py"),
+ ("lib/python/omniORB/COS/CosNotifyComm__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosNotifyFilter", "*.py"),
+ ("lib/python/omniORB/COS/CosNotifyFilter__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosObjectIdentity", "*.py"),
+ ("lib/python/omniORB/COS/CosObjectIdentity__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistenceDDO", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistenceDDO__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistenceDS_CLI", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistenceDS_CLI__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistencePDS", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistencePDS_DA", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistencePDS_DA__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistencePDS__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistencePID", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistencePID__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistencePO", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistencePOM", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistencePOM__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosPersistencePO__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosPropertyService", "*.py"),
+ ("lib/python/omniORB/COS/CosPropertyService__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosQuery", "*.py"),
+ ("lib/python/omniORB/COS/CosQueryCollection", "*.py"),
+ ("lib/python/omniORB/COS/CosQueryCollection__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosQuery__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosReference", "*.py"),
+ ("lib/python/omniORB/COS/CosReference__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosRelationships", "*.py"),
+ ("lib/python/omniORB/COS/CosRelationships__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosStream", "*.py"),
+ ("lib/python/omniORB/COS/CosStream__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosTime", "*.py"),
+ ("lib/python/omniORB/COS/CosTimerEvent", "*.py"),
+ ("lib/python/omniORB/COS/CosTimerEvent__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosTime__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosTrading", "*.py"),
+ ("lib/python/omniORB/COS/CosTradingDynamic", "*.py"),
+ ("lib/python/omniORB/COS/CosTradingDynamic__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosTradingRepos", "*.py"),
+ ("lib/python/omniORB/COS/CosTradingRepos__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosTrading__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosTypedEventChannelAdmin", "*.py"),
+ ("lib/python/omniORB/COS/CosTypedEventChannelAdmin__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosTypedEventComm", "*.py"),
+ ("lib/python/omniORB/COS/CosTypedEventComm__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosTypedNotifyChannelAdmin", "*.py"),
+ ("lib/python/omniORB/COS/CosTypedNotifyChannelAdmin__POA", "*.py"),
+ ("lib/python/omniORB/COS/CosTypedNotifyComm", "*.py"),
+ ("lib/python/omniORB/COS/CosTypedNotifyComm__POA", "*.py"),
+ ("lib/python/omniORB/COS/LifeCycleService", "*.py"),
+ ("lib/python/omniORB/COS/LifeCycleService__POA", "*.py"),
+ ("lib/python/omniORB/COS/RDITestTypes", "*.py"),
+ ("lib/python/omniORB/COS/RDITestTypes__POA", "*.py"),
+ ("lib/python/omniORB/COS/TimeBase", "*.py"),
+ ("lib/python/omniORB/COS/TimeBase__POA", "*.py")
+]
+
+
+## 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("\"", "")
+ base_dir += "\\"
+
+
+## make temporary files
+##
+temp_dir = base_dir + "bin\\dll"
+dll_list = glob.glob(base_dir + "bin\\x86_win32\\*.dll")
+dll_cnt = len(dll_list)
+if os.path.exists(temp_dir) :
+ shutil.rmtree(temp_dir)
+os.mkdir(temp_dir)
+for i in range(dll_cnt):
+ shutil.copy2(dll_list[i], temp_dir)
+
+
+def path_to_dir_id(path, prefix):
+ # path = "bin/x86_win32" prefix = "omni"
+ # output = "omni_bin_x86_win32"
+ # "." -> "_"
+ output = prefix + "_" + "_".join(path.split("/"))
+ return output.replace(".", "_")
+
+def path_to_comp_id(path, prefix):
+ # path = "bin/x86_win32" prefix = "omni"
+ # output = "OmniBinX86_win32"
+ # "." -> "_"
+ output = prefix.capitalize()
+ for c in path.split("/"):
+ output += c.capitalize()
+ return output.replace(".", "_")
+
+
+## make yaml file
+##
+for (path, files) in data:
+ # wxs component name
+ comp_name = path_to_comp_id(path, "py27")
+ # wxs directory name
+ dir_name = path_to_dir_id(path, "py27")
+
+ path = path.replace("/", "\\")
+
+ # full path to target directory
+ full_path = base_dir + "\\" + path
+
+ flist = []
+ for f in files.split(" "):
+ flist += glob.glob(full_path + "\\" + f)
+
+ cmd = ["flist",
+ "-c", comp_name,
+ "-o", dir_name + ".yaml",
+ "-p", base_dir + path]
+ cmd += flist
+
+ makewxs.main(cmd)
+
+
+## make wxs file
+##
+cmd = ["wxs",
+ "-o", "omniORBpy27_inc.wxs",
+ "-i", "omniORBpy27_inc.wxs.in"]
+cmd += glob.glob("*.yaml")
+makewxs.main(cmd)
+
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-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/changelog 2015-10-19 04:48:18 UTC (rev 613)
@@ -1,3 +1,9 @@
+openrtm-aist-python (1.1.0-2) experimental; urgency=low
+
+ * 1.1.0-2 (1.1.0-RELEASE). OpenRTM-aist-1.1.0-RELEASE
+
+ -- Noriaki Ando <n-ando at aist.go.jp> Fri, 26 Apr 2013 03:00:00 +0900
+
openrtm-aist-python (1.1.0-1) experimental; urgency=low
* 1.1.0-1 (1.1.0-RELEASE). OpenRTM-aist-1.1.0-RELEASE
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/control
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/control 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/debian/control 2015-10-19 04:48:18 UTC (rev 613)
@@ -8,7 +8,7 @@
Package: openrtm-aist-python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, omniorb-nameserver
Description: OpenRTM-aist is a reference implementation of RT-Middleware
and RT-Component framework. RT-Component (RTC) is a component model
standardized in OMG (Object Management Group) as Robotic Technology
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-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in 2015-10-19 04:48:18 UTC (rev 613)
@@ -19,7 +19,7 @@
Name: OpenRTM-aist-Python
Version: %{version}
Release: %{pkgver}.%{distname}
-Summary: Python modules for OpenRTM-aist-1.0.0
+Summary: Python modules for OpenRTM-aist-1.1.0
Group: Applications/System
License: LGPL
URL: http://openrtm.org
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/rpm_build.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/rpm_build.sh 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/rpm/rpm_build.sh 2015-10-19 04:48:18 UTC (rev 613)
@@ -121,7 +121,7 @@
{
cd SPECS
rpm_def="_topdir $BUILD_DIR"
- if rpmbuild --define "$rpm_def" -ba openrtm-aist.spec ; then
+ if rpmbuild --target `uname -i` --define "$rpm_def" -ba openrtm-aist.spec ; then
echo "Build successful"
else
echo "Build failed"
Modified: branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/setup.py 2015-10-07 03:09:49 UTC (rev 612)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/setup.py 2015-10-19 04:48:18 UTC (rev 613)
@@ -343,19 +343,32 @@
# end of conv_encoding()
temp_fname = file_name + ".tmp"
outfd = open(temp_fname, "w")
- for line in open(file_name, "r"):
+ def coding_name(coding):
+ conv = {"euc_jp": "euc-jp",
+ "shift_jis": "cp932"}
+ if conv.has_key(coding):
+ return conv[coding]
+ return coding
+ sub_str = "coding: " + coding_name(char_code)
+ import re
+ infd = open(file_name, "r")
+ for line in infd:
try:
outdata = conv_encoding(line.rstrip('\r\n'), char_code)
+ outdata = re.sub("coding: [^ ]*", sub_str, outdata)
+ outdata = re.sub("encoding: [^ ]*", sub_str, outdata)
except Exception, e:
print "Exception cought in " + file_name + ": " + line
print e
+ infd.close()
outfd.close()
os.remove(temp_fname)
sys.exit(1)
outfd.write(outdata + crlf_code)
+ infd.close()
os.remove(file_name)
+ outfd.close()
os.rename(temp_fname, file_name)
- outfd.close()
#------------------------------------------------------------
# compiling IDL files
@@ -564,6 +577,11 @@
"""
description = "Copying pure python modules into build directory."
def run(self):
+ # Preparering rtcprof_python.py for Windows
+ if os_is() == "win32":
+ rtcprof_dir = os.path.join("OpenRTM_aist", "utils", "rtcprof/")
+ self.copy_file(os.path.join(rtcprof_dir, "rtcprof.py"),
+ os.path.join(rtcprof_dir, "rtcprof_python.py"))
_build_py.run(self)
# copying OpenRTM-aist.pth file
self.copy_file(os.path.join(".", "OpenRTM-aist.pth"), self.build_lib,
@@ -784,16 +802,20 @@
self.get_file_list()
if self.manifest_only:
return
+ """
# converting character code into Shift-JIS
import re
for f in self.filelist.files:
if not re.match('OpenRTM_aist.*\.py$', f): continue
convert_file_code(f, "shift_jis", "\r\n", "euc_jp")
+ """
self.make_distribution()
+ """
# reverting character code
for f in self.filelist.files:
if not re.match('OpenRTM_aist.*\.py$', f): continue
convert_file_code(f, "euc_jp", "\n", "shift_jis")
+ """
#============================================================
# install command classes
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
+ /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
More information about the openrtm-commit
mailing list