[openrtm-commit:01512] r601 - trunk/OpenRTM-aist-Python/installer
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 12月 19日 (金) 11:58:18 JST
Author: kawauchi
Date: 2014-12-19 11:58:18 +0900 (Fri, 19 Dec 2014)
New Revision: 601
Modified:
trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
trunk/OpenRTM-aist-Python/installer/build.cmd
Log:
[compat, installer] Setting for 64bit msi generation has been changed. RTSystemEditorRCP has been changed to use the merge module.
Modified: trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
===================================================================
--- trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in 2014-03-29 14:13:18 UTC (rev 600)
+++ trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in 2014-12-19 02:58:18 UTC (rev 601)
@@ -23,17 +23,6 @@
<!-- Property -->
<Property Id='USERPROFILEDIR' Value='%USERPROFILE%' />
- <!-- RTSE Property-->
- <Property Id="RTSE_FILEEXISTS">
- <DirectorySearch Id="CheckFileDir" Path="C:\Program Files\OpenRTM-aist\{% Product.ShortVersion %}">
- <DirectorySearch Id="CheckFileDir2" Path ="OpenRTP">
- <DirectorySearch Id="CheckFileDir3" Path ="{% Product.ShortVersion %}\RTSystemEditor">
- <FileSearch Id="CheckFile" Name="RTSystemEditorRCP.exe" />
- </DirectorySearch>
- </DirectorySearch>
- </DirectorySearch>
- </Property>
-
<?if $(env.ARCH) = x86_64 ?>
<Property Id="PYTHON26">
<RegistrySearch Id="Python26"
@@ -441,7 +430,11 @@
<!-- Program Files -->
+ <?if $(env.ARCH) = x86 ?>
<Directory Id="ProgramFilesFolder" SourceName="PFILE">
+ <?else?>
+ <Directory Id="ProgramFiles64Folder" SourceName="PFILE">
+ <?endif ?>
<Directory Id="INSTALLLOCATION"
Name="{% Product.Name %}">
<Directory Id="Version"
@@ -843,17 +836,22 @@
<!-- end of examples -->
</Directory>
- <!-- rtmtools components -->
- <?if $(env.INCLUDE_OPENRTP) = YES ?>
- <?include OpenRTP_inc.wxs ?>
- <?endif ?>
- <!-- end of rtmtools -->
+ <!-- rtmtools components -->
+ <?if $(env.INCLUDE_OPENRTP) = YES ?>
+ <Merge Id="Msi_RTSystemEditorRCP" Language="1041"
+ SourceFile="RTSystemEditorRCP_$(env.ARCH).msm" DiskId="1" />
+ <?endif ?>
+ <!-- end of rtmtools -->
</Directory>
</Directory>
<!-- end of Program Files Folder -->
+ <?if $(env.ARCH) = "x86" ?>
</Directory>
+ <?else?>
+ </Directory>
+ <?endif?>
<Directory Id="ProgramMenuFolder">
<Directory Id="AppMenuFolder"
@@ -1156,21 +1154,8 @@
<!-- OpenRTP tools -->
<?if $(env.INCLUDE_OPENRTP) = YES ?>
- <Feature Id="OpenRTP" Level="1" Title="OpenRT Platform Tool Chain"
- ConfigurableDirectory="INSTALLLOCATION">
- <Condition Level ="1"><![CDATA[ (RTSE_FILEEXISTS = "") ]]></Condition>
- <Condition Level ="0"><![CDATA[ (RTSE_FILEEXISTS <> "") ]]></Condition>
-
- <!-- rtse rcp -->
- <Feature Id="RTSystemEditor" Level="1" Title="RTSystemEditor">
- <ComponentRef Id="Openrtp" />
- <ComponentRef Id="OpenrtpConfiguration" />
- <ComponentRef Id="OpenrtpPlugins" />
- <ComponentRef Id="org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610" />
- <ComponentRef Id="META_INF" />
- <ComponentRef Id="org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731" />
- <ComponentRef Id="META_INF_2" />
- </Feature>
+ <Feature Id="RTSE_ONLY" Level="1" Title="RTSystemEditorRCP 1.1">
+ <MergeRef Id="Msi_RTSystemEditorRCP" />
</Feature>
<?endif ?>
Modified: trunk/OpenRTM-aist-Python/installer/build.cmd
===================================================================
--- trunk/OpenRTM-aist-Python/installer/build.cmd 2014-03-29 14:13:18 UTC (rev 600)
+++ trunk/OpenRTM-aist-Python/installer/build.cmd 2014-12-19 02:58:18 UTC (rev 601)
@@ -3,7 +3,10 @@
@rem Variable Settings
@rem usually only %TARGET% might be changed
@rem ------------------------------------------------------------
- at set PATH=%WIX%\bin;%PATH%
+if not DEFINED ARCH set ARCH=x86_64
+ at set PATH_OLD=%PATH%
+ at set PATH=%WIX%\bin;c:\python27;%PATH%
+ at set INCLUDE_OPENRTP=YES
@set VERSION=1.1.0
@set TARGET=OpenRTM-aist-Python
@set TARGET_WXS=%TARGET%.wxs
@@ -78,34 +81,40 @@
@rem RTSystemEditorRCP.exe should be under %RTSE_ROOT%
@rem
@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
+ at rem *** RTSystemEditorRCP has been changed to use the merge module.
+ at rem *** So this process has been deleted.
+ at rem if "x%RTSE_ROOT%" == "x" (
+ at rem echo Envrionment variable "RTSE_ROOT" is not set. Abort.
+ at rem goto END
+ at rem )
+ at rem if not exist "%RTSE_ROOT%\RTSystemEditorRCP.exe" (
+ at rem echo RTSystemEditorRCP.exe does not found. Abort
+ at rem goto END
+ at rem )
+ at rem set INCLUDE_RTSE=YES
+ at rem set INCLUDE_OPENRTP=YES
+ at rem
+ at rem if not exist OpenRTP_inc.wxs (
+ at rem cd OpenRTP
+ at rem copy ..\makewxs.py .
+ at rem copy ..\yat.py .
+ at rem echo Generating OpenRTP_inc.wxs......
+ at rem @rem openrtpwxs.py
+ at rem @rem set PYTHONPATH=%TMP_PYTHONPATH%
+ at rem copy OpenRTP_inc.wxs ..
+ at rem del makewxs.py yat.py
+ at rem del *.yaml
+ at rem cd ..
+ at rem )
-if not exist OpenRTP_inc.wxs (
- cd OpenRTP
- copy ..\makewxs.py .
- copy ..\yat.py .
- echo Generating OpenRTP_inc.wxs......
- at rem openrtpwxs.py
- at rem set PYTHONPATH=%TMP_PYTHONPATH%
- copy OpenRTP_inc.wxs ..
- del makewxs.py yat.py
- del *.yaml
- cd ..
-)
-
@rem ============================================================
@rem compile wxs file and link msi
@rem ============================================================
-candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=1033 -dcodepage=1252
+if "x%ARCH%" == "xx86_64" (
+ candle.exe -arch x64 %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=1033 -dcodepage=1252
+) else (
+ 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%
@@ -122,7 +131,11 @@
@rem ------------------------------------------------------------
@rem compile wxs file and link msi
@rem
- candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=!LANG[%%i]! -dcodepage=!CODE[%%i]!
+ if "x%ARCH%" == "xx86_64" (
+ candle.exe -arch x64 %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=!LANG[%%i]! -dcodepage=!CODE[%%i]!
+ ) else (
+ candle.exe %TARGET_WXS% %WIXUI_RTM_WXS% -dlanguage=!LANG[%%i]! -dcodepage=!CODE[%%i]!
+ )
if exist WixUI_!LC[%%i]!.wxl (
light.exe -ext WixUIExtension -ext WixUtilExtension -loc WixUI_!LC[%%i]!.wxl ^
@@ -159,6 +172,7 @@
:END
del *.yaml
+ at set PATH=%PATH_OLD%
-pause;
+ at rem pause;
More information about the openrtm-commit
mailing list