[openrtm-commit:01481] r2581 - in branches/RELENG_1_1/OpenRTM-aist: . src/lib/coil/win32/coil src/lib/rtm win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-10-21 10:24:50 +0900 (Tue, 21 Oct 2014)
New Revision: 2581

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
   branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
Log:
Merged r2557,2558


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2556
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2558

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml	2014-10-21 01:12:46 UTC (rev 2580)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml	2014-10-21 01:24:50 UTC (rev 2581)
@@ -50,7 +50,7 @@
       - Key: OutputFile
         Value: "$(OutDir)\\coil$(coil_dllver)d.dll"
       - Key: Version
-        Value: __VERSION__
+        Value: $(coil_shortver)
       - Key: LinkIncremental
         Value: "2"
       - Key: ModuleDefinitionFile
@@ -103,7 +103,7 @@
       - Key: OutputFile
         Value: "$(OutDir)\\coil$(coil_dllver)d.dll"
       - Key: Version
-        Value: __VERSION__
+        Value: $(coil_shortver)
       - Key: LinkIncremental
         Value: "true"
       - Key: ModuleDefinitionFile
@@ -156,7 +156,7 @@
       - Key: OutputFile
         Value: "$(OutDir)\\coil$(coil_dllver)d.dll"
       - Key: Version
-        Value: __VERSION__
+        Value: $(coil_shortver)
       - Key: LinkIncremental
         Value: "2"
       - Key: ModuleDefinitionFile
@@ -209,7 +209,7 @@
       - Key: OutputFile
         Value: "$(OutDir)\\coil$(coil_dllver)d.dll"
       - Key: Version
-        Value: __VERSION__
+        Value: $(rtm_shortver)
       - Key: LinkIncremental
         Value: "true"
       - Key: ModuleDefinitionFile

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml	2014-10-21 01:12:46 UTC (rev 2580)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml	2014-10-21 01:24:50 UTC (rev 2581)
@@ -50,7 +50,7 @@
       - Key: OutputFile
         Value: "$(OutDir)\\RTC$(rtm_dllver)d.dll"
       - Key: Version
-        Value: __VERSION__
+        Value: $(rtm_shortver)
       - Key: LinkIncremental
         Value: "2"
       - Key: ModuleDefinitionFile
@@ -103,7 +103,7 @@
       - Key: OutputFile
         Value: "$(OutDir)\\RTC$(rtm_dllver)d.dll"
       - Key: Version
-        Value: __VERSION__
+        Value: $(rtm_shortver)
       - Key: LinkIncremental
         Value: "true"
       - Key: ModuleDefinitionFile
@@ -156,7 +156,7 @@
       - Key: OutputFile
         Value: "$(OutDir)\\RTC$(rtm_dllver)d.dll"
       - Key: Version
-        Value: __VERSION__
+        Value: $(rtm_shortver)
       - Key: LinkIncremental
         Value: "2"
       - Key: ModuleDefinitionFile
@@ -209,7 +209,7 @@
       - Key: OutputFile
         Value: "$(OutDir)\\RTC$(rtm_dllver)d.dll"
       - Key: Version
-        Value: __VERSION__
+        Value: $(rtm_shortver)
       - Key: LinkIncremental
         Value: "true"
       - Key: ModuleDefinitionFile

Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-10-21 01:12:46 UTC (rev 2580)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-10-21 01:24:50 UTC (rev 2581)
@@ -35,8 +35,7 @@
 
 set RTM_ROOT=%~dp0
 set COIL_ROOT=%RTM_ROOT%\coil
-
-if not DEFINED OMNI_ROOT  set OMNI_ROOT=C:\work\aaaaa\OpenRTM-aist\omniORB
+set OMNI_ROOT=%RTM_ROOT%\omniORB
 if not DEFINED ARCH       set ARCH=x86_64
 if not DEFINED VC_VERSION set VC_VERSION=10
 if not DEFINED PYTHON_DIR set PYTHON_DIR=c:\python27