[openrtm-commit:01477] r2577 - in branches/RELENG_1_1/OpenRTM-aist: . build src/lib/coil/win32 src/lib/coil/win32/coil src/lib/rtm win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 10月 20日 (月) 14:16:10 JST
Author: kawauchi
Date: 2014-10-20 14:16:10 +0900 (Mon, 20 Oct 2014)
New Revision: 2577
Modified:
branches/RELENG_1_1/OpenRTM-aist/
branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py
branches/RELENG_1_1/OpenRTM-aist/configure.ac
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.props
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
Merged r2548-2555
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,2545-2546
+ /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,2548-2555
Modified: branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2014-10-20 04:16:42 UTC (rev 2576)
+++ branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2014-10-20 05:16:10 UTC (rev 2577)
@@ -153,6 +153,7 @@
if __name__ == '__main__':
+ import os
if len(sys.argv) < 2:
print "please specify vsprops file"
sys.exit(1)
@@ -176,6 +177,22 @@
value = value.replace("\\", "/")
value = value.replace("\"", "")
value = re.sub("(SolutionDir)", "%RTM_ROOT%", value)
+ envs = [
+ "COIL_DLLVER",
+ "COIL_VERSION",
+ "COIL_SHORTVER",
+ "RTM_DLLVER",
+ "RTM_VERSION",
+ "RTM_SHORTVER",
+ "OMNI_DLLVER",
+ "OMNI_VERSION",
+ "OMNI_SHORTVER",
+ "OMNITHREAD_DLLVER",
+ "OMNITHREAD_VERSION",
+ ]
+ for env_str in envs:
+ env_var = "%" + env_str + "%"
+ value = re.sub(env_var, os.environ[env_str], value)
dict[name] = value
dict["user_lib"] = ""
dict["user_libd"] = ""
Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac 2014-10-20 04:16:42 UTC (rev 2576)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac 2014-10-20 05:16:10 UTC (rev 2577)
@@ -18,7 +18,7 @@
dnl ------------------------------------------------------------
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(OpenRTM-aist, 1.1.0, n-ando at aist.go.jp, OpenRTM-aist)
+AC_INIT(OpenRTM-aist, 1.1.1, n-ando at aist.go.jp, OpenRTM-aist)
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([dist-bzip2 tar-pax])
AM_CONFIG_HEADER([src/lib/rtm/config_rtc.h])
Property changes on: branches/RELENG_1_1/OpenRTM-aist/configure.ac
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409
+ /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409,2548-2555
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml 2014-10-20 04:16:42 UTC (rev 2576)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml 2014-10-20 05:16:10 UTC (rev 2577)
@@ -42,7 +42,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_shortver) coil$(coil_dllver)d.def
move coil$(coil_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -95,7 +95,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_shortver) coil$(coil_dllver)d.def
move coil$(coil_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -148,7 +148,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_shortver) coil$(coil_dllver)d.def
move coil$(coil_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -201,7 +201,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_shortver) coil$(coil_dllver)d.def
move coil$(coil_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -252,7 +252,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py coil_static.lib $(TargetName) $(coil_version) $(TargetName).def
+ start /wait cmd /c makedeffile.py coil_static.lib $(TargetName) $(coil_shortver) $(TargetName).def
move coil$(coil_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -302,7 +302,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver) $(coil_version) coil$(coil_dllver).def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver) $(coil_shortver) coil$(coil_dllver).def
move coil$(coil_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -352,7 +352,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py coil_static.lib $(TargetName) $(coil_version) $(TargetName).def
+ start /wait cmd /c makedeffile.py coil_static.lib $(TargetName) $(coil_shortver) $(TargetName).def
move coil$(coil_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -402,7 +402,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver) $(coil_version) coil$(coil_dllver).def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver) $(coil_shortver) coil$(coil_dllver).def
move coil$(coil_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.props
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.props 2014-10-20 04:16:42 UTC (rev 2576)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.props 2014-10-20 05:16:10 UTC (rev 2577)
@@ -3,6 +3,7 @@
<PropertyGroup Label="UserMacros">
<coil_dllver>$(COIL_DLLVER)</coil_dllver>
<coil_version>$(COIL_VERSION)</coil_version>
+ <coil_shortver>$(COIL_SHORTVER)</coil_shortver>
<coil_includes>$(coil_root);..</coil_includes>
<coil_libdir>$(coil_root)\bin</coil_libdir>
<coil_bin>$(coil_root)\bin;$(coil_root)\build</coil_bin>
@@ -32,6 +33,9 @@
<BuildMacro Include="coil_version">
<Value>$(coil_version)</Value>
</BuildMacro>
+ <BuildMacro Include="coil_shortver">
+ <Value>$(coil_shortver)</Value>
+ </BuildMacro>
<BuildMacro Include="coil_includes">
<Value>$(coil_includes)</Value>
</BuildMacro>
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops 2014-10-20 04:16:42 UTC (rev 2576)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops 2014-10-20 05:16:10 UTC (rev 2577)
@@ -24,6 +24,10 @@
Name="coil_version"
Value="%COIL_VERSION%"
/>
+ <UserMacro
+ Name="coil_shortver"
+ Value="%COIL_SHORTVER%"
+ />
<!-- coil macros -->
<UserMacro
Name="coil_includes"
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml 2014-10-20 04:16:42 UTC (rev 2576)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml 2014-10-20 05:16:10 UTC (rev 2577)
@@ -42,7 +42,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_version) RTC$(rtm_dllver)d.def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
move RTC$(rtm_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -95,7 +95,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_version) RTC$(rtm_dllver)d.def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
move RTC$(rtm_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -148,7 +148,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_version) RTC$(rtm_dllver)d.def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
move RTC$(rtm_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -201,7 +201,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_version) RTC$(rtm_dllver)d.def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
move RTC$(rtm_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -252,7 +252,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_version) $(TargetName).def
+ start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
move RTC$(rtm_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -301,7 +301,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_version) RTC$(rtm_dllver).def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_shortver) RTC$(rtm_dllver).def
move RTC$(rtm_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -351,7 +351,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_version) $(TargetName).def
+ start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
move RTC$(rtm_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -400,7 +400,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_version) RTC$(rtm_dllver).def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_shortver) RTC$(rtm_dllver).def
move RTC$(rtm_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat 2014-10-20 04:16:42 UTC (rev 2576)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat 2014-10-20 05:16:10 UTC (rev 2577)
@@ -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,31 @@
@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 DEFINED OMNI_ROOT set OMNI_ROOT=C:\work\aaaaa\OpenRTM-aist\omniORB
+if not DEFINED ARCH set ARCH=x86_64
+if not DEFINED VC_VERSION set VC_VERSION=10
+if not DEFINED PYTHON_DIR 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%
if %ARCH% == x86 set DLL_ARCH=
@@ -59,21 +71,20 @@
set OMNITHREAD_VERSION=3.4
@rem ------------------------------------------------------------
- at rem Printing env variables
-echo Environment variables:
-echo ARCH : %ARCH%
-echo VC_VERSION : %VC_VERSION%
-echo PYTHON_DIR : %PYTHON_DIR%
+ at rem Copying Config.cmake
+ at rem ------------------------------------------------------------
+%PYTHON_DIR%\python build\cmakeconfgen.py rtm_config.vsprops
+move OpenRTMConfig.cmake cmake
+
@rem ============================================================
@rem switching to x86 or x86_64
@rem ============================================================
echo ARCH %ARCH%
if %ARCH% == x86 goto x86
if %ARCH% == x86_64 goto x86_64
-goto end
+goto END
-
@rem ============================================================
@rem Compiling 32bit binaries
@rem ============================================================
@@ -87,18 +98,19 @@
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
+ set PLATFORMTOOL=
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
+ set PLATFORMTOOL=/p:PlatformToolset=v110
goto MSBUILDx86
)
if %VC_VERSION% == 12 (
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
set VCTOOLSET=12.0
+ set PLATFORMTOOL=/p:PlatformToolset=v120
goto MSBUILDx86
)
@@ -117,13 +129,14 @@
:MSBUILDx86
echo Visual Studio Dir: %VSINSTALLDIR%
echo LIB: %LIB%
-set OPT=/M:4 /toolsversion:%VCTOOLSET% /p:platform=Win32
+set OPT=/M:4 /toolsversion:%VCTOOLSET% %PLATFORMTOOL% /p:platform=Win32
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
@@ -141,18 +154,19 @@
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
+ set PLATFORMTOOL=
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
+ set PLATFORMTOOL=/p:PlatformToolset=v110
goto MSBUILDx64
)
if /i %VC_VERSION% == 12 (
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
set VCTOOLSET=12.0
+ set PLATFORMTOOL=/p:PlatformToolset=v120
goto MSBUILDx64
)
echo Visual Studio Dir: %VSINSTALLDIR%
@@ -173,14 +187,17 @@
:MSBUILDx64
echo Visual Studio Dir: %VSINSTALLDIR%
echo LIB: %LIB%
-set OPT=/M:4 /toolsversion:%VCTOOLSET% /p:platform=x64
+set OPT=/M:4 /toolsversion:%VCTOOLSET% %PLATFORMTOOL% /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%
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh 2014-10-20 04:16:42 UTC (rev 2576)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh 2014-10-20 05:16:10 UTC (rev 2577)
@@ -9,12 +9,22 @@
#
# The following environment variables should be set.
#
-export OMNI_VERSION=4.1.7
-export OMNITH_VER=3.4
-export PYTHON_DIR=/cygdrive/c/Python27
-export VC_VERSION=10
-export ARCH=x86
-#
+if test "x$OMNI_VERSION" = "x" ; then
+ export OMNI_VERSION=4.1.7
+fi
+if test "x$OMNITH_VER" = "x" ; then
+ export OMNITH_VER=3.4
+fi
+if test "x$PYTHON_DIR" = "x" ; then
+ export PYTHON_DIR=/cygdrive/c/Python27
+fi
+if test "x$VC_VERSION" = "x" ; then
+ export VC_VERSION=10
+fi
+if test "x$ARCH" = "x" ; then
+ export ARCH=x86
+fi
+
export PATH=/cygdrive/c/cygwin64/bin:$PATH
echo `pwd`
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2014-10-20 04:16:42 UTC (rev 2576)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2014-10-20 05:16:10 UTC (rev 2577)
@@ -5,6 +5,7 @@
<omnithread_dllver>$(OMNITHREAD_DLLVER)</omnithread_dllver>
<rtm_dllver>$(RTM_DLLVER)</rtm_dllver>
<rtm_version>$(RTM_VERSION)</rtm_version>
+ <rtm_shortver>$(RTM_SHORTVER)</rtm_shortver>
<coil_dllver>$(COIL_DLLVER)</coil_dllver>
<coil_lib>coil$(coil_dllver).lib</coil_lib>
<coil_libd>coil$(coil_dllver)d.lib</coil_libd>
@@ -54,6 +55,9 @@
<BuildMacro Include="rtm_version">
<Value>$(rtm_version)</Value>
</BuildMacro>
+ <BuildMacro Include="rtm_shortver">
+ <Value>$(rtm_shortver)</Value>
+ </BuildMacro>
<BuildMacro Include="coil_dllver">
<Value>$(coil_dllver)</Value>
</BuildMacro>
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2014-10-20 04:16:42 UTC (rev 2576)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2014-10-20 05:16:10 UTC (rev 2577)
@@ -38,6 +38,10 @@
Value="%RTM_VERSION%"
/>
<UserMacro
+ Name="rtm_shortver"
+ Value="%RTM_SHORTVER%"
+ />
+ <UserMacro
Name="coil_dllver"
Value="%COIL_DLLVER%"
/>
More information about the openrtm-commit
mailing list