[openrtm-commit:01419] r2545 - trunk/OpenRTM-aist/win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-03-31 09:48:27 +0900 (Mon, 31 Mar 2014)
New Revision: 2545

Modified:
   trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
Log:
[compat,->RELENG_1_1] Since VCTargetsPath is not set in VC2010, it is set explicitly now.

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-03-29 08:41:02 UTC (rev 2544)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-03-31 00:48:27 UTC (rev 2545)
@@ -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%