[openrtm-commit:01449] r157 - branches/newCMakeForVC2010/ImageProcessing/opencv

[openrtm ＠ openrtm.org]

Author: harumi
Date: 2014-05-07 17:31:45 +0900 (Wed, 07 May 2014)
New Revision: 157

Added:
   branches/newCMakeForVC2010/ImageProcessing/opencv/ip_make_package.sh
Modified:
   branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat
Log:
add command to make zipfile of binary

Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat	2014-05-02 08:54:29 UTC (rev 156)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat	2014-05-07 08:31:45 UTC (rev 157)
@@ -40,9 +40,11 @@
 set OpenCV_DIR=C:\distribution\OpenCV2.4.8-win32
 set Baseclasses_DIR=C:\distribution\baseclasses
 
-rem set PYTHON_DIR=c:\python27;
-rem set RTM_ROOT=C:\distribution\OpenRTM-aist-rv2566
-rem set OMNI_ROOT=C:\distribution\omniORB-4.1.7-win32-vc10
+set PYTHON_DIR=c:\python27;
+set RTM_ROOT=C:\distribution\OpenRTM-aist-rv2566
+set OMNI_ROOT=C:\distribution\omniORB-4.1.7-win32-vc10
+set ARCH=x86
+set VC_VERSION=10
 
 set COIL_ROOT=%RTM_ROOT%\coil
 set OpenRTM_Dir=%RTM_ROOT%\cmake
@@ -165,7 +167,7 @@
 vcbuild /M2 /rebuild components\DirectShowCam\BaseClasses\BaseClasses.sln "release|win32"
 vcbuild /M2 /rebuild components\ImageCalibration\idl\InterfaceDataTypes_TGT.vcproj "release|win32"
 vcbuild /M2 /build ImageProcessing_opencv.sln "release|win32"
-goto END
+goto MAKE_ZIP
 
 @rem ------------------------------------------------------------
 @rem Build (VC2010- x86)
@@ -185,8 +187,9 @@
 
 msbuild /t:build /p:configuration=release %OPT% %SLN%
 
-goto END
+goto MAKE_ZIP
 
+
 @rem ============================================================
 @rem start to cmake 64bit 
 @rem ============================================================
@@ -246,6 +249,17 @@
 msbuild /t:clean /p:configuration=release   %OPT% %SLN%
 msbuild /t:build /p:configuration=release %OPT% %SLN%
 
+goto MAKE_ZIP
+
+
+ at rem ------------------------------------------------------------
+ at rem MAKE_ZIP Making ZIP archive
+ at rem ------------------------------------------------------------
+:MAKE_ZIP
+cd %OPENCV_RTC_ROOT%
+set ZIP_DIR=ImageProcessing
+c:\cygwin64\bin\bash ip_make_package.sh
+
 goto END
 
 :END

Added: branches/newCMakeForVC2010/ImageProcessing/opencv/ip_make_package.sh
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/ip_make_package.sh	                        (rev 0)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/ip_make_package.sh	2014-05-07 08:31:45 UTC (rev 157)
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# @brief Archiving omniORB Windows binaries in to a ZIP file
+# @author Noriaki Ando <n-ando at aist.go.jp>
+#         Copyright 2014 (C) All Right Reserved
+#
+# This is part of build.bat omniORB build batch file
+# for building omniORB for Windows binaries.
+#
+# The following environment variables should be set.
+# ex.
+# export OMNIORB_DIR=omniORB-4.2.0
+# export PYTHON_DIR=/cygdrive/c/Python33
+# export VC_VERSION=9
+# export ARCH=x86
+#
+#==============================
+
+if test "x$ARCH" = "xx86" ; then
+	WIN_ARCH=win32
+elif test "x$ARCH" = "xx86_64" ; then
+	WIN_ARCH=win64
+else
+	echo "Unknown architecture: " $ARCH
+	exit -1
+fi
+
+if test "x$PYTHON_DIR" = "x" ; then
+	echo "PYTHON_DIR is not defined. "
+	exit -1
+else
+	PY_VER=`echo $PYTHON_DIR | sed 's/.*[Pp][Yy][Tt][Hh][Oo][Nn]\([0-9][0-9]\).*/\1/'`
+fi
+
+NEW_DIR=$ZIP_DIR-${WIN_ARCH}-vc${VC_VERSION}
+ZIP_FILE=$ZIP_DIR-${WIN_ARCH}-vc${VC_VERSION}-py${PY_VER}.zip
+
+echo "NEW_DIR: " ${NEW_DIR}
+echo "OMNIORB_DIR: " ${OMNIORB_DIR}
+echo "ZIP_FILE: " ${ZIP_FILE}
+
+rm -rf ${NEW_DIR}
+cp -r bin ${NEW_DIR}
+
+rm -rf ${ZIP_FILE}
+zip -r ${ZIP_FILE} ${NEW_DIR}
+rm -rf ${NEW_DIR}
+
+# end of script
+#==============================
\ No newline at end of file


Property changes on: branches/newCMakeForVC2010/ImageProcessing/opencv/ip_make_package.sh
___________________________________________________________________
Added: svn:executable
   + *