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

CP-15404: Install HealthCheck by condition

Browse Source 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
This commit is contained in:
Cheng Zhang 2016-01-25 16:43:33 +08:00
parent 3ccfcc7e3a
commit 25b60eb220
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
WixInstaller/XenCenter.l10n.diff
View File

@ -28,8 +28,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # SUCH DAMAGE.
--- XenCenter.wxs 2016-01-22 10:35:17.587404800 +0800 --- XenCenter.wxs 2016-01-25 16:46:53.853090300 +0800
+++ XenCenter.l10n.wxs 2016-01-22 10:35:46.740319800 +0800 +++ XenCenter.l10n.wxs 2016-01-25 16:50:34.489016700 +0800
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
<?define UpgradeCode="{EA0EF50F-5CC6-452B-B09F-3F5EC564899D}"?> <?define UpgradeCode="{EA0EF50F-5CC6-452B-B09F-3F5EC564899D}"?>
<?define ProductCode="{65AE1345-A520-456D-8A19-2F52D43D3A09}"?> <?define ProductCode="{65AE1345-A520-456D-8A19-2F52D43D3A09}"?>
@ -39,7 +39,7 @@
<Media Id="1" Cabinet="XenCenter.cab" EmbedCab="yes" /> <Media Id="1" Cabinet="XenCenter.cab" EmbedCab="yes" />
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder"> <Directory Id="ProgramFilesFolder">
@@ -86,68 +86,68 @@ @@ -86,64 +86,64 @@
<File Id="XslicIcon" Source="..\Branding\Images\file_license.ico" /> <File Id="XslicIcon" Source="..\Branding\Images\file_license.ico" />
<File Id="XkbIcon" Source="..\Branding\Images\file_backup.ico" /> <File Id="XkbIcon" Source="..\Branding\Images\file_backup.ico" />
<File Id="XsupdateIcon" Source="..\Branding\Images\file_updates.ico" /> <File Id="XsupdateIcon" Source="..\Branding\Images\file_updates.ico" />
@ -127,11 +127,6 @@
</Extension> </Extension>
</ProgId> </ProgId>
</Component> </Component>
- <Component Id="xsupdatesfiles" Guid="1cfbf607-cc80-4bf8-b2fc-37e69c872316">
+ <Component Id="xsupdatesfiles" Guid="1cfbf607-cc80-4bf8-b2fc-37e69c872316">
<Condition>"$(env.Branding)"="XenCenter"</Condition>
<File Id="hotfixCowley" Source="..\XenAdmin\XS56EFP1002.xsupdate" />
<File Id="hotfixMNR" Source="..\XenAdmin\XS56E008.xsupdate" />
@@ -166,6 +166,26 @@ @@ -166,6 +166,26 @@
<File Id="interes3.xml" Source="..\XenAdmin\bin\Release\TestResources\interesting-xenapp.xml" /> <File Id="interes3.xml" Source="..\XenAdmin\bin\Release\TestResources\interesting-xenapp.xml" />
</Component> </Component>
@ -159,7 +154,7 @@
<Directory Id="EXTERNALTOOLS" ShortName="External" Name="External Tools"> <Directory Id="EXTERNALTOOLS" ShortName="External" Name="External Tools">
<Component Id="ExternalToolsComponent" Guid="D5FC0252-C97B-46e7-9633-A6B68EDB6654"> <Component Id="ExternalToolsComponent" Guid="D5FC0252-C97B-46e7-9633-A6B68EDB6654">
<File Id="XENSERVERLINUXFIXUP" Source="..\XenOvfApi\External Tools\xenserver-linuxfixup-disk.iso" /> <File Id="XENSERVERLINUXFIXUP" Source="..\XenOvfApi\External Tools\xenserver-linuxfixup-disk.iso" />
@@ -246,8 +266,10 @@ @@ -247,8 +267,10 @@
<Feature Id="MainProgram" Title="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Description="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="disallow" > <Feature Id="MainProgram" Title="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Description="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="disallow" >
<ComponentRef Id="MainExecutable" /> <ComponentRef Id="MainExecutable" />
@ -171,7 +166,7 @@
<ComponentRef Id="TestResources" /> <ComponentRef Id="TestResources" />
<ComponentRef Id="SchemasFilesComponent" /> <ComponentRef Id="SchemasFilesComponent" />
<ComponentRef Id="ExternalToolsComponent" /> <ComponentRef Id="ExternalToolsComponent" />
@@ -266,7 +288,7 @@ @@ -267,7 +289,7 @@
<Property Id="ARPPRODUCTICON" Value="XenCenterICO" /> <Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
<MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/> <MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/>
<PropertyRef Id="NETFRAMEWORK45" /> <PropertyRef Id="NETFRAMEWORK45" />

1
WixInstaller/XenCenter.wxs
View File

@ -192,6 +192,7 @@
</Directory> </Directory>
<Directory Id="HEALTHCHECKSERVICEDIR" Name="XenServerHealthCheckService"> <Directory Id="HEALTHCHECKSERVICEDIR" Name="XenServerHealthCheckService">
<Component Id="XenServerHealthCheck" Guid="{9D686BFC-B4FD-435F-AC74-0ACE29425095}"> <Component Id="XenServerHealthCheck" Guid="{9D686BFC-B4FD-435F-AC74-0ACE29425095}">
<Condition>"$(env.Branding)"="XenCenter"</Condition>
<File Id="HealthCheck_XenServerHealthCheck.exe" Name="XenServerHealthCheck.exe" KeyPath="yes" Source="..\XenServerHealthCheck\bin\Release\XenServerHealthCheck.exe" /> <File Id="HealthCheck_XenServerHealthCheck.exe" Name="XenServerHealthCheck.exe" KeyPath="yes" Source="..\XenServerHealthCheck\bin\Release\XenServerHealthCheck.exe" />
<File Id="HealthCheck_CommandLib.dll" Name="CommandLib.dll" Source="..\XenServerHealthCheck\bin\Release\CommandLib.dll" /> <File Id="HealthCheck_CommandLib.dll" Name="CommandLib.dll" Source="..\XenServerHealthCheck\bin\Release\CommandLib.dll" />
<File Id="HealthCheck_CookComputing.XmlRpcV2.dll" Name="CookComputing.XmlRpcV2.dll" Source="..\XenServerHealthCheck\bin\Release\CookComputing.XmlRpcV2.dll" /> <File Id="HealthCheck_CookComputing.XmlRpcV2.dll" Name="CookComputing.XmlRpcV2.dll" Source="..\XenServerHealthCheck\bin\Release\CookComputing.XmlRpcV2.dll" />