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

CA-211417: Remove WLB.chm

Browse Source 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2016-05-23 11:42:33 +01:00
parent 6919a50c95
commit 0527164425
6 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
WixInstaller/XenCenter.l10n.diff
View File

@ -28,8 +28,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
--- XenCenter.wxs Fri Apr 8 15:15:52 2016
+++ XenCenter.l10n.wxs Fri Apr 8 15:29:38 2016
--- XenCenter.wxs Mon May 23 11:07:59 2016
+++ XenCenter.l10n.wxs Mon May 23 11:09:01 2016
@@ -40,7 +40,7 @@
<?define HiddenFeatures="[BRANDING_HIDDEN_FEATURES]"?>
<?define AdditionalFeatures="[BRANDING_ADDITIONAL_FEATURES]"?>
@ -135,7 +135,7 @@
</Extension>
</ProgId>
</Component>
@@ -172,13 +174,37 @@
@@ -172,12 +174,34 @@
</Directory>
<?else?>
<Component Id="readmefile" Guid="[BRANDING_README_FILE_GUID]">
@ -146,11 +146,8 @@
<Directory Id="Help" Name="Help">
<Component Id="HelpFiles" Guid="EA8D4F56-A94A-467c-9E6B-F3DC26F95B1E">
<File Id="XenCenterCHM" Source="..\XenAdmin\bin\Release\Help\[XenCenter].chm" />
<File Id="WLBCHM" Source="..\XenAdmin\bin\Release\Help\WLB.chm" />
+ <File Id="XenCenterJaCHM" Source="..\XenAdmin\bin\Release\Help\[XenCenter].ja.chm" />
+ <File Id="WLBJaCHM" Source="..\XenAdmin\bin\Release\Help\WLB.ja.chm" />
+ <File Id="XenCenterScCHM" Source="..\XenAdmin\bin\Release\Help\[XenCenter].zh-CN.chm" />
+ <File Id="WLBScCHM" Source="..\XenAdmin\bin\Release\Help\WLB.zh-CN.chm" />
+ <File Id="XenCenterScCHM" Source="..\XenAdmin\bin\Release\Help\[XenCenter].zh-CN.chm" />
+ </Component>
+ </Directory>
+ <Directory Id="ja" Name="ja">
@ -174,7 +171,7 @@
</Component>
</Directory>
<Directory Id="EXTERNALTOOLS" ShortName="External" Name="External Tools">
@@ -223,7 +249,7 @@
@@ -222,7 +246,7 @@
Vital="no"
Name="XenServerHealthCheck"
DisplayName="[Citrix] [XenServer] Health Check Service"
@ -183,7 +180,7 @@
Start="auto"
Account="LocalSystem"
ErrorControl="normal"
@@ -278,13 +304,15 @@
@@ -277,13 +301,15 @@
<Feature Id="MainProgram" Title="[Citrix] [XenCenter]" Description="[Citrix] [XenCenter]" Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="disallow" >
<ComponentRef Id="MainExecutable" />
<ComponentRef Id="HelpFiles" />
@ -200,7 +197,7 @@
<ComponentRef Id="SchemasFilesComponent" />
<ComponentRef Id="ExternalToolsComponent" />
<ComponentRef Id="RegistryEntries" />
@@ -292,7 +320,7 @@
@@ -291,7 +317,7 @@
<ComponentRef Id="ProgramFilesShortcut" />
<?if "$(env.Branding)"="XenCenter"?>
@ -209,7 +206,7 @@
<ComponentRef Id="XenServerHealthCheck" />
</Feature>
<?else ?>
@@ -311,7 +339,7 @@
@@ -310,7 +336,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

@ -178,7 +178,6 @@
<Directory Id="Help" Name="Help">
<Component Id="HelpFiles" Guid="EA8D4F56-A94A-467c-9E6B-F3DC26F95B1E">
<File Id="XenCenterCHM" Source="..\XenAdmin\bin\Release\Help\[XenCenter].chm" />
<File Id="WLBCHM" Source="..\XenAdmin\bin\Release\Help\WLB.chm" />
</Component>
</Directory>
<Directory Id="EXTERNALTOOLS" ShortName="External" Name="External Tools">

BIN
XenAdmin/Help/WLB.chm
View File

Binary file not shown.

BIN
XenAdmin/Help/WLB.ja.chm
View File

Binary file not shown.

BIN
XenAdmin/Help/WLB.zh-CN.chm
View File

Binary file not shown.

9
XenAdmin/XenAdmin.csproj
View File

@ -3945,15 +3945,6 @@
<Content Include="Help\XenCenter.zh-CN.chm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Help\WLB.zh-CN.chm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Help\WLB.chm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Help\WLB.ja.chm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Images\attach_virtualstorage_32.png" />
<None Include="Images\backup_restore_32.png" />
<None Include="Images\copy_16.png" />