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 test repo by required

Browse Source 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
This commit is contained in:
Cheng Zhang 2016-01-25 17:14:42 +08:00
parent a2d62b2c2b
commit 58575a7d15
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WixInstaller/XenCenter.l10n.diff
View File

@ -28,8 +28,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
--- XenCenter.wxs 2016-01-25 17:08:10.996121000 +0800
+++ XenCenter.l10n.wxs 2016-01-25 17:07:47.373404500 +0800
--- XenCenter.wxs 2016-01-25 17:12:12.929899400 +0800
+++ XenCenter.l10n.wxs 2016-01-25 17:13:13.493104800 +0800
@@ -38,7 +38,7 @@
<?define UpgradeCode="{EA0EF50F-5CC6-452B-B09F-3F5EC564899D}"?>
<?define ProductCode="{65AE1345-A520-456D-8A19-2F52D43D3A09}"?>
@ -136,7 +136,7 @@
</Component>
<!-- TestResources -->
<Directory Id="TestReso" ShortName="TestReso" Name="TestResources">
@@ -170,6 +170,26 @@
@@ -171,6 +171,26 @@
<File Id="interes3.xml" Source="..\XenAdmin\bin\Release\TestResources\interesting-xenapp.xml" />
</Component>
</Directory>
@ -163,7 +163,7 @@
<Directory Id="EXTERNALTOOLS" ShortName="External" Name="External Tools">
<Component Id="ExternalToolsComponent" Guid="D5FC0252-C97B-46e7-9633-A6B68EDB6654">
<File Id="XENSERVERLINUXFIXUP" Source="..\XenOvfApi\External Tools\xenserver-linuxfixup-disk.iso" />
@@ -252,9 +272,11 @@
@@ -253,9 +273,11 @@
<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" />
@ -176,7 +176,7 @@
<ComponentRef Id="TestResources" />
<ComponentRef Id="SchemasFilesComponent" />
<ComponentRef Id="ExternalToolsComponent" />
@@ -273,7 +295,7 @@
@@ -274,7 +296,7 @@
<Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
<MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/>
<PropertyRef Id="NETFRAMEWORK45" />

1
WixInstaller/XenCenter.wxs
View File

@ -164,6 +164,7 @@
<!-- TestResources -->
<Directory Id="TestReso" ShortName="TestReso" Name="TestResources">
<Component Id="TestResources" Guid="FA8D4F56-A94A-467c-9E6B-F3DC26F95B1E">
<Condition>"$(env.Branding)"="XenCenter"</Condition>
<File Source="..\XenAdmin\bin\Release\TestResources\credits.xml" />
<File Id="interes1.xml" Source="..\XenAdmin\bin\Release\TestResources\interesting-development.xml" />
<File Id="interes2.xml" Source="..\XenAdmin\bin\Release\TestResources\interesting-production.xml" />