Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-24 22:06:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1688 from GaborApatiNagy/inst

Browse Source 
CA-258357: Modified the build script to build the MSI installer
This commit is contained in:
Mihaela Stoica 2017-07-12 12:57:34 +01:00 committed by GitHub
commit e98583ac00
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WixInstaller/XenCenter.l10n.diff
View File

@ -210,7 +210,7 @@
<Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
<MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/>
<PropertyRef Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" />
- <Condition Message=".NET Framework 4.6 is required for this installation."><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
- <Condition Message="Microsoft .NET Framework 4.6 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework"><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
+ <Condition Message="!(loc.Required_For_Installation)"><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
<Property Id="PERMACHINEINSTALL">
<RegistrySearch Id="InstallRegistry" Type="raw" Root="HKLM" Key="Software\[Citrix]\[XenCenter]" Name="InstallDir" />

2
WixInstaller/XenCenter.wxs
View File

@ -310,7 +310,7 @@
<Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
<MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/>
<PropertyRef Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" />
<Condition Message=".NET Framework 4.6 is required for this installation."><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
<Condition Message="Microsoft .NET Framework 4.6 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework"><![CDATA[Installed OR WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED]]></Condition>
<Property Id="PERMACHINEINSTALL">
<RegistrySearch Id="InstallRegistry" Type="raw" Root="HKLM" Key="Software\[Citrix]\[XenCenter]" Name="InstallDir" />
</Property>

2
WixInstaller/en-us.wxl
View File

@ -11,7 +11,7 @@
<String Id="XenServer_Update_File">[XenServer] Update File</String>
<String Id="XenServer_OEM_Update_File">[XenServer] OEM Update File</String>
<String Id="XenCenter_Saved_Search">[XenCenter] Saved Search</String>
<String Id="Required_For_Installation">.NET Framework 4 is required for this installation.</String>
<String Id="Required_For_Installation">Microsoft .NET Framework 4.6 or later is required for this installation. Please install it from: https://www.microsoft.com/net/download/framework</String>
<String Id="Readme">README.TXT</String>
<String Id="HealthCheckDescr">Enables monitoring of the health of your Citrix XenServer pools by periodically uploading data from the servers to Citrix Insight Services.</String>
<String Id="HealthCheckDescrShort">Enables monitoring of the health of your Citrix XenServer pools.</String>

2
WixInstaller/ja-jp.wxl
View File

@ -11,7 +11,7 @@
<String Id="XenServer_Update_File">[XenServer] アップデート ファイル</String>
<String Id="XenServer_OEM_Update_File">[XenServer] OEM アップデート ファイル</String>
<String Id="XenCenter_Saved_Search">[XenCenter] 保存済みの検索</String>
<String Id="Required_For_Installation">このインストールには .NET Framework 4 が必要です。</String>
<String Id="Required_For_Installation">このインストールには .NET Framework 4.6 が必要です。</String>
<String Id="Readme">README.TXT</String>
<String Id="HealthCheckDescr">サーバーから Citrix Insight Services に定期的にデータをアップロードすることにより、Citrix XenServer プールのヘルス状態の監視を有効にします。</String>
<String Id="HealthCheckDescrShort">Citrix XenServer プールのヘルス状態の監視を有効にします。</String>

2
WixInstaller/zh-cn.wxl
View File

@ -11,7 +11,7 @@
<String Id="XenServer_Update_File">[XenServer] 更新文件</String>
<String Id="XenServer_OEM_Update_File">[XenServer] OEM 更新文件</String>
<String Id="XenCenter_Saved_Search">[XenCenter] 保存的搜索</String>
<String Id="Required_For_Installation">此安装需要 .NET Framework 4。</String>
<String Id="Required_For_Installation">此安装需要 .NET Framework 4.6。</String>
<String Id="Readme">声明.TXT</String>
<String Id="HealthCheckDescr">通过定期将数据从服务器上载到 Citrix Insight Services，实现对 Citrix XenServer 池的运行状况监视。</String>
<String Id="HealthCheckDescrShort">允许监视 Citrix XenServer 池的运行状况。</String>