[openrtm-commit:01392] r2538 - trunk/OpenRTM-aist/win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 3月 22日 (土) 09:31:26 JST
Author: n-ando
Date: 2014-03-22 09:31:26 +0900 (Sat, 22 Mar 2014)
New Revision: 2538
Modified:
trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh
Log:
[compat,->RELENG_1_1] build scripts updated.
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat 2014-03-20 09:05:23 UTC (rev 2537)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat 2014-03-22 00:31:26 UTC (rev 2538)
@@ -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
- at rem set VC_VERSION=10
- at rem set ARCH=x86_64
+set OMNI_ROOT=%RTM_ROOT%\omniORB
+set VC_VERSION=10
+set ARCH=x86
set PATH=%OMNI_ROOT%\bin\x86_win32;%PATH%
if %ARCH% == x86 set DLL_ARCH=
@@ -80,10 +80,22 @@
:x86
echo Compiling 32bit binaries
echo Setting up Visual C++ environment.
-if %VC_VERSION% == 9 (call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86 ; goto VCBUILDx86)
-if %VC_VERSION% == 10 (call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat%" x86 ; goto MSBUILDx86)
-if %VC_VERSION% == 11 (call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86 ; goto MSBUILDx86)
-if %VC_VERSION% == 12 (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 ; goto MSBUILDx86)
+if %VC_VERSION% == 9 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
+ goto VCBUILDx86
+ )
+if %VC_VERSION% == 10 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat%" x86
+ goto MSBUILDx86
+ )
+if %VC_VERSION% == 11 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
+ goto MSBUILDx86
+ )
+if %VC_VERSION% == 12 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
+ goto MSBUILDx86
+ )
@rem ------------------------------------------------------------
@rem Build (VC2008 x86)
@@ -100,8 +112,10 @@
:MSBUILDx86
echo Visual Studio Dir: %VSINSTALLDIR%
echo LIB: %LIB%
-msbuild /M:2 /t:rebuild /p:configuration=debug OpenRTM-aist_vc%VC_VERSION%.sln
-msbuild /M:2 /t:rebuild /p:configuration=release OpenRTM-aist_vc%VC_VERSION%.sln
+ at rem msbuild /M:2 /t:clean /p:configuration=debug /p:platform=Win32 OpenRTM-aist_vc%VC_VERSION%.sln
+ at rem msbuild /M:2 /t:clean /p:configuration=release /p:platform=Win32 OpenRTM-aist_vc%VC_VERSION%.sln
+ at rem msbuild /M:2 /t:rebuild /p:configuration=debug /p:platform=Win32 OpenRTM-aist_vc%VC_VERSION%.sln
+msbuild /M:2 /t:rebuild /p:configuration=release /p:platform=Win32 OpenRTM-aist_vc%VC_VERSION%.sln
goto END
@rem ============================================================
@@ -110,10 +124,22 @@
:x86_64
echo Compiling 64bit binaries
@rem Setting up Visual C++ environment
-if /i %VC_VERSION% == 9 (call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x64 ; goto VCBUILDx64)
-if /i %VC_VERSION% == 10 (call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x64 ; goto MSBUILDx64)
-if /i %VC_VERSION% == 11 (call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x64 ; goto MSBUILDx64)
-if /i %VC_VERSION% == 12 (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64 ; goto MSBUILDx64)
+if /i %VC_VERSION% == 9 (
+ echo 64bit compilation on Visual C++ 2008 is not supported. Aborting.
+ goto END
+ )
+if /i %VC_VERSION% == 10 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
+ goto MSBUILDx64
+ )
+if /i %VC_VERSION% == 11 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" amd64
+ goto MSBUILDx64
+ )
+if /i %VC_VERSION% == 12 (
+ call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
+ goto MSBUILDx64
+ )
echo Visual Studio Dir: %VSINSTALLDIR%
echo LIB: %LIB%
@@ -132,9 +158,11 @@
:MSBUILDx64
echo Visual Studio Dir: %VSINSTALLDIR%
echo LIB: %LIB%
-set VC_VERSION=10_x64
-msbuild /M:4 /t:rebuild /fileLogger /flp:logfile=debug.log /v:diag /p:configuration=debug /p:platform=x64 OpenRTM-aist_vc%VC_VERSION%.sln
-msbuild /M:4 /t:rebuild /fileLogger /flp:logfile=release.log /v:diag /p:configuration=release /p:platform=x64 OpenRTM-aist_vc%VC_VERSION%.sln
+msbuild /M:4 /t:clean /fileLogger /flp:logfile=debug.log /v:diag /p:configuration=debug /p:platform=x64 OpenRTM-aist_vc%VC_VERSION%.sln
+msbuild /M:4 /t:clean /fileLogger /flp:logfile=release.log /v:diag /p:configuration=release /p:platform=x64 OpenRTM-aist_vc%VC_VERSION%.sln
+
+ at rem msbuild /M:4 /t:rebuild /fileLogger /flp:logfile=debug.log /v:diag /p:configuration=debug /p:platform=x64 OpenRTM-aist_vc%VC_VERSION%.sln
+ at rem msbuild /M:4 /t:rebuild /fileLogger /flp:logfile=release.log /v:diag /p:configuration=release /p:platform=x64 OpenRTM-aist_vc%VC_VERSION%.sln
goto END
:END
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh 2014-03-20 09:05:23 UTC (rev 2537)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh 2014-03-22 00:31:26 UTC (rev 2538)
@@ -9,11 +9,11 @@
#
# The following environment variables should be set.
#
-# OMNI_VERSION (= 4.1.7, ...)
-# OMNITH_VER (= 3.4, ...)
-# PYTHON_DIR (= /cygdrive/c/Python27)
-# VC_VERSION (= 9, 10, ...)
-# ARCH (= x86 or x64)
+export OMNI_VERSION=4.1.7
+export OMNITH_VER=3.4
+export PYTHON_DIR=/cygdrive/c/Python27
+export VC_VERSION=10
+export ARCH=x86
#
export PATH=/cygdrive/c/cygwin64/bin:$PATH
echo `pwd`
@@ -59,6 +59,10 @@
unpack_omnibin()
{
+ omnidir=`find ./ -maxdepth 1 -name 'omniORB*' -type d`
+ if test -d $omnidir ; then
+ rm -rf $omnidir
+ fi
# getting omniORB-4.1.7.tar.bz2
if test ! -f $OMNIORB_ZIP ; then
wget $OMNIORB_URL
@@ -66,30 +70,14 @@
unzip $OMNIORB_ZIP
}
-unpack_openrtm()
+rename_omnidir()
{
- OPENRTM_ZIP=`ls OpenRTM-aist*.zip`
- if test "x$OPENRTM_ZIP" = "x" ; then
- echo "OpenRTM-aist ZIP file not found."
- exit 1
- fi
- unzip $OPENRTM_ZIP
+ omnidir=`find ./ -maxdepth 1 -name 'omniORB*' -type d`
+ mv ${omnidir} omniORB
}
-
-copy_props()
-{
- OpenRTM-aist/etc/rtm_config_omniorb415.vcprops OpenRTM-aist/rtm_config.vcprops
- OpenRTM-aist/etc/rtm_config_omniorb415.props OpenRTM-aist/rtm_config.props
-
- sed -i "s/415/$OMNI_SHORT_VER/g" OpenRTM-aist/rtm_config.vcprops
- sed -i "s/34/$OMNITH_SHORT_VER/g" OpenRTM-aist/rtm_config.vcprops
- sed -i "s/415/$OMNI_SHORT_VER/g" OpenRTM-aist/rtm_config.props
- sed -i "s/34/$OMNITH_SHORT_VER/g" OpenRTM-aist/rtm_config.props
-}
check_env
unpack_omnibin
-unpack_openrtm
+rename_omnidir
-
# end of ecript
#==============================
More information about the openrtm-commit
mailing list