diff --git a/XenAdmin/Controls/Ballooning/MemoryRowLabel.ja.resx b/XenAdmin/Controls/Ballooning/MemoryRowLabel.ja.resx index c63bb3f9f..b3e9d5a45 100644 --- a/XenAdmin/Controls/Ballooning/MemoryRowLabel.ja.resx +++ b/XenAdmin/Controls/Ballooning/MemoryRowLabel.ja.resx @@ -139,7 +139,7 @@ 0 - すべて表示する(&H) + すべて表示する TopRight diff --git a/XenAdmin/Controls/Ballooning/MemoryRowLabel.zh-CN.resx b/XenAdmin/Controls/Ballooning/MemoryRowLabel.zh-CN.resx index 0e7de702a..dfa936e59 100644 --- a/XenAdmin/Controls/Ballooning/MemoryRowLabel.zh-CN.resx +++ b/XenAdmin/Controls/Ballooning/MemoryRowLabel.zh-CN.resx @@ -139,7 +139,7 @@ 0 - 全部显示(&H) + 全部显示 TopRight diff --git a/XenAdmin/Controls/Ballooning/MemorySpinner.zh-CN.resx b/XenAdmin/Controls/Ballooning/MemorySpinner.zh-CN.resx index 8c9701418..b0b7101e7 100644 --- a/XenAdmin/Controls/Ballooning/MemorySpinner.zh-CN.resx +++ b/XenAdmin/Controls/Ballooning/MemorySpinner.zh-CN.resx @@ -123,7 +123,7 @@ - 184, 0 + 194, 0 0, 0, 0, 0 diff --git a/XenAdmin/Controls/GPU/GpuPlacementPolicyPanel.ja.resx b/XenAdmin/Controls/GPU/GpuPlacementPolicyPanel.ja.resx index 812e21d45..d992b41fb 100644 --- a/XenAdmin/Controls/GPU/GpuPlacementPolicyPanel.ja.resx +++ b/XenAdmin/Controls/GPU/GpuPlacementPolicyPanel.ja.resx @@ -181,7 +181,7 @@ 9, 3, 3, 3 - 61, 22 + 130, 22 1 diff --git a/XenAdmin/Controls/GPU/GpuPlacementPolicyPanel.zh-CN.resx b/XenAdmin/Controls/GPU/GpuPlacementPolicyPanel.zh-CN.resx index 05f75b781..7ab1119da 100644 --- a/XenAdmin/Controls/GPU/GpuPlacementPolicyPanel.zh-CN.resx +++ b/XenAdmin/Controls/GPU/GpuPlacementPolicyPanel.zh-CN.resx @@ -181,7 +181,7 @@ 9, 3, 3, 3 - 61, 22 + 130, 22 1 diff --git a/XenAdmin/Controls/Wlb/WlbReportView.ja.resx b/XenAdmin/Controls/Wlb/WlbReportView.ja.resx index 70553ca7a..f101ec08e 100644 --- a/XenAdmin/Controls/Wlb/WlbReportView.ja.resx +++ b/XenAdmin/Controls/Wlb/WlbReportView.ja.resx @@ -133,7 +133,7 @@ 2, 4 - 51, 18 + 61, 18 4 @@ -154,7 +154,7 @@ 1 - 52, 0 + 62, 0 20 @@ -247,7 +247,7 @@ NoControl - 190, 7 + 172, 7 59, 18 @@ -274,10 +274,10 @@ Tahoma, 8pt - 261, 4 + 238, 4 - 102, 20 + 92, 20 3 @@ -331,10 +331,10 @@ Tahoma, 8pt - 80, 3 + 75, 3 - 102, 20 + 92, 20 1 @@ -676,10 +676,10 @@ NoControl - 3, 4 + 1, 4 - 39, 18 + 35, 18 6 @@ -700,13 +700,13 @@ 0 - 50, 0 + 80, 0 20 - 115, 21 + 95, 21 7 @@ -766,13 +766,13 @@ 0 - 42, 0 + 66, 0 20 - 120, 21 + 100, 21 5 @@ -799,7 +799,7 @@ NoControl - 6, 4 + -4, 4 30, 18 diff --git a/XenAdmin/Dialogs/NetworkingPropertiesPage.ja.resx b/XenAdmin/Dialogs/NetworkingPropertiesPage.ja.resx index d07100114..e3e8d2ae1 100644 --- a/XenAdmin/Dialogs/NetworkingPropertiesPage.ja.resx +++ b/XenAdmin/Dialogs/NetworkingPropertiesPage.ja.resx @@ -1018,7 +1018,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="IpAddressSettingsLabel" Row="4" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="PurposeLabel" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="PurposeTextBox" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="tableLayoutPanelStaticSettings" Row="7" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="panelHAEnabledWarning" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="NetworkComboBox" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="Network2Label" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="panelInUseWarning" Row="3" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="FixedIPRadioButton" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="DHCPIPRadioButton" Row="5" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="DeleteButton" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Absolute,20,Absolute,60,Percent,100" /><Rows Styles="Absolute,25,AutoSize,0,AutoSize,0,Absolute,31,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,29" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="IpAddressSettingsLabel" Row="4" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="PurposeLabel" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="PurposeTextBox" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="tableLayoutPanelStaticSettings" Row="7" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="panelHAEnabledWarning" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="NetworkComboBox" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="Network2Label" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="panelInUseWarning" Row="3" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="FixedIPRadioButton" Row="6" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="DHCPIPRadioButton" Row="5" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="DeleteButton" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Absolute,20,Absolute,90,Percent,100" /><Rows Styles="Absolute,25,AutoSize,0,AutoSize,0,Absolute,31,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,29" /></TableLayoutSettings> Fill diff --git a/XenAdmin/Dialogs/OptionsPages/ConsolesOptionsPage.zh-CN.resx b/XenAdmin/Dialogs/OptionsPages/ConsolesOptionsPage.zh-CN.resx index 6873c499f..76a5176ac 100644 --- a/XenAdmin/Dialogs/OptionsPages/ConsolesOptionsPage.zh-CN.resx +++ b/XenAdmin/Dialogs/OptionsPages/ConsolesOptionsPage.zh-CN.resx @@ -727,7 +727,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="UncaptureKeyComboBox" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="UncaptureLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="FullscreenHeader" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="DockKeyComboBox" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="DockUndockabel" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="KeyComboListBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="UncaptureKeyComboBox" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="UncaptureLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="FullscreenHeader" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="DockKeyComboBox" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="DockUndockabel" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="KeyComboListBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="Absolute,28,Absolute,28,Absolute,28" /></TableLayoutSettings> Fill diff --git a/XenAdmin/Dialogs/SelectHostDialog.zh-CN.resx b/XenAdmin/Dialogs/SelectHostDialog.zh-CN.resx index 034a5b199..86ff3ba9a 100644 --- a/XenAdmin/Dialogs/SelectHostDialog.zh-CN.resx +++ b/XenAdmin/Dialogs/SelectHostDialog.zh-CN.resx @@ -253,7 +253,7 @@ Tahoma, 8pt - 50, 9 + 50, 6 3, 3, 3, 3 diff --git a/XenAdmin/SettingsPanels/CPUMemoryEditPage.ja.resx b/XenAdmin/SettingsPanels/CPUMemoryEditPage.ja.resx index 82231e67c..241d0fc64 100644 --- a/XenAdmin/SettingsPanels/CPUMemoryEditPage.ja.resx +++ b/XenAdmin/SettingsPanels/CPUMemoryEditPage.ja.resx @@ -646,7 +646,7 @@ 0, 2, 0, 0 - 71, 19 + 130, 19 3 diff --git a/XenAdmin/SettingsPanels/VMHAEditPage.ja.resx b/XenAdmin/SettingsPanels/VMHAEditPage.ja.resx index cbff351f1..bc2583ebc 100644 --- a/XenAdmin/SettingsPanels/VMHAEditPage.ja.resx +++ b/XenAdmin/SettingsPanels/VMHAEditPage.ja.resx @@ -487,7 +487,7 @@ 140, 3 - 249, 20 + 219, 20 1 @@ -607,7 +607,7 @@ NoControl - 395, 3 + 362, 3 226, 29 diff --git a/XenAdmin/SettingsPanels/VMHAEditPage.zh-CN.resx b/XenAdmin/SettingsPanels/VMHAEditPage.zh-CN.resx index 293730a75..0a4086ab1 100644 --- a/XenAdmin/SettingsPanels/VMHAEditPage.zh-CN.resx +++ b/XenAdmin/SettingsPanels/VMHAEditPage.zh-CN.resx @@ -661,7 +661,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="m_comboBoxProtectionLevel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelProtectionLevel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comboLabel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="m_comboBoxProtectionLevel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="labelProtectionLevel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="comboLabel" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Absolute,200,Absolute,100" /><Rows Styles="Absolute,28" /></TableLayoutSettings> 2 diff --git a/XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.ja.resx b/XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.ja.resx index 8d873ada1..c36c073ae 100644 --- a/XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.ja.resx +++ b/XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.ja.resx @@ -211,7 +211,7 @@ NoControl - 18, 231 + 15, 231 56, 17 @@ -244,7 +244,7 @@ NoControl - 18, 193 + 15, 193 56, 17 @@ -277,7 +277,7 @@ NoControl - 18, 155 + 15, 155 75, 17 @@ -310,7 +310,7 @@ NoControl - 18, 117 + 15, 117 76, 17 @@ -343,7 +343,7 @@ NoControl - 18, 79 + 15, 79 71, 17 @@ -376,7 +376,7 @@ NoControl - 18, 41 + 15, 41 80, 17 @@ -565,7 +565,7 @@ 6, 46 - 578, 266 + 578,192 32 diff --git a/XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.zh-CN.resx b/XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.zh-CN.resx index 0fbf9b4a3..1b3c7b562 100644 --- a/XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.zh-CN.resx +++ b/XenAdmin/SettingsPanels/Wlb/WlbMetricWeightingPage.zh-CN.resx @@ -565,7 +565,7 @@ 6, 46 - 578, 266 + 578, 192 32 diff --git a/XenAdmin/TabPages/GeneralTabPage.ja.resx b/XenAdmin/TabPages/GeneralTabPage.ja.resx index b45f968f6..c456c2858 100644 --- a/XenAdmin/TabPages/GeneralTabPage.ja.resx +++ b/XenAdmin/TabPages/GeneralTabPage.ja.resx @@ -1138,7 +1138,7 @@ 全般 - 729, 34 + 729, 35 0 diff --git a/XenAdmin/TabPages/GeneralTabPage.zh-CN.resx b/XenAdmin/TabPages/GeneralTabPage.zh-CN.resx index c0035ec3b..d6b3131c1 100644 --- a/XenAdmin/TabPages/GeneralTabPage.zh-CN.resx +++ b/XenAdmin/TabPages/GeneralTabPage.zh-CN.resx @@ -1138,7 +1138,7 @@ 常规 - 729, 34 + 729, 35 0 diff --git a/XenAdmin/TabPages/HistoryPage.zh-CN.resx b/XenAdmin/TabPages/HistoryPage.zh-CN.resx index 581a88fc1..10847795a 100644 --- a/XenAdmin/TabPages/HistoryPage.zh-CN.resx +++ b/XenAdmin/TabPages/HistoryPage.zh-CN.resx @@ -428,7 +428,7 @@ Segoe UI, 8.25pt - 0, 3, 0, 0 + 12, 12, 12, 12 786, 336 diff --git a/XenAdmin/TabPages/ManageUpdatesPage.ja.resx b/XenAdmin/TabPages/ManageUpdatesPage.ja.resx index f690568c0..52882ef44 100644 --- a/XenAdmin/TabPages/ManageUpdatesPage.ja.resx +++ b/XenAdmin/TabPages/ManageUpdatesPage.ja.resx @@ -292,7 +292,7 @@ 61, 23 - すべてをエクスポート(&E) + すべてをエクスポート(&X) Segoe UI, 9pt diff --git a/XenAdmin/TabPages/ManageUpdatesPage.zh-CN.resx b/XenAdmin/TabPages/ManageUpdatesPage.zh-CN.resx index 7a019cbf5..42f0589f4 100644 --- a/XenAdmin/TabPages/ManageUpdatesPage.zh-CN.resx +++ b/XenAdmin/TabPages/ManageUpdatesPage.zh-CN.resx @@ -292,7 +292,7 @@ 61, 23 - 全部导出(&E) + 全部导出(&X) Segoe UI, 9pt diff --git a/XenAdmin/TabPages/SearchPage.ja.resx b/XenAdmin/TabPages/SearchPage.ja.resx index 9f9972046..67c97e383 100644 --- a/XenAdmin/TabPages/SearchPage.ja.resx +++ b/XenAdmin/TabPages/SearchPage.ja.resx @@ -133,7 +133,7 @@ 3, 6, 3, 6 - 81, 23 + 95, 23 5 @@ -154,7 +154,7 @@ 0 - 90, 6 + 104, 6 3, 6, 3, 6 @@ -193,7 +193,7 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 186, 6 + 200, 6 3, 6, 3, 6 @@ -202,7 +202,7 @@ 0, 0, 5, 0 - 120, 23 + 130, 23 1 @@ -226,19 +226,19 @@ 2 - 312, 5 + 336, 5 3, 6, 3, 6 - 75, 23 + 115, 23 3 - エクスポート(&E)... + エクスポート(&X)... buttonExport @@ -253,13 +253,13 @@ 3 - 393, 5 + 457, 5 3, 6, 3, 6 - 75, 23 + 105, 23 4 diff --git a/XenAdmin/TabPages/SearchPage.zh-CN.resx b/XenAdmin/TabPages/SearchPage.zh-CN.resx index 473486edf..74211c68a 100644 --- a/XenAdmin/TabPages/SearchPage.zh-CN.resx +++ b/XenAdmin/TabPages/SearchPage.zh-CN.resx @@ -133,7 +133,7 @@ 3, 6, 3, 6 - 81, 23 + 95, 23 5 @@ -154,7 +154,7 @@ 0 - 90, 6 + 104, 6 3, 6, 3, 6 @@ -193,7 +193,7 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 186, 6 + 200, 6 3, 6, 3, 6 @@ -226,7 +226,7 @@ 2 - 312, 5 + 326, 5 3, 6, 3, 6 @@ -238,7 +238,7 @@ 3 - 导出(&E)... + 导出(&X)... buttonExport @@ -253,7 +253,7 @@ 3 - 393, 5 + 407, 5 3, 6, 3, 6 diff --git a/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.ja.resx b/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.ja.resx index 1c07f90dc..20450aee0 100644 --- a/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.ja.resx +++ b/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.ja.resx @@ -250,7 +250,7 @@ 1 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_comboBoxConnection" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="Percent,100" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_comboBoxConnection" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="Absolute,28" /></TableLayoutSettings> True diff --git a/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.zh-CN.resx b/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.zh-CN.resx index 74b3dd624..43f0c1c4e 100644 --- a/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.zh-CN.resx +++ b/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.zh-CN.resx @@ -250,7 +250,7 @@ 1 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_comboBoxConnection" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="Percent,100" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_comboBoxConnection" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="Absolute,28" /></TableLayoutSettings> True diff --git a/XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.zh-CN.resx b/XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.zh-CN.resx index eb433242d..3be4b5041 100644 --- a/XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.zh-CN.resx +++ b/XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.zh-CN.resx @@ -196,7 +196,7 @@ NoControl - 20, 219 + 20, 222 117, 17 @@ -226,7 +226,7 @@ NoControl - 37, 103 + 37, 106 359, 26 diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.ja.resx b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.ja.resx index 577ae8c89..5862389f6 100644 --- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.ja.resx +++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.ja.resx @@ -808,7 +808,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="placeHolderLabel2" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="placeholderLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="errorLabelAtCHAPPassword" Row="7" RowSpan="1" Column="3" ColumnSpan="3" /><Control Name="errorIconAtCHAPPassword" Row="7" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="errorIconAtHostOrIP" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="scanTargetHostButton" Row="8" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="labelIscsiTargetHost" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="textBoxIscsiHost" Row="1" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="labelColon" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="textBoxIscsiPort" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="IScsiChapUserTextBox" Row="5" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="IScsiChapSecretTextBox" Row="6" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="labelCHAPuser" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="IScsiChapSecretLabel" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="IscsiUseChapCheckBox" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="label11" Row="0" RowSpan="1" Column="0" ColumnSpan="6" /><Control Name="errorLabelAtHostname" Row="2" RowSpan="1" Column="3" ColumnSpan="3" /><Control Name="spinnerIconAtScanTargetHostButton" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Absolute,17,Absolute,146,Absolute,22,Absolute,211,AutoSize,0,AutoSize,0,Absolute,20" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="placeHolderLabel2" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="placeholderLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="errorLabelAtCHAPPassword" Row="7" RowSpan="1" Column="3" ColumnSpan="3" /><Control Name="errorIconAtCHAPPassword" Row="7" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="errorIconAtHostOrIP" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="scanTargetHostButton" Row="8" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="labelIscsiTargetHost" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="textBoxIscsiHost" Row="1" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="labelColon" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="textBoxIscsiPort" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="IScsiChapUserTextBox" Row="5" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="IScsiChapSecretTextBox" Row="6" RowSpan="1" Column="2" ColumnSpan="2" /><Control Name="labelCHAPuser" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="IScsiChapSecretLabel" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="IscsiUseChapCheckBox" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="label11" Row="0" RowSpan="1" Column="0" ColumnSpan="6" /><Control Name="errorLabelAtHostname" Row="2" RowSpan="1" Column="3" ColumnSpan="3" /><Control Name="spinnerIconAtScanTargetHostButton" Row="8" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Absolute,17,Absolute,180,Absolute,21,Absolute,178,AutoSize,0,AutoSize,0,Absolute,20" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> False diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.Designer.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.Designer.cs index affa5357b..8cda1b9ab 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.Designer.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.Designer.cs @@ -44,8 +44,6 @@ namespace XenAdmin.Wizards.PatchingWizard this.panel1 = new System.Windows.Forms.Panel(); this.labelDownloadUpdate = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.label7 = new System.Windows.Forms.Label(); this.tableLayoutPanel1.SuspendLayout(); this.panel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); @@ -55,7 +53,6 @@ namespace XenAdmin.Wizards.PatchingWizard ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // label1 @@ -155,23 +152,10 @@ namespace XenAdmin.Wizards.PatchingWizard this.pictureBox2.Name = "pictureBox2"; this.pictureBox2.TabStop = false; // - // pictureBox1 - // - resources.ApplyResources(this.pictureBox1, "pictureBox1"); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.TabStop = false; - // - // label7 - // - resources.ApplyResources(this.label7, "label7"); - this.label7.Name = "label7"; - // // PatchingWizard_FirstPage // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.Controls.Add(this.label7); - this.Controls.Add(this.pictureBox1); this.Controls.Add(this.tableLayoutPanel1); this.Name = "PatchingWizard_FirstPage"; this.tableLayoutPanel1.ResumeLayout(false); @@ -184,7 +168,6 @@ namespace XenAdmin.Wizards.PatchingWizard ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); this.panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -195,8 +178,6 @@ namespace XenAdmin.Wizards.PatchingWizard private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.Label label7; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.Panel panel4; diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs index da01fdc15..819879a7f 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs @@ -41,7 +41,6 @@ namespace XenAdmin.Wizards.PatchingWizard public PatchingWizard_FirstPage() { InitializeComponent(); - pictureBox1.Image = SystemIcons.Information.ToBitmap(); } public override string Text diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.resx b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.resx index 843ec4e33..6f4735c1f 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.resx +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.resx @@ -112,16 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + 3, 0 @@ -139,7 +139,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -166,7 +166,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -183,7 +183,7 @@ 3, 15 - + 0, 0, 0, 0 @@ -197,7 +197,7 @@ pictureBox5 - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel4 @@ -233,7 +233,7 @@ label9 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel4 @@ -257,7 +257,7 @@ panel4 - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -281,7 +281,7 @@ pictureBox3 - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel2 @@ -317,7 +317,7 @@ label8 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel2 @@ -341,7 +341,7 @@ panel2 - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -365,7 +365,7 @@ pictureBox4 - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel3 @@ -401,7 +401,7 @@ label4 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel3 @@ -425,7 +425,7 @@ panel3 - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -461,7 +461,7 @@ labelDownloadUpdate - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel1 @@ -485,7 +485,7 @@ pictureBox2 - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel1 @@ -509,7 +509,7 @@ panel1 - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -536,66 +536,18 @@ tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - 2 + 0 <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="panel4" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel2" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel3" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel1" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Absolute,30,Absolute,30,Absolute,40,Absolute,40,Absolute,40,Absolute,40" /></TableLayoutSettings> - - 23, 237 - - - 32, 32 - - - 4 - - - pictureBox1 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - Top, Left, Right - - - 61, 237 - - - 539, 64 - - - 7 - - - Note that if an update requires a XenServer host reboot, the host will be automatically rebooted before the update is installed to verify its configuration, and then again after the update is installed. - - - label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - + True diff --git a/XenModel/Messages.zh-CN.resx b/XenModel/Messages.zh-CN.resx index 9fbb7b313..43b2d1763 100644 --- a/XenModel/Messages.zh-CN.resx +++ b/XenModel/Messages.zh-CN.resx @@ -12053,7 +12053,7 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别 更新用于 WLB 通信的凭据 - Workload Balancing 服务器名称 + Workload Balancing 服务器名 严重 diff --git a/mk/archive-push.sh b/mk/archive-push.sh index 106e97827..82d0c64ac 100755 --- a/mk/archive-push.sh +++ b/mk/archive-push.sh @@ -30,7 +30,7 @@ set -eu -DISABLE_PUSH=1 +# DISABLE_PUSH=1 source "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/declarations.sh" if [ ${XS_BRANCH} = "trunk" ] @@ -44,8 +44,17 @@ then fi fi +# Secure build: update buildtools, copy output to local disk, then to remote. +cd ${OUTPUT_DIR} +if [ "${BUILD_KIND:+$BUILD_KIND}" = production ] +then + $STORE_FILES remoteupdate xensb.uk.xensource.com xenbuild git://hg.uk.xensource.com/closed/windows buildtools.git /usr/groups/build/windowsbuilds + $STORE_FILES store $SECURE_BUILD_ARCHIVE_UNC $get_JOB_NAME $BUILD_NUMBER * + $STORE_FILES remotestore xensb.uk.xensource.com xenbuild /usr/groups/build/windowsbuilds buildtools.git /usr/groups/build/windowsbuilds/WindowsBuilds $SECURE_BUILD_ARCHIVE_UNC $get_JOB_NAME $BUILD_NUMBER * +fi + #update local xenadmin-ref.hg repository -cp ${OUTPUT_DIR}/{manifest,latest-successful-build} ${ROOT}/xenadmin-ref.hg +cp ${OUTPUT_DIR}/{manifest,latest-*-build} ${ROOT}/xenadmin-ref.hg cd ${ROOT}/xenadmin-ref.hg && hg commit -m "Latest successful build ${get_BUILD_ID}" if [ ${XS_BRANCH} = "trunk" ] diff --git a/mk/bumpBuildNumber.sh b/mk/bumpBuildNumber.sh index c255f9e7e..db1be0674 100644 --- a/mk/bumpBuildNumber.sh +++ b/mk/bumpBuildNumber.sh @@ -30,15 +30,20 @@ set -eu -JENKINS_SERVER=http://tocco.uk.xensource.com:8080 - -source "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/declarations.sh" - if [ $get_JOB_NAME = "devbuild" ] ; then echo Warning: devbuild detected so we will skip the build number increment. All dev builds will have build number 0. exit 0 fi +source "$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/declarations.sh" + +if [ "${BUILD_KIND:+$BUILD_KIND}" = production ] +then + JENKINS_SERVER=http://tizon-1.xs.cbg.ccsi.eng.citrite.net:8080 +else + JENKINS_SERVER=http://tocco.uk.xensource.com:8080 +fi + url="${JENKINS_SERVER}/job/${get_JOB_NAME}/" if curl -s --head --fail "${url}"; then echo "URL exists: ${url}" @@ -47,25 +52,10 @@ else exit 1 fi -PSQL="ssh -q xenbuild@xenbuilder.uk.xensource.com PGPASSWORD=xenadmindb psql -q -A -t xenbuilder xenadmin" +NEXT_BN=$(curl "http://hg.uk.xensource.com/cgi/next-xenadmin?job=$get_JOB_NAME&number=$get_BUILD_NUMBER&rev=$get_REVISION") -QUERY="""INSERT INTO xenadmin_builds (build_number,job,revision) SELECT ${get_BUILD_NUMBER},'${get_JOB_NAME}','${get_REVISION}' WHERE NOT EXISTS ( SELECT 1 FROM xenadmin_builds WHERE build_number = ${get_BUILD_NUMBER}); -UPDATE xenadmin_builds SET job='${get_JOB_NAME}',revision='${get_REVISION}' WHERE build_number=${get_BUILD_NUMBER}; -SELECT MAX(build_number) FROM xenadmin_builds;""" - -echo "${QUERY}" - -MAX_BN=`${PSQL} << eof -${QUERY} -eof` - -echo MAX_BN=${MAX_BN} -NEXT_BN=$(expr ${MAX_BN} + 1) - -echo NEXT_NB=${NEXT_BN} - -$PSQL -c "\"INSERT INTO xenadmin_builds (build_number,job,revision) VALUES (${NEXT_BN},'${get_JOB_NAME}','tba');\"" +echo NEXT_BN=${NEXT_BN} curl --data "nextBuildNumber=${NEXT_BN}" --header "Content-Type: application/x-www-form-urlencoded" ${JENKINS_SERVER}/job/${get_JOB_NAME}/nextbuildnumber/submit -set +u \ No newline at end of file +set +u diff --git a/mk/declarations.sh b/mk/declarations.sh index 7076a9eee..a438bdabc 100644 --- a/mk/declarations.sh +++ b/mk/declarations.sh @@ -135,22 +135,33 @@ SCRATCH_DIR=${ROOT}/scratch OUTPUT_DIR=${ROOT}/output TEST_DIR=/cygdrive/c/cygwin/tmp BUILD_ARCHIVE=${ROOT}/../builds/${get_BUILD_ID}/archive +SECURE_BUILD_ARCHIVE_UNC=//10.80.13.10/distfiles/distfiles/windowsbuilds/WindowsBuilds/$get_JOB_NAME/$BUILD_NUMBER/ #XENCENTER_LOGDIR="/cygdrive/c/Users/Administrator/AppData/Roaming/Citrix/XenCenter/logs" XENCENTER_LOGDIR="/cygdrive/c/Citrix/XenCenter/logs" -#this is where the libraries stored in /usr/groups/linux/distfiles are exposed -WEB_LIB="http://files.uk.xensource.com/linux/distfiles/windows-build" - -#this is where the current build will retrieve some of its dependendencies, +# WEB_LIB is where the libraries stored in /usr/groups/linux/distfiles are exposed +#WEB_LATEST_BUILD is where the current build will retrieve some of its dependendencies, #i.e. XenCenterOvf, version number, branding info and XenServer.NET; #use xe-phase-2-latest to ensure we use a build where phases 1 and 2 have succeeded -WEB_LATEST_BUILD="http://www.uk.xensource.com/carbon/${XS_BRANCH}/xe-phase-2-latest" +if [ "${BUILD_KIND:+$BUILD_KIND}" = production ] +then + WEB_LIB="http://admin/linux/distfiles/windows-build" + WEB_LATEST_BUILD="http://admin/builds/carbon/${XS_BRANCH}/xe-phase-2-latest" +else + WEB_LIB="http://files.uk.xensource.com/linux/distfiles/windows-build" + WEB_LATEST_BUILD="http://www.uk.xensource.com/carbon/${XS_BRANCH}/xe-phase-2-latest" +fi WEB_XE_PHASE_1=${WEB_LATEST_BUILD}/xe-phase-1 WEB_XE_PHASE_2=${WEB_LATEST_BUILD}/xe-phase-2 #this is where the build will find stuff from the latest dotnet-packages build WEB_DOTNET="http://localhost:8080/job/carbon_${XS_BRANCH}_dotnet-packages/lastSuccessfulBuild/artifact" +# used to copy results out of the secure build enclave +BUILD_TOOLS_REPO=git://admin/git/closed/windows/buildtools.git +BUILD_TOOLS=${SCRATCH_DIR}/buildtools.git +STORE_FILES=${BUILD_TOOLS}/scripts/storefiles.py + #check there are xenserver builds on this branch before proceeding wget -N -q --spider ${WEB_XE_PHASE_1}/globals || { echo 'FATAL: Unable to locate globals, xenadmin cannot be built if there is no succesfull build of xenserver published for the same branch.' ; exit 1; } diff --git a/mk/xenadmin-build.sh b/mk/xenadmin-build.sh index a93367675..cd7ec2727 100644 --- a/mk/xenadmin-build.sh +++ b/mk/xenadmin-build.sh @@ -48,6 +48,12 @@ mkdir_clean ${OUTPUT_DIR} mkdir_clean ${BUILD_ARCHIVE} rm -rf ${TEST_DIR}/* ${XENCENTER_LOGDIR}/XenCenter.log || true +if [ "${BUILD_KIND:+$BUILD_KIND}" = production ] +then + git clone ${BUILD_TOOLS_REPO} ${BUILD_TOOLS} + chmod +x ${BUILD_TOOLS}/scripts/storefiles.py +fi + #the local revision numbers are the same as the local revision numbers on the remote repository; #also we know that xenadmin.git is not a patch queue style repository CSET_NUMBER=$(cd ${REPO} && git rev-list HEAD -1 && echo "") @@ -415,7 +421,12 @@ cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep xencenter-ovf >> ${OUTPUT_DIR}/man cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep chroot-lenny >> ${OUTPUT_DIR}/manifest cat ${SCRATCH_DIR}/xe-phase-1-manifest | grep branding >> ${OUTPUT_DIR}/manifest cat ${SCRATCH_DIR}/dotnet-packages-manifest >> ${OUTPUT_DIR}/manifest -echo ${get_BUILD_URL} >> ${OUTPUT_DIR}/latest-successful-build +if [ "${BUILD_KIND:+$BUILD_KIND}" = production ] +then + echo ${get_BUILD_URL} >> ${OUTPUT_DIR}/latest-secure-build +else + echo ${get_BUILD_URL} >> ${OUTPUT_DIR}/latest-successful-build +fi echo "Build phase succeeded at " date