[openrtm-commit:01483] r2583 - in branches/RELENG_1_1/OpenRTM-aist: . examples/SimpleIO src/lib/coil/win32/coil win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2014-10-21 11:29:26 +0900 (Tue, 21 Oct 2014)
New Revision: 2583

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am
   branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/make_package.sh
Log:
Merged r2560-2566


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-2559
   + /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

Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am	2014-10-21 02:14:43 UTC (rev 2582)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am	2014-10-21 02:29:26 UTC (rev 2583)
@@ -97,7 +97,7 @@
 #------------------------------------------------------------
 win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SimpleIO
 
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
 
 vc8proj: 
 	$(top_builddir)/build/vcprojtool.py vcproj           \

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp	2014-10-21 02:14:43 UTC (rev 2582)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp	2014-10-21 02:29:26 UTC (rev 2583)
@@ -19,7 +19,14 @@
 
 #ifndef NTDDI_VERSION
 #define NTDDI_VERSION 0x05000000
-#endif
+#define WINVER _WIN32_WINNT
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif // _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#define _WIN32_WINDOWS _WIN32_WINNT
+#define _WIN32_IE 0x0501
+#endif // NTDDI_VERSION
 
 #include <winsock2.h>
 #include <ws2tcpip.h>

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-21 02:14:43 UTC (rev 2582)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2014-10-21 02:29:26 UTC (rev 2583)
@@ -119,7 +119,8 @@
 :VCBUILDx86
 echo Visual Studio Dir: %VSINSTALLDIR%
 echo LIB: %LIB%
-vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln
+vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "release|win32"
+vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "debug|win32"
 goto END
 
 @rem ------------------------------------------------------------
@@ -177,7 +178,8 @@
 :VCBUILDx64
 echo Visual Studio Dir: %VSINSTALLDIR%
 echo LIB: %LIB%
-vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln
+vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "release|x64"
+vcbuild /M2 /rebuild OpenRTM-aist_vc%VC_VERSION%.sln "debug|x64"
 goto END
 
 @rem ------------------------------------------------------------

Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/make_package.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/make_package.sh	2014-10-21 02:14:43 UTC (rev 2582)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/make_package.sh	2014-10-21 02:29:26 UTC (rev 2583)
@@ -9,10 +9,18 @@
 #
 # The following environment variables should be set.
 # ex.
-export OPENRTM_DIR=OpenRTM-aist
-export PYTHON_DIR=/cygdrive/c/Python27
-export VC_VERSION=10
-export ARCH=x86
+if test "x$OPENRTM_DIR" = "x" ; then
+    export OPENRTM_DIR=OpenRTM-aist
+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=${PATH}:/bin:/usr/bin
 #
 #==============================
@@ -36,8 +44,8 @@
 /usr/bin/find ./$OPENRTM_DIR -name 'Makefile' -type f -exec rm {} \;
 /usr/bin/find ./$OPENRTM_DIR -name 'Makefile.in' -type f -exec rm {} \;
 /usr/bin/find ./$OPENRTM_DIR -name 'Makefile.am' -type f -exec rm {} \;
+
 dirs="rtm examples utils"
-dirs=""
 for d in $dirs ; do
 	/usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.obj' -type f -exec rm {} \;
 	/usr/bin/find ./$OPENRTM_DIR/$d/ -name '*.pdb' -type f -exec rm {} \;
@@ -70,9 +78,11 @@
 	PY_VER=`echo $PYTHON_DIR | sed 's/.*[Pp][Yy][Tt][Hh][Oo][Nn]\([0-9][0-9]\).*/\1/'`
 fi
 
-NEW_DIR=${OPENRTM_DIR}-${WIN_ARCH}-vc${VC_VERSION}
-ZIP_FILE=${OPENRTM_DIR}-${WIN_ARCH}-vc${VC_VERSION}.zip
+OPENRTM_VER=`grep '^name' ${OPENRTM_DIR}/rtm/version.txt | awk '{print $3;}'`
 
+NEW_DIR=${OPENRTM_VER}-${WIN_ARCH}-vc${VC_VERSION}
+ZIP_FILE=${OPENRTM_VER}-${WIN_ARCH}-vc${VC_VERSION}.zip
+
 echo "NEW_DIR: " ${NEW_DIR}
 echo "OPENRTM_DIR: " ${OPENRTM_DIR}
 echo "ZIP_FILE: " ${ZIP_FILE}