[openrtm-commit:01426] r2552 - trunk/OpenRTM-aist/win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-04-04 14:44:59 +0900 (Fri, 04 Apr 2014)
New Revision: 2552

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

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-04-04 05:35:15 UTC (rev 2551)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-04-04 05:44:59 UTC (rev 2552)
@@ -36,11 +36,19 @@
 set RTM_ROOT=%~dp0
 set COIL_ROOT=%RTM_ROOT%\coil
 
-if {%OMNI_ROOT%} == {0}  set OMNI_ROOT=C:\work\aaaaa\OpenRTM-aist\omniORB
-if {%ARCH%} == {0}       set ARCH=x86_64
-if {%VC_VERSION%} == {0} set VC_VERSION=10
-if {%PYTHON_DIR%} == {0} set PYTHON_DIR=c:\python27
+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
 
+ at rem ------------------------------------------------------------
+ at rem Printing env variables
+echo Environment variables:
+echo OMNI_ROOT  : %OMNI_ROOT%
+echo ARCH       : %ARCH%
+echo VC_VERSION : %VC_VERSION%
+echo PYTHON_DIR : %PYTHON_DIR%
+
 set PATH_ORG=%PATH%
 set PATH=%PATH%;C:\cygwin\bin;C:\cygwin64\bin
 set PATH=%OMNI_ROOT%\bin\x86_win32;%PATH%
@@ -68,12 +76,6 @@
 %PYTHON_DIR%\python build\cmakeconfgen.py rtm_config.vsprops
 move OpenRTMConfig.cmake cmake
 
- at rem ------------------------------------------------------------
- at rem Printing env variables
-echo Environment variables:
-echo ARCH       : %ARCH%
-echo VC_VERSION : %VC_VERSION%
-echo PYTHON_DIR : %PYTHON_DIR%
 
 @rem ============================================================
 @rem  switching to x86 or x86_64
@@ -83,7 +85,6 @@
 if %ARCH% == x86_64    goto x86_64
 goto END
 
-
 @rem ============================================================
 @rem  Compiling 32bit binaries
 @rem ============================================================