[openrtm-commit:01421] r2547 - in branches/RELENG_1_1/OpenRTM-aist: . src/lib/coil win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-04-01 10:59:30 +0900 (Tue, 01 Apr 2014)
New Revision: 2547

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
Log:
r2545,2546 merged


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
   + /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

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac	2014-04-01 01:43:07 UTC (rev 2546)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac	2014-04-01 01:59:30 UTC (rev 2547)
@@ -18,7 +18,7 @@
 dnl ------------------------------------------------------------
 dnl  Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(coil, 1.1.0, n-ando at aist.go.jp, coil)
+AC_INIT(coil, 1.1.1, n-ando at aist.go.jp, coil)
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([dist-bzip2 tar-pax])
 AM_CONFIG_HEADER([include/coil/config_coil.h])

Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-04-01 01:43:07 UTC (rev 2546)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-04-01 01:59:30 UTC (rev 2547)
@@ -36,9 +36,9 @@
 set PATH=%PATH%;C:\cygwin\bin;C:\cygwin64\bin
 set RTM_ROOT=%~dp0
 set COIL_ROOT=%RTM_ROOT%\coil
-set OMNI_ROOT=%RTM_ROOT%\omniORB
+set OMNI_ROOT=C:\work\aaaaa\OpenRTM-aist\omniORB
 set VC_VERSION=10
-set ARCH=x86
+set ARCH=x86_64
 set PATH=%OMNI_ROOT%\bin\x86_win32;%PATH%
 
 if %ARCH% == x86       set DLL_ARCH=
@@ -87,11 +87,13 @@
 if %VC_VERSION% == 10 (
    call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat%" x86
    set VCTOOLSET=4.0
+   set VCTargetsPath=C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0
    goto MSBUILDx86
    )
 if %VC_VERSION% == 11 (
    call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
    set VCTOOLSET=4.0
+   set VCTargetsPath=C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\v110
    goto MSBUILDx86
    )
 if %VC_VERSION% == 12 (
@@ -115,7 +117,7 @@
 :MSBUILDx86
 echo Visual Studio Dir: %VSINSTALLDIR%
 echo LIB: %LIB%
-set OPT=/M:4 /toolsversion:$VCTOOLSET% /p:platform=Win32
+set OPT=/M:4 /toolsversion:%VCTOOLSET% /p:platform=Win32
 set SLN=OpenRTM-aist_vc%VC_VERSION%.sln
 set LOG=/fileLogger /flp:logfile=debug.log /v:diag 
 
@@ -139,11 +141,13 @@
 if /i %VC_VERSION% == 10 (
    call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
    set VCTOOLSET=4.0
+   set VCTargetsPath=C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0
    goto MSBUILDx64
    )
 if /i %VC_VERSION% == 11 (
    call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" amd64
    set VCTOOLSET=4.0
+   set VCTargetsPath=C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\v110
    goto MSBUILDx64
    )
 if /i %VC_VERSION% == 12 (
@@ -169,10 +173,9 @@
 :MSBUILDx64
 echo Visual Studio Dir: %VSINSTALLDIR%
 echo LIB: %LIB%
-set OPT=/M:4 /toolsversion:$VCTOOLSET% /p:platform=x64
+set OPT=/M:4 /toolsversion:%VCTOOLSET% /p:platform=x64
 set SLN=OpenRTM-aist_vc%VC_VERSION%.sln
 set LOG=/fileLogger /flp:logfile=debug.log /v:diag 
-
 msbuild /t:clean /p:configuration=debug     %OPT% %SLN%
 msbuild /t:clean /p:configuration=release   %OPT% %SLN%
 msbuild /t:rebuild /p:configuration=debug   %OPT% %LOG% %SLN%