[openrtm-commit:02536] r708 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python: resource/100/Doc/author resource/100/Doc/authorLong resource/100/Doc/full resource/100/Doc/refer resource/100/aist/AIST1 resource/100/aist/AIST2 resource/100/aist/AIST3 resource/100/aist/AIST4 resource/100/base/service1 resource/100/base/service2 resource/100/build/cmake1 resource/100/idltype/type2 resource/100/idltype/type3 resource/100/module/serviceM resource/100/module/serviceM2 src/jp/go/aist/rtm/rtcbuilder/python/manager src/jp/go/aist/rtm/rtcbuilder/python/template/cmake test/jp/go/aist/rtm/rtcbuilder/python/_test test/jp/go/aist/rtm/rtcbuilder/python/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 26日 (日) 22:26:56 JST
Author: ga
Date: 2017-03-26 22:26:56 +0900 (Sun, 26 Mar 2017)
New Revision: 708
Added:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/postinst.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/prerm.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix_patch.xml.in.vsl
Removed:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/Description.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/License.txt.vsl
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java
Log:
Modified generated CMakeFile for Python #3992
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,2 +1,10 @@
- at echo off
-omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java 2017-03-26 13:26:56 UTC (rev 708)
@@ -52,10 +52,15 @@
List<GeneratedResult> result = super.generateTemplateCode10(contextMap);
GeneratedResult gr;
- gr = generateResourceDescriptionTXT(contextMap);
- result.add(gr);
- gr = generateResourceLicenseTXT(contextMap);
- result.add(gr);
+ RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
+ if(0<rtcParam.getServicePorts().size()) {
+ gr = generatePostinstIin(contextMap);
+ result.add(gr);
+ gr = generatePrermIn(contextMap);
+ result.add(gr);
+ gr = generateCMakeWixPatchXmlIn(contextMap);
+ result.add(gr);
+ }
return result;
}
@@ -70,18 +75,24 @@
}
// 1.0系 (CMake/cpack_resources)
- public GeneratedResult generateResourceDescriptionTXT(Map<String, Object> contextMap) {
- String outfile = "cpack_resources/Description.txt";
- String infile = "cmake/Description.txt.vsl";
+ public GeneratedResult generatePostinstIin(Map<String, Object> contextMap) {
+ String outfile = "postinst.in";
+ String infile = "cmake/postinst.in.vsl";
return generatePython(infile, outfile, contextMap);
}
- public GeneratedResult generateResourceLicenseTXT(Map<String, Object> contextMap) {
- String outfile = "cpack_resources/License.txt";
- String infile = "cmake/License.txt.vsl";
+ public GeneratedResult generatePrermIn(Map<String, Object> contextMap) {
+ String outfile = "prerm.in";
+ String infile = "cmake/prerm.in.vsl";
return generatePython(infile, outfile, contextMap);
}
+ public GeneratedResult generateCMakeWixPatchXmlIn(Map<String, Object> contextMap) {
+ String outfile = "cmake/wix_patch.xml.in";
+ String infile = "cmake/wix_patch.xml.in.vsl";
+ return generatePython(infile, outfile, contextMap);
+ }
+
public GeneratedResult generatePython(String infile, String outfile,
Map<String, Object> contextMap) {
try {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java 2017-03-26 13:26:56 UTC (rev 708)
@@ -159,7 +159,9 @@
public GeneratedResult generateIDLCompileBat(Map<String, Object> contextMap) {
String outfile = "idlcompile.bat";
String infile = "python/idlcompile.bat.vsl";
- return generate(infile, outfile, contextMap);
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setEncode("Shift_JIS");
+ return result;
}
public GeneratedResult generateIDLCompileSh(Map<String, Object> contextMap) {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,29 +1,88 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
+if(POLICY CMP0053)
+ cmake_policy(SET CMP0053 OLD)
+endif()
project(${rtcParam.name} NONE)
+string(TOLOWER ${dol}{PROJECT_NAME} PROJECT_NAME_LOWER)
+include("${dol}{PROJECT_SOURCE_DIR}/cmake/utils.cmake")
+set(PROJECT_VERSION ${rtcParam.version} CACHE STRING "${rtcParam.name} version")
+DISSECT_VERSION()
+set(PROJECT_SHORT_VER ${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${PROJECT_VERSION_REVISION})
+set(PROJECT_DESCRIPTION "${rtcParam.description}")
+set(PROJECT_VENDOR "${rtcParam.vender}")
+set(PROJECT_MAINTAINER "unknown")
+set(PROJECT_TYPE "python/${rtcParam.category}")
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-set(CMAKE_MODULE_PATH "${dol}{PROJECT_SOURCE_DIR}/cmake_modules")
+if(WIN32)
+ string(REPLACE "\\" "/" OPENRTM_DIR "${dol}ENV{RTM_ROOT}")
+ string(LENGTH ${dol}{OPENRTM_DIR} RTM_ROOT_LEN)
+ string(REPLACE "\\" "/" RTM_BASE "${dol}ENV{RTM_BASE}")
+ string(LENGTH ${dol}{RTM_BASE} RTM_BASE_LEN)
+ string(SUBSTRING ${dol}{OPENRTM_DIR} ${dol}{RTM_BASE_LEN} ${dol}{RTM_ROOT_LEN} RTM_VER)
+ string(REGEX REPLACE "/${dol}" "" RTM_VER "${dol}{RTM_VER}")
+ set(RTM_SHORT_VER ${dol}{RTM_VER})
+ string(REPLACE "." "" RTM_SHORT_VER "${dol}{RTM_SHORT_VER}")
+endif()
-set(LINUX_PACKAGE_GENERATOR "DEB")
-${sharp}set(LINUX_PACKAGE_GENERATOR "RPM")
+function(get_dist ARG0)
+ if(NOT ${dol}{CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ set(${dol}{ARG0} ${dol}{CMAKE_SYSTEM_NAME} PARENT_SCOPE)
+ return()
+ endif()
+ foreach(dist Debian Ubuntu RedHat Fedora CentOS)
+ execute_process(
+ COMMAND grep ${dol}{dist} -s /etc/issue /etc/os-release /etc/redhat-release /etc/system-release
+ OUTPUT_VARIABLE dist_name
+ )
+ if(${dol}{dist_name} MATCHES ${dol}{dist})
+ set(${dol}{ARG0} ${dol}{dist} PARENT_SCOPE)
+ return()
+ endif()
+ endforeach()
+endfunction(get_dist)
+function(get_pkgmgr ARG0)
+ get_dist(DIST_NAME)
+ if(${dol}{DIST_NAME} MATCHES "Debian" OR
+ ${dol}{DIST_NAME} MATCHES "Ubuntu")
+ set(${dol}{ARG0} "DEB" PARENT_SCOPE)
+ return()
+ endif()
+ if(${dol}{DIST_NAME} MATCHES "RedHat" OR
+ ${dol}{DIST_NAME} MATCHES "Fedora" OR
+ ${dol}{DIST_NAME} MATCHES "CentOS")
+ set(${dol}{ARG0} "RPM" PARENT_SCOPE)
+ return()
+ endif()
+endfunction(get_pkgmgr)
-${sharp} component settings
-set(RTC_NAME "${dol}{PROJECT_NAME}")
-set(RTC_VERSION "${rtcParam.version}")
-set(RTC_VERSION_MAJOR "${helper.getVerMajor(${rtcParam.version})}")
-set(RTC_VERSION_MINOR "${helper.getVerMinor(${rtcParam.version})}")
-set(RTC_VERSION_PATCH "${helper.getVerPatch(${rtcParam.version})}")
-set(RTC_LANG "${helper.toLower(${rtcParam.language})}")
-set(RTC_DESCRIPTION "${rtcParam.description}")
-set(RTC_VENDOR "${rtcParam.vender}")
-set(RTC_MAINTAINER "unknown")
-set(PROJECT_TYPE "python/${rtcParam.category}")
+get_dist(DIST_NAME)
+MESSAGE(STATUS "Distribution is ${dol}{DIST_NAME}")
-string(TOLOWER ${dol}{RTC_NAME} PACKAGE_NAME)
-set(PACKAGE_VERSION "${dol}{RTC_VERSION_MAJOR}.${dol}{RTC_VERSION_MINOR}.${dol}{RTC_VERSION_PATCH}")
+get_pkgmgr(PKGMGR)
+if(PKGMGR AND NOT LINUX_PACKAGE_GENERATOR)
+ set(LINUX_PACKAGE_GENERATOR ${dol}{PKGMGR})
+ if(${dol}{PKGMGR} MATCHES "DEB")
+ execute_process(COMMAND dpkg --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "Package manager is ${dol}{PKGMGR}. Arch is ${dol}{CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.")
+ endif()
+ if(${dol}{PKGMGR} MATCHES "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "Package manager is ${dol}{PKGMGR}. Arch is ${dol}{CPACK_RPM_PACKAGE_ARCHITECTURE}.")
+ endif()
+endif()
+option(BUILD_DOCUMENTATION "Build the documentation" OFF)
+
+#if(${rtcParam.servicePorts.size()}>0)
set(IDL_FILES ""
#foreach($p in ${rtcParam.providerIdlPathes})
${p.idlFile}
@@ -31,48 +90,66 @@
#foreach($p in ${rtcParam.consumerIdlPathes})
${p.idlFile}
#end)
+#end
set(EXEC_FILES ""
${rtcParam.name}.py
-#foreach($p in ${rtcParam.providerIdlPathes})
- ${helper.getFilenameNoExt(${p.idlFile})}_idl_example.py
-#end
+#if(${rtcParam.servicePorts.size()}>0) ${dol}{SCRIPT_FILE}#end
)
set(OTHER_SRCS CMakeLists.txt
RTC.xml ${rtcParam.name}.conf rtc.conf)
-
-${sharp} check OpenRTM installed
-find_package(OpenRTMPython REQUIRED)
-
-${sharp} check doxygen installed
-find_package(Doxygen)
-if(DOXYGEN_FOUND STREQUAL "NO")
- message(FATAL_ERROR "Doxygen not found.")
-endif()
-
${sharp} check python installed
find_package(PythonInterp)
-find_package(PythonLibs)
-
if(WIN32)
- ${sharp} add command path
- set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OPENRTM_DIR}/bin")
- ${sharp} set install path prefix
- set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}")
- set(INSTALL_PREFIX "components/${dol}{RTC_LANG}/${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
+ set(OPENRTM_SHARE_PREFIX "OpenRTM-aist/${dol}{RTM_VER}/Components/${dol}{PROJECT_TYPE}")
+ set(INSTALL_PREFIX ${dol}{PROJECT_NAME})
+ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}Components/${dol}{PROJECT_TYPE}/${dol}{PROJECT_NAME}" CACHE PATH "..." FORCE)
+ endif()
else()
- ${sharp} add command path
- set(${dol}ENV{PATH} ${dol}ENV{PATH} "${dol}{OPENRTM_DIR}/bin")
- ${sharp} set install path prefix
- set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}")
- set(OPENRTM_SHARE_PREFIX "share/openrtm-${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}")
- set(INSTALL_PREFIX "${dol}{OPENRTM_SHARE_PREFIX}/components/${dol}{RTC_LANG}/${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
+ set(OPENRTM_SHARE_PREFIX "share/openrtm-${dol}{PROJECT_VERSION_MAJOR}.${dol}{PROJECT_VERSION_MINOR}")
+ set(INSTALL_PREFIX "${dol}{OPENRTM_SHARE_PREFIX}/components/${dol}{PROJECT_TYPE}/${dol}{PROJECT_NAME}")
endif()
+#if(${rtcParam.servicePorts.size()}>0)
+${sharp} postinst, prerm settings
+if(UNIX)
+ configure_file(${dol}{CMAKE_CURRENT_SOURCE_DIR}/postinst.in
+ ${dol}{CMAKE_CURRENT_SOURCE_DIR}/postinst @ONLY
+ )
+ configure_file(${dol}{CMAKE_CURRENT_SOURCE_DIR}/prerm.in
+ ${dol}{CMAKE_CURRENT_SOURCE_DIR}/prerm @ONLY
+ )
+endif()
+add_custom_target( ${dol}{PROJECT_NAME} ALL
+ COMMAND ${dol}{CMAKE_COMMAND} -E make_directory ${dol}{PROJECT_BINARY_DIR}/idl
+ COMMAND ${dol}{CMAKE_COMMAND} -E copy_directory
+ ${dol}{PROJECT_SOURCE_DIR}/idl ${dol}{PROJECT_BINARY_DIR}/idl
+)
+#end
+
+foreach(target ${dol}{EXEC_FILES})
+ add_custom_command( TARGET ${dol}{PROJECT_NAME} POST_BUILD
+ COMMAND ${dol}{CMAKE_COMMAND} -E copy
+ ${dol}{PROJECT_SOURCE_DIR}/${dol}{target} ${dol}{PROJECT_BINARY_DIR}
+ )
+endforeach()
+
+install(PROGRAMS ${dol}{EXEC_FILES} DESTINATION "${dol}{INSTALL_PREFIX}"
+ COMPONENT component)
+
+install(FILES ${dol}{PROJECT_SOURCE_DIR}/RTC.xml DESTINATION ${dol}{INSTALL_PREFIX}
+ COMPONENT component)
+
+#if(${rtcParam.servicePorts.size()}>0)
+install(DIRECTORY idl DESTINATION "${dol}{INSTALL_PREFIX}"
+ COMPONENT component)
+#end
+
${sharp} add uninstall target
configure_file(
"${dol}{CMAKE_CURRENT_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
@@ -81,134 +158,36 @@
add_custom_target(uninstall COMMAND
${dol}{CMAKE_COMMAND} -P ${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+${sharp} start menu
+set_property(INSTALL "${dol}{INSTALL_PREFIX}/${dol}{PROJECT_NAME}.py"
+ PROPERTY CPACK_START_MENU_SHORTCUTS "${dol}{PROJECT_NAME}.py")
-${sharp} add build target
-add_custom_target(build ALL)
-
-add_custom_command(TARGET build PRE_BUILD
- COMMAND ${dol}{CMAKE_COMMAND} -E make_directory bin)
-
-foreach(idl ${dol}{IDL_FILES})
- add_custom_command(TARGET build PRE_BUILD
- COMMAND ${dol}{CMAKE_COMMAND} -E echo "IDL Compiling \"${dol}{idl}\""
- COMMAND ${dol}{OPENRTM_IDLC} ${dol}{OPENRTM_IDLFLAGS} -Cbin "${dol}{PROJECT_SOURCE_DIR}/${dol}{idl}")
-endforeach()
-
-install(PROGRAMS ${dol}{EXEC_FILES} DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "applications")
-
-install(FILES RTC.xml DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "applications")
-
-install(DIRECTORY ${dol}{CMAKE_CURRENT_BINARY_DIR}/bin/ DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "applications"
- PATTERN "bin/*")
-
-
${sharp} target settings for document
-configure_file("${dol}{CMAKE_CURRENT_SOURCE_DIR}/doc/doxyfile.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/doc/doxyfile")
+if(BUILD_DOCUMENTATION)
+ add_subdirectory(doc)
+endif(BUILD_DOCUMENTATION)
-add_custom_target(doxygen COMMAND
- ${dol}{DOXYGEN_EXECUTABLE} ${dol}{CMAKE_CURRENT_BINARY_DIR}/doxyfile)
-
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
-
-get_target_property(DOC_TARGET doc TYPE)
-if(NOT DOC_TARGET)
- add_custom_target(doc)
-endif()
-add_dependencies(doc doxygen)
-
-install(DIRECTORY ${dol}{CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION "${dol}{INSTALL_PREFIX}"
- COMPONENT "documents")
-
-
-${sharp} install source files
-install(FILES ${dol}{IDL_FILES} ${dol}{EXEC_FILES} ${dol}{OTHER_SRCS}
- DESTINATION "${dol}{INSTALL_PREFIX}/src"
- COMPONENT "sources")
-
-install(DIRECTORY cmake_modules cpack_resources
- DESTINATION "${INSTALL_PREFIX}/src"
- COMPONENT "sources")
-
-
-${sharp} package settings
-set(CPACK_PACKAGE_NAME "${dol}{RTC_NAME}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${dol}{RTC_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${dol}{RTC_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${dol}{RTC_VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${dol}{CPACK_PACKAGE_VERSION_MAJOR}.${dol}{CPACK_PACKAGE_VERSION_MINOR}.${dol}{CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_VENDOR "${dol}{RTC_VENDOR}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${dol}{RTC_DESCRIPTION}")
-set(CPACK_PACKAGE_CONTACT "${dol}{RTC_MAINTAINER}")
-
-set(CPACK_RESOURCE_FILE_LICENSE
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/License.txt")
-set(CPACK_PACKAGE_DESCRIPTION_FILE
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/Description.txt")
-
-set(CPACK_COMPONENTS_ALL applications documents sources)
-set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Applications")
-set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "RT-Component applications")
-set(CPACK_COMPONENT_APPLICATIONS_DISABLED FALSE)
-
-set(CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME "Documents")
-set(CPACK_COMPONENT_DOCUMENTS_DESCRIPTION "RT-Component documents")
-set(CPACK_COMPONENT_DOCUMENTS_DISABLED TRUE)
-
-set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
-set(CPACK_COMPONENT_SOURCES_DESCRIPTION "RT-Component source files")
-set(CPACK_COMPONENT_SOURCES_DISABLED TRUE)
-
-if(WIN32)
- set(CPACK_GENERATOR "WIX")
-
- ${sharp} Windows WiX package settings
-
- set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
- set(CPACK_WIX_LANG "ja-jp")
- set(CPACK_RESOURCE_FILE_LICENSE
- "@CMAKE_CURRENT_SOURCE_DIR@/cpack_resources/License.rtf")
- configure_file(
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cpack_resources/wix.xsl.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/wix.xsl" @ONLY)
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}${dol}{PACKAGE_VERSION}")
-
-else()
+#if(${rtcParam.servicePorts.size()}>0)
+if(UNIX)
set(CPACK_GENERATOR "${dol}{LINUX_PACKAGE_GENERATOR}")
-
- if(CPACK_GENERATOR STREQUAL "DEB")
- ${sharp} Linux Debian package settings
-
- set(CPACK_DEBIAN_PACKAGE_VERSION "${dol}{CPACK_PACKAGE_VERSION}-1")
- set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
- set(CPACK_DEBIAN_PACKAGE_SECTION "main")
- set(CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
- set(CPACK_DEBIAN_PACKAGE_DEPENDS "openrtm-aist (>= ${rtcParam.rtmVersion})")
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}_${dol}{CPACK_DEBIAN_PACKAGE_VERSION}_${dol}{CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-
- elseif(CPACK_GENERATOR STREQUAL "RPM")
- ${sharp} Linux RPM package settings
-
- set(CPACK_RPM_PACKAGE_RELEASE "1.fc10")
- set(CPACK_RPM_PACKAGE_ARCHITECTURE "i386")
- set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
- set(CPACK_RPM_PACKAGE_LICENSE "LGPL")
- set(CPACK_RPM_PACKAGE_REQUIRES "OpenRTM-aist >= ${rtcParam.rtmVersion}")
-
- set(CPACK_PACKAGE_FILE_NAME
- "rtc${dol}{OPENRTM_VERSION}-${dol}{PACKAGE_NAME}-${dol}{PACKAGE_VERSION}-${dol}{CPACK_RPM_PACKAGE_RELEASE}.${dol}{CPACK_RPM_PACKAGE_ARCHITECTURE}")
-
- endif()
+ if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${dol}{CMAKE_SOURCE_DIR}/postinst;${dol}{CMAKE_SOURCE_DIR}/prerm")
+ endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${dol}{CMAKE_SOURCE_DIR}/postinst")
+ set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${dol}{CMAKE_SOURCE_DIR}/prerm")
+ endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
endif()
-message(STATUS "Package type: ${dol}{CPACK_GENERATOR}")
-message(STATUS "Package name: ${dol}{CPACK_PACKAGE_FILE_NAME}")
+set(WIX_PATCH_FILE "${dol}{CMAKE_CURRENT_BINARY_DIR}/wix_patch.xml")
+configure_file("cmake/wix_patch.xml.in"
+ ${dol}{WIX_PATCH_FILE} @ONLY)
+#end
+set(cpack_options "${dol}{PROJECT_BINARY_DIR}/cpack_options.cmake")
+configure_file("${dol}{PROJECT_SOURCE_DIR}/cmake/cpack_options.cmake.in"
+ ${dol}{cpack_options} @ONLY)
+
+set(CPACK_PROJECT_CONFIG_FILE ${dol}{cpack_options})
+include(${dol}{CPACK_PROJECT_CONFIG_FILE})
include(CPack)
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/Description.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/Description.txt.vsl 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/Description.txt.vsl 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,4 +0,0 @@
-DESCRIPTION
-===========
-
-This is an installer created using CPack (http://www.cmake.org). No additional installation instructions provided.
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/License.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/License.txt.vsl 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/License.txt.vsl 2017-03-26 13:26:56 UTC (rev 708)
@@ -1,4 +0,0 @@
-LICENSE
-=======
-
-This is an installer created using CPack (http://www.cmake.org). No license provided.
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/postinst.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/postinst.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/postinst.in.vsl 2017-03-26 13:26:56 UTC (rev 708)
@@ -0,0 +1,5 @@
+${sharp}!/bin/sh
+${sharp} postinst script
+set -e
+cd /usr/@INSTALL_PREFIX@
+sh idlcompile.sh
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/prerm.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/prerm.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/prerm.in.vsl 2017-03-26 13:26:56 UTC (rev 708)
@@ -0,0 +1,4 @@
+${sharp}!/bin/sh
+${sharp} prerm script
+sudo rm -rf /usr/@INSTALL_PREFIX@
+
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix_patch.xml.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix_patch.xml.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix_patch.xml.in.vsl 2017-03-26 13:26:56 UTC (rev 708)
@@ -0,0 +1,14 @@
+<CPackWiXPatch>
+ <CPackWiXFragment Id="${sharp}PRODUCT">
+ <CustomAction Id="MyCustomAction"
+ ExeCommand="idlcompile.bat"
+ Execute="deferred" Impersonate="no"
+ FileKey="CM_FP_component. at PROJECT_NAME@.idlcompile.bat"/>
+ <InstallExecuteSequence>
+ <Custom Action="MyCustomAction"
+ Before="InstallFinalize">
+ NOT Installed
+ </Custom>
+ </InstallExecuteSequence>
+ </CPackWiXFragment>
+</CPackWiXPatch>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java 2017-03-26 13:26:56 UTC (rev 708)
@@ -16,7 +16,7 @@
protected String expContent;
protected int index;
protected String[] ignore_row_phrases = {"--service-idl=", "--consumer-idl"};
- protected final int default_file_num = 26;
+ protected final int default_file_num = 24;
public TestBase () {
File fileCurrent = new File(".");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java 2017-03-26 13:26:56 UTC (rev 708)
@@ -146,7 +146,7 @@
String resourceDir = rootPath + "/resource/100/aist/AIST4/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -198,7 +198,7 @@
String resourceDir = rootPath + "/resource/100/aist/AIST3/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -240,7 +240,7 @@
String resourceDir = rootPath + "/resource/100/aist/AIST2/";
- assertEquals(default_file_num+2, result.size());
+ assertEquals(default_file_num+5, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "idlcompile.bat");
checkCode(result, resourceDir, "idlcompile.sh");
@@ -273,7 +273,7 @@
String resourceDir = rootPath + "/resource/100/aist/AIST1/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java 2017-03-26 13:26:56 UTC (rev 708)
@@ -83,7 +83,7 @@
String resourceDir = rootPath + "/resource/100/base/service2/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -125,7 +125,7 @@
String resourceDir = rootPath + "/resource/100/base/service1/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java 2017-03-26 13:26:56 UTC (rev 708)
@@ -89,7 +89,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -147,7 +147,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(default_file_num+4, result.size());
+ assertEquals(default_file_num+7, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java 2017-03-26 13:26:56 UTC (rev 708)
@@ -262,7 +262,7 @@
String resourceDir = rootPath + "/resource/100/Doc/full/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -321,7 +321,7 @@
String resourceDir = rootPath + "/resource/100/Doc/refer/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -376,7 +376,7 @@
String resourceDir = rootPath + "/resource/100/Doc/authorLong/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -430,7 +430,7 @@
String resourceDir = rootPath + "/resource/100/Doc/author/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java 2017-03-26 13:26:56 UTC (rev 708)
@@ -81,7 +81,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
// checkCode(result, resourceDir, "idlcompile.bat");
@@ -129,7 +129,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(default_file_num+4, result.size());
+ assertEquals(default_file_num+7, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java 2017-03-26 13:26:56 UTC (rev 708)
@@ -96,7 +96,7 @@
String resourceDir = rootPath + "/resource/100/idltype/type2/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -130,7 +130,7 @@
String resourceDir = rootPath + "/resource/100/idltype/type3/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java 2017-03-26 13:23:18 UTC (rev 707)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java 2017-03-26 13:26:56 UTC (rev 708)
@@ -64,7 +64,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceM/";
- assertEquals(default_file_num+3, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -104,7 +104,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceM2/";
- assertEquals(default_file_num+4, result.size());
+ assertEquals(default_file_num+7, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "DAQService_idl_example.py");
@@ -140,7 +140,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceMC/";
- assertEquals(default_file_num+2, result.size());
+ assertEquals(default_file_num+5, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -177,7 +177,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceMC2/";
- assertEquals(default_file_num+2, result.size());
+ assertEquals(default_file_num+5, result.size());
checkCode(result, resourceDir, "foo.py");
}
openrtm-commit メーリングリストの案内