[openrtm-commit:00153] r2164 - in trunk/OpenRTM-aist: . utils utils/cmake win32/OpenRTM-aist win32/OpenRTM-aist/cmake win32/OpenRTM-aist/etc win32/OpenRTM-aist/installer

openrtm ＠ openrtm.org openrtm ＠ openrtm.org
2011年 6月 4日 (土) 17:26:56 JST 

Author: n-ando
Date: 2011-06-04 17:26:56 +0900 (Sat, 04 Jun 2011)
New Revision: 2164

Modified:
   trunk/OpenRTM-aist/configure.ac
   trunk/OpenRTM-aist/utils/Makefile.am
   trunk/OpenRTM-aist/utils/cmake/
   trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
   trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
   trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
   trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
   trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/
   trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
   trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml
   trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/etc.yaml
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in
Log:
OpenRTMConfig.cmake has been introduced for UNIX and Windows.
Some autobuidl batchfiles for Win32 now create OpenRTMConfig.cmake.
OpenRTMConfig.cmake is installed into %RTM_ROOT%/cmake in Windows
and prefix/openrtm-1.1/cmake in UNIX.


Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac	2011-06-04 01:46:25 UTC (rev 2163)
+++ trunk/OpenRTM-aist/configure.ac	2011-06-04 08:26:56 UTC (rev 2164)
@@ -1693,6 +1693,7 @@
 	src/ext/sdo/logger/Makefile
 	utils/Makefile
 	utils/rtm-config/Makefile
+	utils/cmake/Makefile
 	utils/rtc-template/Makefile
 	utils/rtm-skelwrapper/Makefile
 	utils/rtm-naming/Makefile
@@ -1714,6 +1715,7 @@
 	win32/OpenRTM-aist/Makefile
 	win32/OpenRTM-aist/bin/Makefile
 	win32/OpenRTM-aist/etc/Makefile
+	win32/OpenRTM-aist/cmake/Makefile
 	win32/OpenRTM-aist/docs/Makefile
 	win32/OpenRTM-aist/build/Makefile
 	win32/OpenRTM-aist/examples/Makefile

Modified: trunk/OpenRTM-aist/utils/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/Makefile.am	2011-06-04 01:46:25 UTC (rev 2163)
+++ trunk/OpenRTM-aist/utils/Makefile.am	2011-06-04 08:26:56 UTC (rev 2164)
@@ -7,5 +7,5 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = rtm-config rtc-template rtm-skelwrapper rtm-naming rtcd rtcprof
+SUBDIRS = rtm-config cmake rtc-template rtm-skelwrapper rtm-naming rtcd rtcprof
 


Property changes on: trunk/OpenRTM-aist/utils/cmake
___________________________________________________________________
Added: svn:ignore
   + svn: warning: cannot set LC_CTYPE locale
svn: warning: environment variable LANG is JPN
svn: warning: please check that your locale name is correct
Makefile.in


Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am	2011-06-04 01:46:25 UTC (rev 2163)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am	2011-06-04 08:26:56 UTC (rev 2164)
@@ -4,7 +4,7 @@
 ##
 ## $Id$
 ##---------------------------------------------------------------------------
-SUBDIRS = bin etc build docs examples ext utils coil rtm installer .
+SUBDIRS = bin etc cmake build docs examples ext utils coil rtm installer .
 
 
 clean-local:

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2011-06-04 01:46:25 UTC (rev 2163)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2011-06-04 08:26:56 UTC (rev 2164)
@@ -36,15 +36,19 @@
 @rem ============================================================
 @rem convert property sheet to cmake
 @rem ============================================================
-if not exist rtm_config.cmake (
+set TMP_PYTHONPATH=%PYTHONPATH%
+set PYTHONPATH=./bin;%PYTHONPATH%
 
-   set TMP_PYTHONPATH=%PYTHONPATH%
-   set PYTHONPATH=./bin;%PYTHONPATH%
-   echo Generating cmake file
-   build\vsprops2cmake.py rtm_config.vsprops
-   set PYTHONPATH=%TMP_PYTHONPATH%
-)
+echo Generating rtm_config.cmake file
+build\vsprops2cmake.py rtm_config.vsprops
+move rtm_config.cmake cmake
 
+echo Generating OpenRTMConfig.cmake file
+build\cmakeconfgen.py rtm_config.vsprops
+move OpenRTMConfig.cmake cmake
+
+set PYTHONPATH=%TMP_PYTHONPATH%
+
 @rem ============================================================
 @rem build OpenRTM-aist
 @rem ============================================================

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat	2011-06-04 01:46:25 UTC (rev 2163)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat	2011-06-04 08:26:56 UTC (rev 2164)
@@ -35,15 +35,19 @@
 @rem ============================================================
 @rem convert property sheet to cmake
 @rem ============================================================
-if not exist rtm_config.cmake (
+set TMP_PYTHONPATH=%PYTHONPATH%
+set PYTHONPATH=./bin;%PYTHONPATH%
 
-   set TMP_PYTHONPATH=%PYTHONPATH%
-   set PYTHONPATH=./bin;%PYTHONPATH%
-   echo Generating cmake file
-   build\vsprops2cmake.py rtm_config.vsprops
-   set PYTHONPATH=%TMP_PYTHONPATH%
-)
+echo Generating rtm_config.cmake file
+build\vsprops2cmake.py rtm_config.vsprops
+move rtm_config.cmake cmake
 
+echo Generating OpenRTMConfig.cmake file
+build\cmakeconfgen.py rtm_config.vsprops
+move OpenRTMConfig.cmake cmake
+
+set PYTHONPATH=%TMP_PYTHONPATH%
+
 @rem ============================================================
 @rem build OpenRTM-aist
 @rem ============================================================

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat	2011-06-04 01:46:25 UTC (rev 2163)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat	2011-06-04 08:26:56 UTC (rev 2164)
@@ -35,15 +35,19 @@
 @rem ============================================================
 @rem convert property sheet to cmake
 @rem ============================================================
-if not exist rtm_config.cmake (
+set TMP_PYTHONPATH=%PYTHONPATH%
+set PYTHONPATH=./bin;%PYTHONPATH%
 
-   set TMP_PYTHONPATH=%PYTHONPATH%
-   set PYTHONPATH=./bin;%PYTHONPATH%
-   echo Generating cmake file
-   build\vsprops2cmake.py rtm_config.vsprops
-   set PYTHONPATH=%TMP_PYTHONPATH%
-)
+echo Generating rtm_config.cmake file
+build\vsprops2cmake.py rtm_config.vsprops
+move rtm_config.cmake cmake
 
+echo Generating OpenRTMConfig.cmake file
+build\cmakeconfgen.py rtm_config.vsprops
+move OpenRTMConfig.cmake cmake
+
+set PYTHONPATH=%TMP_PYTHONPATH%
+
 @rem ============================================================
 @rem build OpenRTM-aist
 @rem ============================================================


Property changes on: trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake
___________________________________________________________________
Added: svn:ignore
   + svn: warning: cannot set LC_CTYPE locale
svn: warning: environment variable LANG is JPN
svn: warning: please check that your locale name is correct
Makefile.in


Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am	2011-06-04 01:46:25 UTC (rev 2163)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am	2011-06-04 08:26:56 UTC (rev 2164)
@@ -68,7 +68,7 @@
 #
 
 clean-local:
-	rm -f OpenRTMConfig.cmake
+	rm -f OpenRTMConfig.cmake FindOpenRTM.cmake
 	rm -rf *~
 
 wxs:

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml	2011-06-04 01:46:25 UTC (rev 2163)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/cmake.yaml	2011-06-04 08:26:56 UTC (rev 2164)
@@ -6,8 +6,12 @@
       Name: FindOpenRTM.cmake
       Source: ..\\cmake\\FindOpenRTM.cmake
     - Id: Cmake001
+      ShortName: openrtmc.cma
+      Name: OpenRTMConfig.cmake
+      Source: ..\\cmake\\OpenRTMConfig.cmake
+    - Id: Cmake002
       ShortName: rtm_c000.cma
       Name: rtm_config.cmake
-      Source: ..\\rtm_config.cmake
+      Source: ..\\cmake\\rtm_config.cmake
 
 

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/etc.yaml
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/etc.yaml	2011-06-04 01:46:25 UTC (rev 2163)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/etc.yaml	2011-06-04 08:26:56 UTC (rev 2164)
@@ -20,4 +20,4 @@
     - Id: Etc0005
       ShortName: rtm_c000.cma
       Name: rtm_config.cmake
-      Source: ..\\rtm_config.cmake
+      Source: ..\\cmake\\rtm_config.cmake

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in	2011-06-04 01:46:25 UTC (rev 2163)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenRTM-aist.wxs.in	2011-06-04 08:26:56 UTC (rev 2164)
@@ -101,6 +101,17 @@
 		{% endfor %}
 	      </Component>
 	    </Directory>
+	    <!-- cmake -->
+	    <Directory Id="cmake" Name="cmake">
+	      <Component Id="Cmake" Guid="{% Cmake.GUID %}">
+		{% for file in Cmake.Files %}
+		<File Id="{% file.Id %}"
+		      Name="{% file.Name %}" DiskId="1"
+		      Source="{% file.Source %}">
+		</File>
+		{% endfor %}
+	      </Component>
+	    </Directory>
 	    <!-- rtm -->
 	    <Directory Id="rtm" Name="rtm">
 	      <Component Id="Headers" Guid="{% Headers.GUID %}">
@@ -336,6 +347,7 @@
 	<ComponentRef Id="Bin"/>
 	<ComponentRef Id="COILs"/>
 	<ComponentRef Id="Etc"/>
+	<ComponentRef Id="Cmake"/>
 	<ComponentRef Id="SDOService"/>
       </Feature>
       <!-- devel -->

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