[openrtm-commit:01460] r167 - in branches/newCMakeForVC2010/ImageProcessing/opencv: . components/TkCalibGUI
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 6月 18日 (水) 14:34:54 JST
Author: kawauchi
Date: 2014-06-18 14:34:54 +0900 (Wed, 18 Jun 2014)
New Revision: 167
Modified:
branches/newCMakeForVC2010/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt
branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat
branches/newCMakeForVC2010/ImageProcessing/opencv/ip_make_package.sh
Log:
TkCalibGUI of python is a GUI component of ImageCalibration were converted to exe format.
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2014-06-10 09:31:56 UTC (rev 166)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/components/TkCalibGUI/CMakeLists.txt 2014-06-18 05:34:54 UTC (rev 167)
@@ -28,7 +28,7 @@
)
set(EXEC_FILES ""
- TkCalibGUIComp.py tkcalibgui.py rtutil.py
+ TkCalibGUIComp.py tkcalibgui.py rtutil.py setup.py
)
set(OTHER_SRCS CMakeLists.txt
@@ -207,7 +207,8 @@
${PROJECT_SOURCE_DIR}/TkCalibGUIComp.py
${PROJECT_SOURCE_DIR}/tkcalibgui.py
${PROJECT_SOURCE_DIR}/rtutil.py
- ${PROJECT_BINARY_DIR}/CalibrationService_idl.py)
+ ${PROJECT_BINARY_DIR}/CalibrationService_idl.py
+ ${PROJECT_BINARY_DIR}/setup.py)
foreach(target ${calib_python_file})
add_custom_command(
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat 2014-06-10 09:31:56 UTC (rev 166)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/ip-build.bat 2014-06-18 05:34:54 UTC (rev 167)
@@ -37,12 +37,10 @@
set PATH=%PATH%;C:\cygwin64\bin
set OPENCV_RTC_ROOT=%~dp0
-set BUILD_DIR=%OPENCV_RTC_ROOT%\work
-set Baseclasses_DIR=C:\distribution\baseclasses
-set OpenCV_DIR=C:\Jenkins\workspace\60_OpenCV_build_win64\label\windows7-vc2010-x64\OpenCV2.4.9
+set OpenCV_DIR=C:\distribution\OpenCV-2.4.9
set PYTHON_DIR=c:\python27;
-set RTM_ROOT=C:\Jenkins\workspace\openrtm-cxx-build-trunk-win\label\windows7-vc2010-x64\manual\OpenRTM-aist
+set RTM_ROOT=C:\distribution\OpenRTM-aist-rv2567
set OMNI_ROOT=C:\distribution\omniORB-4.1.7-win64-vc10
set ARCH=x86_64
set VC_VERSION=10
@@ -68,16 +66,7 @@
if %ARCH% == x86 set DLL_ARCH=
if %ARCH% == x86_64 set DLL_ARCH=_x64
- at rem ------------------------------------------------------------
- at rem Copying Config.cmake
- at rem ------------------------------------------------------------
- at rem %PYTHON_DIR%\python build\cmakeconfgen.py rtm_config.vsprops
- at rem move OpenRTMConfig.cmake cmake
- at rem ------------------------------------------------------------
- at rem Copying Config.cmake
- at rem ------------------------------------------------------------
-
if %VC_VERSION% LEQ 10 (
@set WindowsSdkDir=
@for /F "tokens=1,2*" %%i in ('reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows" /v "CurrentInstallFolder"') DO (
@@ -89,17 +78,18 @@
@set PATH="c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319";%PATH%
-
@rem ============================================================
@rem make work dir
@rem ============================================================
echo work dir : work
if not exist "work" (
mkdir work
-) else (
- del /s /q work
- mkdir work
)
+cd work
+if exist "CMakeCache.txt" (
+ del CMakeCache.txt
+ echo delete CMakeCache.txt
+)
@rem ============================================================
@rem switching to x86 or x86_64
@@ -114,7 +104,6 @@
@rem start to cmake 32bit
@rem ============================================================
:cmake_x86
-cd %BUILD_DIR%
set VC_NAME="Visual Studio %VC_VERSION%"
if %VC_VERSION% == 9 (
cmake .. -G "Visual Studio 9 2008"
@@ -180,8 +169,6 @@
set SLN=ImageProcessing_opencv.sln
set LOG=/fileLogger /flp:logfile=debug.log /v:diag
-cd %BUILD_DIR%
-
if %VC_VERSION% == 10 (
msbuild /t:rebuild /p:configuration=release %OPT% components\DirectShowCam\BaseClasses\BaseClasses.sln
)
@@ -195,9 +182,6 @@
@rem start to cmake 64bit
@rem ============================================================
:cmake_x86_64
- at rem cd %OPENCV_RTC_ROOT%
-cd %BUILD_DIR%
- at rem cd %RTM_ROOT%
set VC_NAME="Visual Studio %VC_VERSION% Win64"
if %VC_VERSION% == 9 (
echo 64bit compilation on Visual C++ 2008 is not supported. Aborting.
@@ -259,7 +243,13 @@
@rem MAKE_ZIP Making ZIP archive
@rem ------------------------------------------------------------
:MAKE_ZIP
-cd %OPENCV_RTC_ROOT%
+cd %OPENCV_RTC_ROOT%/bin
+python setup.py py2exe
+if not "%ERRORLEVEL%" == "0" (
+ goto END
+)
+
+cd ../
set ZIP_DIR=ImageProcessing
c:\cygwin64\bin\bash ip_make_package.sh
Modified: branches/newCMakeForVC2010/ImageProcessing/opencv/ip_make_package.sh
===================================================================
--- branches/newCMakeForVC2010/ImageProcessing/opencv/ip_make_package.sh 2014-06-10 09:31:56 UTC (rev 166)
+++ branches/newCMakeForVC2010/ImageProcessing/opencv/ip_make_package.sh 2014-06-18 05:34:54 UTC (rev 167)
@@ -1,21 +1,23 @@
#!/bin/sh
#
-# @brief Archiving omniORB Windows binaries in to a ZIP file
+# @brief Archiving OpenCVRTC (ImageProcessing) 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.
+# 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 OMNIORB_DIR=omniORB-4.2.0
-# export PYTHON_DIR=/cygdrive/c/Python33
+# 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
@@ -36,12 +38,21 @@
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}
+mkdir ${NEW_DIR}
+cd ${NEW_DIR}
+cp ${WORK_ROOT}/bin/*.conf .
+cp ${WORK_ROOT}/bin/*.dll .
+cp ${WORK_ROOT}/bin/*.exe .
+cp ${WORK_ROOT}/bin/dist/TkCalibGUIComp.exe .
+cp ${WORK_ROOT}/bin/dist/python27.dll .
+cp -r ${WORK_ROOT}/bin/dist/lib .
+cd ${WORK_ROOT}
+chmod -R 755 ${NEW_DIR}
+
rm -rf ${ZIP_FILE}
zip -r ${ZIP_FILE} ${NEW_DIR}
rm -rf ${NEW_DIR}
More information about the openrtm-commit
mailing list