Author: kawauchi
Date: 2015-02-10 16:36:11 +0900 (Tue, 10 Feb 2015)
New Revision: 604
Modified:
trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
trunk/OpenRTM-aist-Python/installer/build.cmd
Log:
[compat, installer] JRE merge module has been added.
Modified: trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in
===================================================================
--- trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in 2015-01-22 07:55:34 UTC (rev 603)
+++ trunk/OpenRTM-aist-Python/installer/OpenRTM-aist-Python.wxs.in 2015-02-10 07:36:11 UTC (rev 604)
@@ -435,6 +435,13 @@
<Directory Id="Version"
Name="{% Product.ShortVersion %}">
+ <!-- JRE -->
+ <?if $(env.INCLUDE_JRE) = YES ?>
+ <Merge Id="Msi_JRE_OpenJDK" Language="1041"
+ SourceFile="JRE_OpenJDK7_$(env.ARCH).msm" DiskId="1" />
+ <?endif ?>
+ <!-- end of JRE -->
+
<!-- bin -->
<Directory Id="bin" Name="bin">
<Component Id="Rtm_Bin" Guid="{% RtmOpenrtm_aistUtilsRtmnaming.GUID %}">
@@ -1149,6 +1156,13 @@
</Feature>
+ <!-- JRE -->
+ <?if $(env.INCLUDE_JRE) = YES ?>
+ <Feature Id="JRE_OpenJDK" Level="1" Title="JRE for RTSystemEditorRCP 1.1">
+ <MergeRef Id="Msi_JRE_OpenJDK" />
+ </Feature>
+ <?endif ?>
+
<!-- OpenRTP tools -->
<?if $(env.INCLUDE_OPENRTP) = YES ?>
<Feature Id="RTSE_ONLY" Level="1" Title="RTSystemEditorRCP 1.1">
Modified: trunk/OpenRTM-aist-Python/installer/build.cmd
===================================================================
--- trunk/OpenRTM-aist-Python/installer/build.cmd 2015-01-22 07:55:34 UTC (rev 603)
+++ trunk/OpenRTM-aist-Python/installer/build.cmd 2015-02-10 07:36:11 UTC (rev 604)
@@ -4,6 +4,7 @@
@rem usually only %TARGET% might be changed
@rem ------------------------------------------------------------
if not DEFINED ARCH set ARCH=x86_64
+if not DEFINED INCLUDE_JRE set INCLUDE_JRE=YES
@set PATH_OLD=%PATH%
@set INCLUDE_OPENRTP=YES
@set VERSION=1.1.0