[openrtm-commit:01519] r727 - trunk/jp.go.aist.rtm.RTC/installer/win32

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-02-10 16:39:01 +0900 (Tue, 10 Feb 2015)
New Revision: 727

Modified:
   trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in
   trunk/jp.go.aist.rtm.RTC/installer/win32/build.cmd
Log:
[compat, installer] JRE merge module has been added.

Modified: trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in	2015-02-05 02:10:42 UTC (rev 726)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in	2015-02-10 07:39:01 UTC (rev 727)
@@ -98,6 +98,13 @@
                            System="yes" Part="last" Value="[Version]"/>
             </Component>
 
+            <!-- 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="RtmSourceExamplesBin" Guid="{% RtmSourceExamplesBin.GUID %}">
@@ -1353,6 +1360,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/jp.go.aist.rtm.RTC/installer/win32/build.cmd
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/build.cmd	2015-02-05 02:10:42 UTC (rev 726)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/build.cmd	2015-02-10 07:39:01 UTC (rev 727)
@@ -4,8 +4,8 @@
 @rem   usually only %TARGET% might be changed
 @rem ------------------------------------------------------------
 if not DEFINED ARCH       set ARCH=x86_64
- at set PATH_OLD=%PATH%
- at set PATH=%WIX%\bin;%PATH%
+if not DEFINED INCLUDE_JRE  set INCLUDE_JRE=YES
+ at set PATH_OLD=%PATH%
 @set INCLUDE_OPENRTP=YES
 @set VERSION=1.1.0
 @set TARGET=OpenRTM-aist-Java
@@ -13,10 +13,13 @@
 @set TARGET_WIXOBJ=%TARGET%.wixobj
 @set TARGET_FULL=%TARGET%_%VERSION%-RELEASE_%ARCH%
 if "x%ARCH%" == "xx86_64" (
+   @set PYTHON_DIR=C:\Python27_x64
    @set OS_ARCH=64-bit OS
 ) else (
+   @set PYTHON_DIR=C:\Python27
    @set OS_ARCH=32-bit OS
 )
+ at set PATH=%WIX%bin;%PYTHON_DIR%;%PATH%
 @set PRODUCT_NAME=OpenRTM-aist-%VERSION%-RELEASE (%OS_ARCH%) for Java
 
 @rem ------------------------------------------------------------