[openrtm-commit:01658] r2679 - in branches/RELENG_1_1/OpenRTM-aist: . build packages/deb/debian src/lib/coil win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2015年 11月 19日 (木) 17:58:38 JST
Author: kawauchi
Date: 2015-11-19 17:58:38 +0900 (Thu, 19 Nov 2015)
New Revision: 2679
Added:
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
Removed:
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
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/packages/deb/debian/changelog
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[merge] r2677-2678 has been merged from trunk. for Windows installer of 1.1.2.
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,2548-2566,2568,2573-2574,2592,2605,2648,2652-2653,2670
+ /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-2566,2568,2573-2574,2592,2605,2648,2652-2653,2670,2677-2678
Modified: branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2015-11-19 06:48:22 UTC (rev 2678)
+++ branches/RELENG_1_1/OpenRTM-aist/build/cmakeconfgen.py 2015-11-19 08:58:38 UTC (rev 2679)
@@ -46,9 +46,6 @@
#
# OpenRTM-aist specific directory
# - COIL_INCLUDE_DIR: coil include dir
-# - OPENRTM_INCLUDE_DIR: OpenRTM's include directory
-# - OPENRTM_LIB_DIR: OpenRTM's lib directory
-# - OPENRTM_DATA_DIR: OpenRTM's shared directory
#
# OpenRTM-aist version
# - OPENRTM_VERSION: x.y.z version
@@ -67,10 +64,67 @@
message(STATUS "OpenRTMConfig.cmake found.")
message(STATUS "Configrued by configuration mode.")
+# OpenRTM-aist version
+set(OPENRTM_VERSION [openrtm_version])
+set(OPENRTM_VERSION_MAJOR [openrtm_version_major])
+set(OPENRTM_VERSION_MINOR [openrtm_version_minor])
+set(OPENRTM_VERSION_PATCH [openrtm_version_patch])
+set(OPENRTM_SHORT_VERSION [openrtm_short_version])
+
+# CMAKE_GENERATOR check
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008")
+ set(RTM_VC_VER "vc9")
+ set(CMAKE_BITNESS "32")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 2010")
+ set(RTM_VC_VER "vc10")
+ set(CMAKE_BITNESS "32")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 2010 Win64")
+ set(RTM_VC_VER "vc10")
+ set(CMAKE_BITNESS "64")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012")
+ set(RTM_VC_VER "vc11")
+ set(CMAKE_BITNESS "32")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 2012 Win64")
+ set(RTM_VC_VER "vc11")
+ set(CMAKE_BITNESS "64")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013")
+ set(RTM_VC_VER "vc12")
+ set(CMAKE_BITNESS "32")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 12 2013 Win64")
+ set(RTM_VC_VER "vc12")
+ set(CMAKE_BITNESS "64")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015")
+ set(RTM_VC_VER "vc14")
+ set(CMAKE_BITNESS "32")
+endif()
+if (${CMAKE_GENERATOR} STREQUAL "Visual Studio 14 2015 Win64")
+ set(RTM_VC_VER "vc14")
+ set(CMAKE_BITNESS "64")
+endif()
+
+MESSAGE(STATUS "VC version is : ${CMAKE_GENERATOR} (${CMAKE_BITNESS}bit)")
+
+if ("${CMAKE_BITNESS}" STREQUAL "32")
+ if ($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "x86")
+ set(OPENRTM_DIR "C:/Program Files/OpenRTM-aist/${OPENRTM_VERSION}_${RTM_VC_VER}")
+ else()
+ set(OPENRTM_DIR "C:/Program Files (x86)/OpenRTM-aist/${OPENRTM_VERSION}_${RTM_VC_VER}")
+ endif()
+else()
+ set(OPENRTM_DIR "C:/Program Files/OpenRTM-aist/${OPENRTM_VERSION}_${RTM_VC_VER}")
+endif()
+
+string(REGEX REPLACE "/$" "" OPENRTM_DIR "${OPENRTM_DIR}")
+
string(REPLACE "\\\\" "/" OMNIORB_DIR "$ENV{OMNI_ROOT}")
-string(REPLACE "\\\\" "/" OPENRTM_DIR "$ENV{RTM_ROOT}")
string(REGEX REPLACE "/$" "" OMNIORB_DIR "${OMNIORB_DIR}")
-string(REGEX REPLACE "/$" "" OPENRTM_DIR "${OPENRTM_DIR}")
# omniORB options
file(GLOB _vers RELATIVE "${OMNIORB_DIR}" "${OMNIORB_DIR}/THIS_IS_OMNIORB*")
@@ -79,6 +133,10 @@
endif()
string(REGEX REPLACE "[[]^0-9]+([[]0-9]+)_([[]0-9]+)_([[]0-9]+)"
"\\\\1.\\\\2.\\\\3" OMNIORB_VERSION "${_vers}")
+
+set(OMNIORB_DIR ${OPENRTM_DIR}/omniORB/${OMNIORB_VERSION}_${RTM_VC_VER})
+set(OMNIORB_SHORT_VERSION [omni_dllver])
+
set(OMNIORB_CFLAGS [omniorb_cflags])
set(OMNIORB_INCLUDE_DIRS [omniorb_include_dirs])
set(OMNIORB_LDFLAGS [omniorb_ldflags])
@@ -90,21 +148,15 @@
set(OPENRTM_INCLUDE_DIRS [openrtm_include_dirs])
set(OPENRTM_LDFLAGS [openrtm_ldflags])
set(OPENRTM_LIBRARY_DIRS [openrtm_lib_dirs])
-set(OPENRTM_LIBRARIES [openrtm_libs])
+if ("${CMAKE_BITNESS}" STREQUAL "32")
+ set(OPENRTM_LIBRARIES [openrtm_libs])
+else()
+ set(OPENRTM_LIBRARIES [openrtm_libs_x64])
+endif()
# OpenRTM-aist specific directory
set(COIL_INCLUDE_DIR [coil_include_dir])
-set(OPENRTM_INCLUDE_DIR [openrtm_include_dir])
-set(OPENRTM_LIB_DIR [openrtm_libdir])
-set(OPENRTM_DATA_DIR [openrtm_data_dir])
-# OpenRTM-aist version
-set(OPENRTM_VERSION [openrtm_version])
-set(OPENRTM_VERSION_MAJOR [openrtm_version_major])
-set(OPENRTM_VERSION_MINOR [openrtm_version_minor])
-set(OPENRTM_VERSION_PATCH [openrtm_version_patch])
-set(OPENRTM_SHORT_VERSION [openrtm_short_version])
-
# OpenRTM-aist's CORBA related settings
set(OPENRTM_ORB [openrtm_orb])
set(OPENRTM_IDL_WRAPPER [openrtm_idl_wrapper])
@@ -221,9 +273,10 @@
omni_libs += ";" + process_lib(dict["omni_libd"], "debug")
rtm_libs = process_lib(dict["rtm_lib"], "optimized")
rtm_libs += ";" + process_lib(dict["rtm_libd"], "debug")
+ rtm_libs_x64 = process_lib(dict["rtm_lib_x64"], "optimized")
+ rtm_libs_x64 += ";" + process_lib(dict["rtm_libd_x64"], "debug")
-
dict["omniorb_cflags"] = omni_cflags
dict["omniorb_include_dirs"] = dict["omni_includes"]
dict["omniorb_ldflags"] = ""
@@ -235,10 +288,8 @@
dict["openrtm_ldflags"] = ""
dict["openrtm_lib_dirs"] = str(dict["rtm_libdir"] + ";" + dict["omni_libdir"])
dict["openrtm_libs"] = str(rtm_libs)
+ dict["openrtm_libs_x64"] = str(rtm_libs_x64)
dict["coil_include_dir"] = str(dict["rtm_libdir"])
- dict["openrtm_include_dir"] = "%RTM_ROOT%"
- dict["openrtm_libdir"] = "%RTM_ROOT%"
- dict["openrtm_data_dir"] = "%RTM_ROOT%"
dict["openrtm_version"] = str(dict["rtm_version"])
dict["openrtm_version_major"] = str(dict["rtm_version"].split(".")[0])
dict["openrtm_version_minor"] = str(dict["rtm_version"].split(".")[1])
Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac 2015-11-19 06:48:22 UTC (rev 2678)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac 2015-11-19 08:58:38 UTC (rev 2679)
@@ -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.1, n-ando at aist.go.jp, OpenRTM-aist)
+AC_INIT(OpenRTM-aist, 1.1.2, 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,2548-2555,2605
+ /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,2605,2677-2678
Modified: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog 2015-11-19 06:48:22 UTC (rev 2678)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/changelog 2015-11-19 08:58:38 UTC (rev 2679)
@@ -1,3 +1,9 @@
+openrtm-aist (1.1.2-0) precise; urgency=low
+
+ * 1.1.2-0 (1.1.2-RELEASE). OpenRTM-aist-1.1.2-RELEASE
+
+ -- Noriaki Ando <n-ando at aist.go.jp> Thu, 17 Sep 2015 13:50:25 +0900
+
openrtm-aist (1.1.1-0) experimental; urgency=low
* 1.1.1-0 (1.1.1-RELEASE). OpenRTM-aist-1.1.1-RELEASE
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac 2015-11-19 06:48:22 UTC (rev 2678)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/configure.ac 2015-11-19 08:58:38 UTC (rev 2679)
@@ -18,7 +18,7 @@
dnl ------------------------------------------------------------
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(coil, 1.1.1, n-ando at aist.go.jp, coil)
+AC_INIT(coil, 1.1.2, n-ando at aist.go.jp, coil)
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([dist-bzip2 tar-pax])
AM_CONFIG_HEADER([include/coil/config_coil.h])
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2015-11-19 06:48:22 UTC (rev 2678)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2015-11-19 08:58:38 UTC (rev 2679)
@@ -14,8 +14,8 @@
rm -f coil_config.vsprops
rm -f coil_distbuild.props
rm -f coil_config.props
+ rm -f build.bat
-
sln: OpenRTM-aist_vc8.sln OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln OpenRTM-aist_vc11.sln OpenRTM-aist_vc12.sln
OpenRTM-aist_vc8.sln: OpenRTM-aist.sln.dep
@@ -73,6 +73,9 @@
coil_config.props:
cp -p $(top_srcdir)/src/lib/coil/win32/coil_config.props .
+build.bat:
+ sed -e 's/__VERSION__/$(VERSION)/g' build.bat.in > build.bat
+
AUTHORS:
cp $(top_srcdir)/AUTHORS .
ChangeLog:
@@ -87,7 +90,7 @@
cp $(top_srcdir)/README.jp .
-dist-hook: clean-local sln vsprops
+dist-hook: clean-local sln vsprops build.bat
EXTRA_DIST = \
OpenRTM-aist.sln.dep \
Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat 2015-11-19 06:48:22 UTC (rev 2678)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat 2015-11-19 08:58:38 UTC (rev 2679)
@@ -1,204 +0,0 @@
- at echo off
- at rem ============================================================
- at rem OpenRTM-aist for Windows build batch
- at rem
- at rem @author Noriaki Ando <n-ando at aist.go.jp>
- at rem Copyright (C) 2014 n-ando All Rights Reserved
- at rem
- at rem In order to compile OpenRTM-aist on Windows, this batch file can be
- at rem used with the following prerequisite tools and environments.
- at rem
- at rem 0. 64bit Windows 7 or later
- at rem If you want to compile both 32 bit and 64 bit binaries on one OS,
- at rem 64 bit OS is required. Because the omniidl which is built as
- at rem target architecture executable in midstream is required to
- at rem compile omniORB itself. OS have to execute both (32 bit /64 bit)
- at rem executable.
- at rem
- at rem 1. Cygwin
- at rem cygwin-lite distributed from omniORB is not recommended.
- at rem The following command should be installed on Cygwin
- at rem wget, make, zip, svn
- at rem
- at rem 2. Visual C++
- at rem Currently VC2008, 2010, 2012, 2013 are supported.
- at rem Different versions in the same machine are not recommended.
- at rem
- at rem Environment vairables required
- at rem
- at rem OMNI_ROOT: omniORB binary installation dir
- at rem ARCH: x86 or x86_64
- at rem VC_VERSION: 9(=VC2008), 10(=VC2010), 11(=VC2012), 12(=VC2013),....
- at rem PYTHON_DIR: /cygdrive/c/Python27
- at rem
- at rem ============================================================
-
-set RTM_ROOT=%~dp0
-set COIL_ROOT=%RTM_ROOT%\coil
-set OMNI_ROOT=%RTM_ROOT%\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=
-if %ARCH% == x86_64 set DLL_ARCH=_x64
-
-set COIL_DLLVER=111_vc%VC_VERSION%%DLL_ARCH%
-set COIL_VERSION=1.1.1
-set COIL_SHORTVER=1.1
-
-set RTM_DLLVER=111_vc%VC_VERSION%%DLL_ARCH%
-set RTM_VERSION=1.1.1
-set RTM_SHORTVER=1.1
-
-if not DEFINED OMNI_VERSION set OMNI_VERSION=4.2.0
-set OMNI_DLLVER=%OMNI_VERSION:.=%
-if not DEFINED OMNI_SHORTVER set OMNI_SHORTVER=4.2
-if not DEFINED OMNITHREAD_VERSION set OMNITHREAD_VERSION=4.0
-set OMNITHREAD_DLLVER=%OMNITHREAD_VERSION:.=%
-
- at rem ------------------------------------------------------------
- at rem Copying Config.cmake
- at rem ------------------------------------------------------------
-%PYTHON_DIR%\python build\cmakeconfgen.py rtm_config.vsprops
-move OpenRTMConfig.cmake cmake
-
-
- at rem ============================================================
- at rem switching to x86 or x86_64
- at rem ============================================================
-echo ARCH %ARCH%
-if %ARCH% == x86 goto x86
-if %ARCH% == x86_64 goto x86_64
-goto END
-
- at rem ============================================================
- at rem Compiling 32bit binaries
- at rem ============================================================
-: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
- set VCTOOLSET=4.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 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
- )
-
- at rem ------------------------------------------------------------
- at rem Build (VC2008 x86)
- at rem ------------------------------------------------------------
-:VCBUILDx86
-echo Visual Studio Dir: %VSINSTALLDIR%
-echo LIB: %LIB%
-vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "release|win32"
-vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "debug|win32"
-goto END
-
- at rem ------------------------------------------------------------
- at rem Build (VC2010- x86)
- at rem ------------------------------------------------------------
-:MSBUILDx86
-echo Visual Studio Dir: %VSINSTALLDIR%
-echo LIB: %LIB%
-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=release %OPT% %LOG% %SLN%
-
-goto END
-
- at rem ============================================================
- at rem Compiling 64bit binaries
- at rem ============================================================
-:x86_64
-echo Compiling 64bit binaries
- at rem Setting up Visual C++ environment
-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
- set VCTOOLSET=4.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 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%
-echo LIB: %LIB%
-
- at rem ------------------------------------------------------------
- at rem Build (VC2008 x64)
- at rem ------------------------------------------------------------
-:VCBUILDx64
-echo Visual Studio Dir: %VSINSTALLDIR%
-echo LIB: %LIB%
-vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "release|x64"
-vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "debug|x64"
-goto END
-
- at rem ------------------------------------------------------------
- at rem Build (VC2010- x64)
- at rem ------------------------------------------------------------
-:MSBUILDx64
-echo Visual Studio Dir: %VSINSTALLDIR%
-echo LIB: %LIB%
-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=release %OPT% %LOG% %SLN%
-
-goto END
-
-:END
-set PATH=%PATH_ORG%
Copied: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in (from rev 2678, trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in)
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in (rev 0)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2015-11-19 08:58:38 UTC (rev 2679)
@@ -0,0 +1,204 @@
+ at echo off
+ at rem ============================================================
+ at rem OpenRTM-aist for Windows build batch
+ at rem
+ at rem @author Noriaki Ando <n-ando at aist.go.jp>
+ at rem Copyright (C) 2014 n-ando All Rights Reserved
+ at rem
+ at rem In order to compile OpenRTM-aist on Windows, this batch file can be
+ at rem used with the following prerequisite tools and environments.
+ at rem
+ at rem 0. 64bit Windows 7 or later
+ at rem If you want to compile both 32 bit and 64 bit binaries on one OS,
+ at rem 64 bit OS is required. Because the omniidl which is built as
+ at rem target architecture executable in midstream is required to
+ at rem compile omniORB itself. OS have to execute both (32 bit /64 bit)
+ at rem executable.
+ at rem
+ at rem 1. Cygwin
+ at rem cygwin-lite distributed from omniORB is not recommended.
+ at rem The following command should be installed on Cygwin
+ at rem wget, make, zip, svn
+ at rem
+ at rem 2. Visual C++
+ at rem Currently VC2008, 2010, 2012, 2013 are supported.
+ at rem Different versions in the same machine are not recommended.
+ at rem
+ at rem Environment vairables required
+ at rem
+ at rem OMNI_ROOT: omniORB binary installation dir
+ at rem ARCH: x86 or x86_64
+ at rem VC_VERSION: 9(=VC2008), 10(=VC2010), 11(=VC2012), 12(=VC2013),....
+ at rem PYTHON_DIR: /cygdrive/c/Python27
+ at rem
+ at rem ============================================================
+
+set RTM_ROOT=%~dp0
+set COIL_ROOT=%RTM_ROOT%\coil
+set OMNI_ROOT=%RTM_ROOT%\omniORB
+if not DEFINED ARCH set ARCH=x86
+if not DEFINED VC_VERSION set VC_VERSION=12
+if not DEFINED PYTHON_DIR set PYTHON_DIR=c:\python27
+if not DEFINED RTM_VERSION set RTM_VERSION=__VERSION__
+if not DEFINED OMNI_VERSION set OMNI_VERSION=4.2.0
+if not DEFINED OMNITHREAD_VERSION set OMNITHREAD_VERSION=4.0
+
+ 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%
+echo RTM_VERSION : %RTM_VERSION%
+echo OMNI_VERSION : %OMNI_VERSION%
+echo OMNITHREAD_VERSION : %OMNITHREAD_VERSION%
+
+set PATH_ORG=%PATH%
+set PATH=%PATH%;C:\cygwin\bin;C:\cygwin64\bin
+set PATH=%OMNI_ROOT%\bin\x86_win32;%PATH%
+
+ at rem ------------------------------------------------------------
+ at rem Copying Config.cmake
+ at rem ------------------------------------------------------------
+set RTM_DLLVER=%RTM_VERSION:.=%
+set RTM_SHORTVER=%RTM_VERSION:~0,3%
+
+set COIL_VERSION=%RTM_VERSION%
+set COIL_DLLVER=%RTM_DLLVER%
+set COIL_SHORTVER=%RTM_SHORTVER%
+
+set OMNI_DLLVER=%OMNI_VERSION:.=%
+set OMNI_SHORTVER=%OMNI_VERSION:~0,3%
+set OMNITHREAD_DLLVER=%OMNITHREAD_VERSION:.=%
+
+%PYTHON_DIR%\python build\cmakeconfgen.py rtm_config.vsprops
+move OpenRTMConfig.cmake cmake
+
+
+ at rem ============================================================
+ at rem switching to x86 or x86_64
+ at rem ============================================================
+echo ARCH %ARCH%
+if %ARCH% == x86 goto x86
+if %ARCH% == x86_64 goto x86_64
+goto END
+
+ at rem ============================================================
+ at rem Compiling 32bit binaries
+ at rem ============================================================
+: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
+ set VCTOOLSET=4.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 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
+ )
+
+ at rem ------------------------------------------------------------
+ at rem Build (VC2008 x86)
+ at rem ------------------------------------------------------------
+:VCBUILDx86
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "release|win32"
+vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "debug|win32"
+goto END
+
+ at rem ------------------------------------------------------------
+ at rem Build (VC2010- x86)
+ at rem ------------------------------------------------------------
+:MSBUILDx86
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+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=release %OPT% %LOG% %SLN%
+
+goto END
+
+ at rem ============================================================
+ at rem Compiling 64bit binaries
+ at rem ============================================================
+:x86_64
+echo Compiling 64bit binaries
+ at rem Setting up Visual C++ environment
+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
+ set VCTOOLSET=4.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 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%
+echo LIB: %LIB%
+
+ at rem ------------------------------------------------------------
+ at rem Build (VC2008 x64)
+ at rem ------------------------------------------------------------
+:VCBUILDx64
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "release|x64"
+vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "debug|x64"
+goto END
+
+ at rem ------------------------------------------------------------
+ at rem Build (VC2010- x64)
+ at rem ------------------------------------------------------------
+:MSBUILDx64
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+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=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 2015-11-19 06:48:22 UTC (rev 2678)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh 2015-11-19 08:58:38 UTC (rev 2679)
@@ -10,16 +10,16 @@
# The following environment variables should be set.
#
if test "x$OMNI_VERSION" = "x" ; then
- export OMNI_VERSION=4.1.7
+ export OMNI_VERSION=4.2.0
fi
if test "x$OMNITH_VER" = "x" ; then
- export OMNITH_VER=3.4
+ export OMNITH_VER=4.0
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
+ export VC_VERSION=12
fi
if test "x$ARCH" = "x" ; then
export ARCH=x86
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 2015-11-19 06:48:22 UTC (rev 2678)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2015-11-19 08:58:38 UTC (rev 2679)
@@ -31,9 +31,13 @@
/>
<UserMacro
Name="rtm_dllver"
- Value="%RTM_DLLVER%"
+ Value="%RTM_DLLVER%_${RTM_VC_VER}"
/>
<UserMacro
+ Name="rtm_dllver_x64"
+ Value="%RTM_DLLVER%_${RTM_VC_VER}_x64"
+ />
+ <UserMacro
Name="rtm_version"
Value="%RTM_VERSION%"
/>
@@ -43,8 +47,12 @@
/>
<UserMacro
Name="coil_dllver"
- Value="%COIL_DLLVER%"
+ Value="%COIL_DLLVER%_${RTM_VC_VER}"
/>
+ <UserMacro
+ Name="coil_dllver_x64"
+ Value="%COIL_DLLVER%_${RTM_VC_VER}_x64"
+ />
<!-- omniORB macros -->
<UserMacro
Name="omni_includes"
@@ -88,10 +96,19 @@
Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
/>
<UserMacro
+ Name="rtm_libd_x64"
+
+ Value="RTC$(rtm_dllver_x64)d.lib $(coil_libd_x64) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+ />
+ <UserMacro
Name="rtm_lib"
Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
/>
<UserMacro
+ Name="rtm_lib_x64"
+ Value="RTC$(rtm_dllver_x64).lib $(coil_lib_x64) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+ />
+ <UserMacro
Name="rtm_idlc"
Value="omniidl"
/>
@@ -105,8 +122,16 @@
Value="coil$(coil_dllver).lib"
/>
<UserMacro
+ Name="coil_lib_x64"
+ Value="coil$(coil_dllver_x64).lib"
+ />
+ <UserMacro
Name="coil_libd"
Value="coil$(coil_dllver)d.lib"
/>
+ <UserMacro
+ Name="coil_libd_x64"
+ Value="coil$(coil_dllver_x64)d.lib"
+ />
</VisualStudioPropertySheet>
More information about the openrtm-commit
mailing list