[openrtm-commit:01586] r174 - trunk/ImageProcessing/opencv

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-07-23 15:32:02 +0900 (Thu, 23 Jul 2015)
New Revision: 174

Modified:
   trunk/ImageProcessing/opencv/ip_make_package.sh
Log:
Binary zip package name has been changed.

Modified: trunk/ImageProcessing/opencv/ip_make_package.sh
===================================================================
--- trunk/ImageProcessing/opencv/ip_make_package.sh	2015-05-12 08:36:25 UTC (rev 173)
+++ trunk/ImageProcessing/opencv/ip_make_package.sh	2015-07-23 06:32:02 UTC (rev 174)
@@ -7,36 +7,14 @@
 # This is part of ip-build.bat OpenCVRTC build batch file
 # for building ImageProcessing for Windows binaries.
 #
-# The following environment variables should be set.
-# ex.
-# export PYTHON_DIR=/cygdrive/c/Python27
-# export VC_VERSION=9
-# export ARCH=x86
-#
 #==============================
 
 WORK_ROOT=`pwd`
 echo "Current dir:"  ${WORK_ROOT}
 
-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
+NEW_DIR=opencv_rtcs
+ZIP_FILE=${NEW_DIR}.zip
 
-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 "ZIP_FILE: " ${ZIP_FILE}
 
@@ -55,7 +33,6 @@
 
 rm -rf ${ZIP_FILE}
 zip -r ${ZIP_FILE} ${NEW_DIR}
-rm -rf ${NEW_DIR}
 
 # end of script
 #==============================
\ No newline at end of file