[openrtm-commit:01514] r724 - trunk/jp.go.aist.rtm.RTC/installer/win32
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2015年 1月 20日 (火) 10:41:19 JST
Author: kawauchi
Date: 2015-01-20 10:41:19 +0900 (Tue, 20 Jan 2015)
New Revision: 724
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] Setting for 64bit msi generation has been changed. RTSystemEditorRCP has been changed to use the merge module.
Product name, msi file name, start menu has been changed.
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 2014-03-28 11:35:43 UTC (rev 723)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/OpenRTM-aist-Java.wxs.in 2015-01-20 01:41:19 UTC (rev 724)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?define ProductName = "{% Product.Name %}-{% Product.Version %} for Java"?>
- <Product Name="{% Product.Name %}-{% Product.Version %} for Java"
+ <Product Name='$(env.PRODUCT_NAME)'
Id="{% Product.Id %}"
Language='$(var.language)'
Codepage='$(var.codepage)'
@@ -18,20 +17,16 @@
<!-- Property -->
<Property Id='USERPROFILEDIR' Value='%USERPROFILE%' />
- <Property Id="JDK15">
- <RegistrySearch Id="JDK15"
- Root="HKLM"
- Key="SOFTWARE\JavaSoft\Java Development Kit\1.5"
- Name="JavaHome"
+ <?if $(env.ARCH) = x86_64 ?>
+ <Property Id="JDK17">
+ <RegistrySearch Id="JDK17"
+ Root="HKLM"
+ Key="SOFTWARE\JavaSoft\Java Development Kit\1.7"
+ Name="JavaHome"
+ Win64="yes"
Type="raw" />
</Property>
- <Property Id="JDK16">
- <RegistrySearch Id="JDK16"
- Root="HKLM"
- Key="SOFTWARE\JavaSoft\Java Development Kit\1.6"
- Name="JavaHome"
- Type="raw" />
- </Property>
+ <?else?>
<Property Id="JDK17">
<RegistrySearch Id="JDK17"
Root="HKLM"
@@ -39,18 +34,7 @@
Name="JavaHome"
Type="raw" />
</Property>
- <!-- 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 %}">
- <FileSearch Id="CheckFile" Name="RTSystemEditorRCP.exe" />
- </DirectorySearch>
- </DirectorySearch>
- </DirectorySearch>
- </Property>
-
+ <?endif ?>
<!-- <SetProperty Id="FILEEXISTSDIR" After="AppSearch" Value="[FILEEXISTS]">
</SetProperty>-->
@@ -80,13 +64,17 @@
<!-- <Property Id="ALLUSERS" Value="1" /> -->
<!-- Check Conditions -->
- <Condition Message="[ProductName] requires JDK 1.5 or 1.6 or 1.7">
- <![CDATA[Installed OR (JDK15 <> "" OR JDK16 <> "" OR JDK17 <> "")]]>
+ <Condition Message="[ProductName] requires JDK 1.7">
+ <![CDATA[Installed OR (JDK17 <> "")]]>
</Condition>
<Directory Id="TARGETDIR" Name="SourceDir">
<!-- Program Files Folder -->
+ <?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"
@@ -97,6 +85,7 @@
<Condition>
<![CDATA[ALLUSERS <> 1]]>
</Condition>
+ <CreateFolder />
<Environment Id="envRTMJAVAROOTlocal" Name="RTM_JAVA_ROOT" Action="set"
System="no" Part="last" Value="[Version]"/>
</Component>
@@ -104,6 +93,7 @@
<Condition>
<![CDATA[ALLUSERS = 1 AND Privileged = 1]]>
</Condition>
+ <CreateFolder />
<Environment Id="envRTMJAVAROOTsystem" Name="RTM_JAVA_ROOT" Action="set"
System="yes" Part="last" Value="[Version]"/>
</Component>
@@ -118,8 +108,8 @@
Name="{% file.Name %}" DiskId="1"
Source="{% file.Source %}">
{% if file.Name is start-orbd.vbs %}
- <Shortcut Id="{% file.Id %}" Directory="ToolsMenuFolder"
- Name="Start Naming Service"
+ <Shortcut Id="{% file.Id %}" Directory="CommonToolsMenuFolder"
+ Name="Start Java Naming Service"
Show="normal" WorkingDirectory="bin"/>
{% endif %}
{% if file.Name is rtcd_java.exe %}
@@ -1223,7 +1213,8 @@
</Directory>
<!-- rtmtools components -->
<?if $(env.INCLUDE_OPENRTP) = YES ?>
- <?include OpenRTP_inc.wxs ?>
+ <Merge Id="Msi_RTSystemEditorRCP" Language="1041"
+ SourceFile="RTSystemEditorRCP_$(env.ARCH).msm" DiskId="1" />
<?endif ?>
<!-- end of rtmtools -->
@@ -1231,16 +1222,12 @@
</Directory>
- <!-- rtmtools components -->
-<!--
- <?if $(env.INCLUDE_OPENRTP) = YES ?>
- <?include OpenRTP_inc.wxs ?>
- <?endif ?>
--->
- <!-- end of rtmtools -->
<!-- end of Program Files Folder -->
-
+ <?if $(env.ARCH) = "x86" ?>
</Directory>
+ <?else?>
+ </Directory>
+ <?endif?>
<!-- Program Folder -->
<Directory Id="ProgramMenuFolder">
@@ -1252,15 +1239,17 @@
<Component Id="JavaMenuFolder" Guid="4F6569FA-8492-441c-AF92-9E4B65C738EC">
<RemoveFolder Id='JavaMenuFolder' On='uninstall' />
</Component>
- <Directory Id="ToolsMenuFolder" Name="tools">
- </Directory>
- <Directory Id="Components" Name="components">
- <Directory Id="ExpMenuFolder" Name="examples">
+ <Directory Id="ToolsMenuFolder" Name="Tools">
+ </Directory>
+ <Directory Id="Components" Name="Components">
+ <Directory Id="ExpMenuFolder" Name="Examples">
</Directory>
</Directory>
- <Directory Id="DocMenuFolder" Name="documents">
+ <Directory Id="DocMenuFolder" Name="Documents">
</Directory>
</Directory>
+ <Directory Id="CommonToolsMenuFolder" Name="Tools">
+ </Directory>
</Directory>
</Directory>
@@ -1366,27 +1355,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="OpenrtpPluginsOrg_eclipse_core_runtime_compatibility_registry_3_2_200_v20080610" />
- <ComponentRef Id="Meta_inf" />
- <ComponentRef Id="OpenrtpPluginsOrg_eclipse_equinox_launcher_win32_win32_x86_1_0_101_r34x_v20080731" />
- <ComponentRef Id="Meta_inf_2" />
- -->
- <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/jp.go.aist.rtm.RTC/installer/win32/build.cmd
===================================================================
--- trunk/jp.go.aist.rtm.RTC/installer/win32/build.cmd 2014-03-28 11:35:43 UTC (rev 723)
+++ trunk/jp.go.aist.rtm.RTC/installer/win32/build.cmd 2015-01-20 01:41:19 UTC (rev 724)
@@ -3,12 +3,21 @@
@rem Variable Settings
@rem usually only %TARGET% might be changed
@rem ------------------------------------------------------------
+if not DEFINED ARCH set ARCH=x86_64
+ at set PATH_OLD=%PATH%
@set PATH=%WIX%\bin;%PATH%
+ at set INCLUDE_OPENRTP=YES
@set VERSION=1.1.0
@set TARGET=OpenRTM-aist-Java
@set TARGET_WXS=%TARGET%.wxs
@set TARGET_WIXOBJ=%TARGET%.wixobj
- at set TARGET_FULL=%TARGET%-%VERSION%
+ at set TARGET_FULL=%TARGET%_%VERSION%-RELEASE_%ARCH%
+if "x%ARCH%" == "xx86_64" (
+ @set OS_ARCH=64-bit OS
+) else (
+ @set OS_ARCH=32-bit OS
+)
+ at set PRODUCT_NAME=OpenRTM-aist-%VERSION%-RELEASE (%OS_ARCH%) for Java
@rem ------------------------------------------------------------
@rem WixUI Customization Settings
@@ -47,30 +56,32 @@
@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 rem set TMP_PYTHONPATH=%PYTHONPATH%
+ at rem rem set PYTHONPATH=../;../../bin;%PYTHONPATH%
+ at rem 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 cd ..
+ at rem )
-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 ..
-)
-
@rem ------------------------------------------------------------
@rem Import Language-Country, Language codes, Codepages
@rem from langs.txt
@@ -90,7 +101,11 @@
@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%
@@ -107,7 +122,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 -loc WixUI_!LC[%%i]!.wxl ^
@@ -144,4 +163,7 @@
:END
del *.yaml
+ at set PATH=%PATH_OLD%
+ at rem pause;
+
More information about the openrtm-commit
mailing list