[openrtm-commit:00757] r2346 - in trunk/OpenRTM-aist/win32/OpenRTM-aist: etc installer
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 3月 8日 (木) 23:43:23 JST
Author: kurihara
Date: 2012-03-08 23:43:23 +0900 (Thu, 08 Mar 2012)
New Revision: 2346
Added:
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops
trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix_vc10.cmd
Log:
Correspondence to VC10. refs #2381
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props 2012-03-08 14:43:23 UTC (rev 2346)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Label="UserMacros">
+ <omni_dllver>415</omni_dllver>
+ <omnithread_dllver>34</omnithread_dllver>
+ <rtm_dllver>110</rtm_dllver>
+ <rtm_version>1.1.0</rtm_version>
+ <coil_dllver>110</coil_dllver>
+ <coil_lib>coil$(coil_dllver).lib</coil_lib>
+ <coil_libd>coil$(coil_dllver)d.lib</coil_libd>
+ <omni_includes>$(omni_root)\include</omni_includes>
+ <omni_libdir>$(omni_root)\lib\x86_win32</omni_libdir>
+ <omni_bin>$(omni_root)\bin\x86_win32</omni_bin>
+ <omni_lib>omniORB$(omni_dllver)_rt.lib;omniDynamic$(omni_dllver)_rt.lib;omnithread$(omnithread_dllver)_rt.lib</omni_lib>
+ <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib</omni_libd>
+ <rtm_includes>$(rtm_root);$(rtm_root)rtm\idl</rtm_includes>
+ <rtm_libdir>$(rtm_root)\bin</rtm_libdir>
+ <rtm_bin>$(rtm_root)\bin;$(rtm_root)\build</rtm_bin>
+ <rtm_path>$(rtm_bin);$(omni_bin)</rtm_path>
+ <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
+ <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
+ <rtm_idlc>omniidl</rtm_idlc>
+ <rtm_idlflags>-bcxx -Wba -nf -I $(SolutionDir)\rtm\idl</rtm_idlflags>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <_PropertySheetDisplayName>OpenRTM-aist-1.0</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(omni_includes);$(rtm_includes);.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <AdditionalLibraryDirectories>$(omni_libdir);$(rtm_libdir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <BuildMacro Include="omni_root">
+ <Value>$(omni_root)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_dllver">
+ <Value>$(omni_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omnithread_dllver">
+ <Value>$(omnithread_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_root">
+ <Value>$(rtm_root)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_dllver">
+ <Value>$(rtm_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_version">
+ <Value>$(rtm_version)</Value>
+ </BuildMacro>
+ <BuildMacro Include="coil_dllver">
+ <Value>$(coil_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_includes">
+ <Value>$(omni_includes)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_libdir">
+ <Value>$(omni_libdir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_bin">
+ <Value>$(omni_bin)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_lib">
+ <Value>$(omni_lib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_libd">
+ <Value>$(omni_libd)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_includes">
+ <Value>$(rtm_includes)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_libdir">
+ <Value>$(rtm_libdir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_bin">
+ <Value>$(rtm_bin)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_path">
+ <Value>$(rtm_path)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_libd">
+ <Value>$(rtm_libd)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_lib">
+ <Value>$(rtm_lib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_idlc">
+ <Value>$(rtm_idlc)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_idlflags">
+ <Value>$(rtm_idlflags)</Value>
+ </BuildMacro>
+ <BuildMacro Include="coil_lib">
+ <Value>$(coil_lib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="coil_libd">
+ <Value>$(coil_libd)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops 2012-03-08 14:43:23 UTC (rev 2346)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="OpenRTM-aist-1.1"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes);."
+ PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
+ />
+ <UserMacro
+ Name="omni_root"
+ Value="%OMNI_ROOT%"
+ />
+ <UserMacro
+ Name="omni_dllver"
+ Value="415"
+ />
+ <UserMacro
+ Name="omnithread_dllver"
+ Value="34"
+ />
+ <UserMacro
+ Name="rtm_root"
+ Value="%RTM_ROOT%"
+ />
+ <UserMacro
+ Name="rtm_dllver"
+ Value="110"
+ />
+ <UserMacro
+ Name="rtm_version"
+ Value="1.1.0"
+ />
+ <UserMacro
+ Name="coil_dllver"
+ Value="110"
+ />
+ <!-- omniORB macros -->
+ <UserMacro
+ Name="omni_includes"
+ Value=""$(omni_root)\include""
+ />
+ <UserMacro
+ Name="omni_libdir"
+ Value=""$(omni_root)\lib\x86_win32""
+ />
+ <UserMacro
+ Name="omni_bin"
+ Value=""$(omni_root)\bin\x86_win32""
+ />
+ <UserMacro
+ Name="omni_lib"
+ Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
+ />
+ <UserMacro
+ Name="omni_libd"
+ Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
+ />
+ <!-- OpenRTM-aist macros -->
+ <UserMacro
+ Name="rtm_includes"
+ Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
+ />
+ <UserMacro
+ Name="rtm_libdir"
+ Value=""$(rtm_root)\bin""
+ />
+ <UserMacro
+ Name="rtm_bin"
+ Value=""$(rtm_root)\bin";"$(rtm_root)\build""
+ />
+ <UserMacro
+ Name="rtm_path"
+ Value="$(rtm_bin);$(omni_bin)"
+ />
+ <UserMacro
+ Name="rtm_libd"
+ Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(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_idlc"
+ Value="omniidl"
+ />
+ <UserMacro
+ Name="rtm_idlflags"
+ Value="-bcxx -Wba -nf -I"$(SolutionDir)\rtm\idl""
+ />
+ <!-- coil macros -->
+ <UserMacro
+ Name="coil_lib"
+ Value="coil$(coil_dllver).lib"
+ />
+ <UserMacro
+ Name="coil_libd"
+ Value="coil$(coil_dllver)d.lib"
+ />
+
+</VisualStudioPropertySheet>
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix_vc10.cmd
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix_vc10.cmd (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix_vc10.cmd 2012-03-08 14:43:23 UTC (rev 2346)
@@ -0,0 +1,231 @@
+ at rem
+ at rem @brief WiX automatic build script
+ at rem @date $Date: 2008-02-09 20:04:03 $
+ at rem @author Norkai Ando <n-ando at aist.go.jp>
+ at rem
+ at rem Copyright (C) 2008-2010
+ at rem Noriaki Ando
+ at rem Task-intelligence Research Group,
+ at rem Intelligent Systems Research Institute,
+ at rem National Institute of
+ at rem Advanced Industrial Science and Technology (AIST), Japan
+ at rem All rights reserved.
+ at rem
+ at rem $Id: autowix.cmd.in 2083 2011-05-05 14:53:50Z kurihara $
+ at rem
+
+ at rem ------------------------------------------------------------
+ at rem Variable Settings
+ at rem usually only %TARGET% might be changed
+ at rem ------------------------------------------------------------
+ at set PATH=%WIX%\bin;%PATH%
+ at set VERSION=1.1.0
+ at set TARGET=OpenRTM-aist
+ at set TARGET_WXS=%TARGET%.wxs
+ at set TARGET_WIXOBJ=%TARGET%.wixobj
+ at set TARGET_FULL=%TARGET%-%VERSION%
+
+ at rem ------------------------------------------------------------
+ at rem WixUI Customization Settings
+ at rem usually only %WIXUI_RTM% might be changed
+ at rem ------------------------------------------------------------
+ at set WIXUI_RTM=WixUI_Mondo_rtm
+ at set WIXUI_RTM_WXS=%WIXUI_RTM%.wxs
+ at set WIXUI_RTM_WIXOBJ=%WIXUI_RTM%.wixobj
+
+ at rem ------------------------------------------------------------
+ at rem Supported languages
+ at rem supported languages have to be specified
+ at rem ------------------------------------------------------------
+set LANGUAGES=(ja-jp de-de es-es fr-fr hu-hu it-it ko-kr zh-tw)
+
+echo off
+ at rem ------------------------------------------------------------
+ at rem Checking WiX
+ at rem ------------------------------------------------------------
+if "x%WIX%" == "x" (
+ echo "Windows Installer XML (WiX) is not installed"
+ echo "Please download WiX 3.5 or later from http://wix.sourceforge.net/"
+ goto END
+)
+
+ at rem ------------------------------------------------------------
+ at rem Generate RTSystemEditor wxs file
+ at rem
+ at rem RTSystemEditorRCP.exe should be under %RTSE_ROOT%
+ at rem
+ at rem ------------------------------------------------------------
+if "x%RTSE_ROOT%" == "x" (
+ echo Envrionment variable "RTSE_ROOT" is not set. Abort.
+ goto END
+)
+if not exist "%RTSE_ROOT%\RTSystemEditorRCP.exe" (
+ echo RTSystemEditorRCP.exe does not found. Abort
+ goto END
+)
+set INCLUDE_RTSE=YES
+set INCLUDE_OPENRTP=YES
+
+if not exist OpenRTP_inc.wxs (
+ cd OpenRTP
+rem set TMP_PYTHONPATH=%PYTHONPATH%
+rem set PYTHONPATH=../../bin;%PYTHONPATH%
+rem echo Generating OpenRTP_inc.wxs......
+rem openrtpwxs.py
+rem set PYTHONPATH=%TMP_PYTHONPATH%
+ copy OpenRTP_inc.wxs ..
+ cd ..
+)
+
+
+ at rem ------------------------------------------------------------
+ at rem Generate omniORB's wxs file
+ at rem ------------------------------------------------------------
+if "x%OMNI_ROOT%" == "x" (
+ echo Environment Variable "OMNI_EOOR" is not set. Abort.
+ goto END
+)
+set INCLUDE_OMNIORB=YES
+
+if not exist omniORB_inc.wxs (
+ cd omniORB
+ set TMP_PYTHONPATH=%PYTHONPATH%
+ set PYTHONPATH=../../bin;%PYTHONPATH%
+ echo Generating omniORB_inc.wxs......
+ omniwxs.py 'THIS_IS_OMNIORB_4_1_5'
+ set PYTHONPATH=%TMP_PYTHONPATH%
+ copy omniORB_inc.wxs ..
+ cd ..
+)
+
+
+ at rem ------------------------------------------------------------
+ at rem Generate OpenCV's wxs file
+ at rem ------------------------------------------------------------
+if "x%OPENCV_ROOT%" == "x" (
+ echo Environment Variable "OPENCV_ROOT" is not set. Abort.
+ goto END
+)
+set INCLUDE_OPENCV=YES
+
+if not exist OpenCV_inc.wxs (
+ cd OpenCV2.3
+ set TMP_PYTHONPATH=%PYTHONPATH%
+ set PYTHONPATH=../../bin;%PYTHONPATH%
+ echo Generating OpenCV_inc.wxs......
+ opencvwxs.py
+ set PYTHONPATH=%TMP_PYTHONPATH%
+ copy OpenCV_inc.wxs ..
+ cd ..
+)
+
+
+ at rem ------------------------------------------------------------
+ at rem Generate OpenCV-RTC wxs file
+ at rem ------------------------------------------------------------
+if "x%OPENCV_RTC_ROOT%" == "x" (
+ echo Environment Variable "OPENCV_RTC_ROOT" is not set. Abort.
+ goto END
+)
+set INCLUDE_OPENCV_RTC=YES
+
+if not exist OpenCV-RTC_inc.wxs (
+ cd OpenCV-RTC
+ set TMP_PYTHONPATH=%PYTHONPATH%
+ set PYTHONPATH=../../bin;%PYTHONPATH%
+ echo Generating OpenCV-RTC_inc.wxs......
+ opencvrtcwxs.py
+ set PYTHONPATH=%TMP_PYTHONPATH%
+ copy OpenCV-RTC_inc.wxs ..
+ cd ..
+)
+
+
+ at rem ------------------------------------------------------------
+ at rem Import Language-Country, Language codes, Codepages
+ at rem from langs.txt
+ at rem http://www.tramontana.co.hu/wix/lesson2.php#2.4
+ at rem ------------------------------------------------------------
+for /F "tokens=1,2,3,4 delims=, " %%i in (langs.txt) do (
+ set LC[%%j]=%%j
+ set LANG[%%j]=%%k
+ set CODE[%%j]=%%l
+)
+
+ at rem ============================================================
+ at rem compile wxs file and link msi
+ at rem ============================================================
+candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=1033 -dcodepage=1252
+light.exe -ext WixUIExtension -loc WixUI_en-us.wxl ^
+ -out %TARGET_FULL%.msi %TARGET_WIXOBJ% %WIXUI_RTM_WIXOBJ%
+
+set IDS=1033
+setlocal ENABLEDELAYEDEXPANSION
+
+for %%i in %LANGUAGES% do (
+
+ @rem ------------------------------------------------------------
+ @rem language ID list
+ @rem
+ set IDS=!IDS!,!LANG[%%i]!
+
+ @rem ------------------------------------------------------------
+ @rem compile wxs file and link msi
+ @rem
+ candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=!LANG[%%i]! -dcodepage=!CODE[%%i]!
+
+ if exist WixUI_!LC[%%i]!.wxl (
+ light.exe -ext WixUIExtension -loc WixUI_!LC[%%i]!.wxl ^
+ -out %TARGET_FULL%_!LC[%%i]!.msi %TARGET_WIXOBJ% %WIXUI_RTM_WIXOBJ%
+ )
+ if not exist WixUI_!LC[%%i]!.wxl (
+ light.exe -ext WixUIExtension -cultures:!LC[%%i]! ^
+ -out %TARGET_FULL%_!LC[%%i]!.msi %TARGET_WIXOBJ% %WIXUI_RTM_WIXOBJ%
+ )
+ @rem ------------------------------------------------------------
+ @rem creating transformation files
+ @rem
+ torch.exe -p -t language %TARGET_FULL%.msi %TARGET_FULL%_!LC[%%i]!.msi ^
+ -out !LC[%%i]!.mst
+
+ @rem ------------------------------------------------------------
+ @rem embed transformation files
+ @rem
+ cscript wisubstg.vbs %TARGET_FULL%.msi !LC[%%i]!.mst !LANG[%%i]!
+
+)
+
+ at rem ------------------------------------------------------------
+ at rem here mst embedded msi can be selected languages by
+ at rem > msiexec /i SampleMulti.msi TRANSFORMS=":fr-fr.mst"
+ at rem
+
+ at rem ------------------------------------------------------------
+ at rem Update the summary information stream to list all
+ at rem supported languages of this package
+ at rem ------------------------------------------------------------
+cscript WiLangId.vbs %TARGET_FULL%.msi Package %IDS%
+
+:END
+
+
+
+
+
+ at rem ------------------------------------------------------------
+ at rem References
+ at rem
+ at rem WiX Tutorial Lesson 9 "Transforms"
+ at rem http://www.tramontana.co.hu/wix/lesson9.php
+ at rem
+ at rem WiX Tutorial Lesson 2 "User Interface"
+ at rem http://www.tramontana.co.hu/wix/lesson2.php#2.4
+ at rem
+ at rem Multi-Language MSI Packages without Setup.exe Launcher
+ at rem http://www.installsite.org/pages/en/msi/articles/embeddedlang/index.htm
+ at rem
+ at rem vb scripts
+ at rem http://www.myitforum.com/articles/6/view.asp?id=1070
+ at rem
+ at rem ------------------------------------------------------------
+
openrtm-commit メーリングリストの案内