[openrtm-commit:01424] r2550 - trunk/OpenRTM-aist/win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-04-04 02:06:35 +0900 (Fri, 04 Apr 2014)
New Revision: 2550

Modified:
   trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
Log:
[compat,->RELENG_1_1] cbuild.bat updated.

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-04-03 17:06:13 UTC (rev 2549)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-04-03 17:06:35 UTC (rev 2550)
@@ -5,7 +5,7 @@
 @rem @author Noriaki Ando <n-ando at aist.go.jp>
 @rem                Copyright (C) 2014 n-ando All Rights Reserved
 @rem
- at rem In order to compile omniORB on Windows, this batch file can be
+ at rem In order to compile OpenRTM-aist on Windows, this batch file can be
 @rem used with the following prerequisite tools and environments.
 @rem
 @rem 0. 64bit Windows 7 or later
@@ -26,19 +26,23 @@
 @rem
 @rem Environment vairables required
 @rem
- at rem OMNIORB_SRC: URL to download omniORB source code tar-ball
+ at rem OMNI_ROOT: omniORB binary installation dir
 @rem ARCH: x86 or x86_64
 @rem VC_VERSION: 9(=VC2008), 10(=VC2010), 11(=VC2012), 12(=VC2013),....
 @rem PYTHON_DIR: /cygdrive/c/Python27
 @rem
 @rem ============================================================
 
-set PATH=%PATH%;C:\cygwin\bin;C:\cygwin64\bin
 set RTM_ROOT=%~dp0
 set COIL_ROOT=%RTM_ROOT%\coil
-set OMNI_ROOT=C:\work\aaaaa\OpenRTM-aist\omniORB
-set VC_VERSION=10
-set ARCH=x86_64
+
+if not {%OMNI_ROOT%} == {0}  set OMNI_ROOT=C:\work\aaaaa\OpenRTM-aist\omniORB
+if not {%ARCH%} == {0}       set ARCH=x86_64
+if not {%VC_VERSION%} == {0} set VC_VERSION=10
+if not {%PYTHON_DIR%} == {0} set PYTHON_DIR=c:\python27
+
+set PATH_ORG=%PATH%
+set PATH=%PATH%;C:\cygwin\bin;C:\cygwin64\bin
 set PATH=%OMNI_ROOT%\bin\x86_win32;%PATH%
 
 if %ARCH% == x86       set DLL_ARCH=
@@ -59,6 +63,12 @@
 set OMNITHREAD_VERSION=3.4
 
 @rem ------------------------------------------------------------
+ at rem Copying Config.cmake
+ at rem ------------------------------------------------------------
+%PYTHON_DIR%\python build\cmakeconfgen.py rtm_config.vsprops
+move OpenRTMConfig.cmake cmake
+
+ at rem ------------------------------------------------------------
 @rem Printing env variables
 echo Environment variables:
 echo ARCH       : %ARCH%
@@ -71,7 +81,7 @@
 echo ARCH %ARCH%
 if %ARCH% == x86       goto x86
 if %ARCH% == x86_64    goto x86_64
-goto end
+goto END
 
 
 @rem ============================================================
@@ -87,13 +97,11 @@
 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 (
@@ -122,8 +130,9 @@
 set LOG=/fileLogger /flp:logfile=debug.log /v:diag 
 
 msbuild /t:clean /p:configuration=debug     %OPT% %SLN%
+msbuild /t:rebuild /p:configuration=debug   %OPT% %LOG% %SLN%
+
 msbuild /t:clean /p:configuration=release   %OPT% %SLN%
-msbuild /t:rebuild /p:configuration=debug   %OPT% %LOG% %SLN%
 msbuild /t:rebuild /p:configuration=release %OPT% %LOG% %SLN%
 
 goto END
@@ -141,13 +150,11 @@
 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 (
@@ -176,11 +183,14 @@
 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:rebuild /p:configuration=debug   %OPT% %LOG% %SLN%
+
 msbuild /t:clean /p:configuration=release   %OPT% %SLN%
-msbuild /t:rebuild /p:configuration=debug   %OPT% %LOG% %SLN%
 msbuild /t:rebuild /p:configuration=release %OPT% %LOG% %SLN%
 
 goto END
 
 :END
+set PATH=%PATH_ORG%
\ No newline at end of file