cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject git commit: updated refs/heads/master to 8a210b5
Date Wed, 28 May 2014 10:40:49 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 84cfb4728 -> 8a210b50f


CLOUDSTACK-6702: Move all titles and descriptions to a property file or move to build properties

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8a210b50
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8a210b50
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8a210b50

Branch: refs/heads/master
Commit: 8a210b50fbe6c617ab597bf04a19e5eaa5d0362d
Parents: 84cfb47
Author: Damodar Reddy <damoder.reddy@citrix.com>
Authored: Mon May 26 10:38:20 2014 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Wed May 28 16:10:42 2014 +0530

----------------------------------------------------------------------
 client/pom.xml                                  |  15 +-
 scripts/installer/windows/Setup_Databases.wxs   |  14 +-
 scripts/installer/windows/acs.wxs               |  22 +--
 scripts/installer/windows/dependencies.wxs      |   2 +-
 scripts/installer/windows/en-us.wxl             |  33 ++++
 scripts/installer/windows/optionstheme.xml      | 169 ++++++-------------
 .../installer/windows/optionstheme_en-us.wxl    |  57 +++++++
 7 files changed, 179 insertions(+), 133 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a210b50/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 6d895ce..c55d5b7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -680,6 +680,7 @@
                         <include name="start.bat"/>
                         <include name="acs_license.rtf"/>
                         <include name="optionstheme.xml"/>
+                        <include name="*.wxl"/>
                       </fileset>
                     </copy>
                     <copy todir="./target/client">
@@ -845,6 +846,12 @@
                       <objectFile>target/Setup_Databases.wixobj</objectFile>
                       <objectFile>target/python-site-packages.wixobj</objectFile>
                     </objectFiles>
+                    <cultures>
+                      <culture>en-us</culture>
+                    </cultures>
+                    <localizationFiles>
+                      <localizationFile>target/en-us.wxl</localizationFile>
+                    </localizationFiles>
                     <outputFile>target/acs.msi</outputFile>
                   </configuration>
                   <goals>
@@ -867,7 +874,13 @@
                     <objectFiles>
                       <objectFile>target/dependencies.wixobj</objectFile>
                     </objectFiles>
-                    <outputFile>target/acs-4.4.0.0.exe</outputFile>
+                    <cultures>
+                      <culture>en-US</culture>
+                    </cultures>
+                    <localizationFiles>
+                      <localizationFile>target/en-us.wxl</localizationFile>
+                    </localizationFiles>
+                    <outputFile>target/acs-${project.version}.exe</outputFile>
                   </configuration>
                   <goals>
                     <goal>candle</goal>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a210b50/scripts/installer/windows/Setup_Databases.wxs
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/Setup_Databases.wxs b/scripts/installer/windows/Setup_Databases.wxs
index f4e8fa1..0254c61 100644
--- a/scripts/installer/windows/Setup_Databases.wxs
+++ b/scripts/installer/windows/Setup_Databases.wxs
@@ -11,7 +11,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     <UI>
-      <Dialog Id="DatabaseInformation" Width="370" Height="270" Title="Provide Database
Information">
+      <Dialog Id="DatabaseInformation" Width="370" Height="270" Title="!(loc.DatabaseInformationTitle)">
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes"
Text="!(loc.WixUINext)" />
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17"
Cancel="yes" Text="!(loc.WixUICancel)">
                     <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
@@ -19,18 +19,18 @@
         <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no"
Text="!(loc.WelcomeDlgBitmap)" />
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)"
/>
         <Control Id="BottomLine" Type="Line" X="0" Y="235" Width="370" Height="0" />
-        <Control Id="Description" Type="Text" X="135" Y="10" Width="220" Height="20" Transparent="yes"
NoPrefix="yes" Text="Please provide the database information that host the cloud schemas"
/>
+        <Control Id="Description" Type="Text" X="135" Y="10" Width="220" Height="20" Transparent="yes"
NoPrefix="yes" Text="!(loc.DatabaseInformationDescription)" />
 
-        <Control Id="DbServerIpLabel" Type="Text" X="160" Y="38" Width="40" Height="20"
TabSkip="no" Text="Host Name" Transparent="yes"/>
+        <Control Id="DbServerIpLabel" Type="Text" X="160" Y="38" Width="40" Height="20"
TabSkip="no" Text="!(loc.DbServerIpLabel)" Transparent="yes"/>
         <Control Id="DbServerIp" Type="Edit" Height="20" Width="92" X="220" Y="33" Property="DB_HOSTNAME"
/>
-        <Control Id="DbUserNameLabel" Type="Text" X="160" Y="78" Width="40" Height="20"
TabSkip="no" Text="User Name" Transparent="yes"/>
+        <Control Id="DbUserNameLabel" Type="Text" X="160" Y="78" Width="40" Height="20"
TabSkip="no" Text="!(loc.DbUserNameLabel)" Transparent="yes"/>
         <Control Id="DbUserName" Type="Edit" Height="20" Width="92" X="220" Y="73" Property="DB_USERNAME"
/>
-        <Control Id="DbPasswordLabel" Type="Text" X="160" Y="118" Width="40" Height="20"
TabSkip="no" Text="Password" Transparent="yes"/>
+        <Control Id="DbPasswordLabel" Type="Text" X="160" Y="118" Width="40" Height="20"
TabSkip="no" Text="!(loc.DbPasswordLabel)" Transparent="yes"/>
         <Control Id="DbPassword" Type="Edit" Height="20" Width="92" X="220" Y="113" Property="DB_PASSWORD"
Password="yes"/>
-        <Control Id="DbRootPasswordLabel" Type="Text" X="160" Y="158" Width="40" Height="20"
TabSkip="no" Text="Root Password" Transparent="yes"/>
+        <Control Id="DbRootPasswordLabel" Type="Text" X="160" Y="158" Width="40" Height="20"
TabSkip="no" Text="!(loc.DbRootPasswordLabel)" Transparent="yes"/>
         <Control Id="DbRootPassword" Type="Edit" Height="20" Width="92" X="220" Y="153"
Property="DB_ROOT_PASSWORD" Password="yes"/>
         <Control Id="CreateDBCheckBox" Type="CheckBox" X="160" Y="207" Width="10" Height="10"
CheckBoxValue="1" Property="CREATE_DATABASE"/>
-        <Control Id="CreateDBCheckBoxLabel" Type="Text" X="176" Y="207" Width="340" Height="20"
TabSkip="no" Text="Create Cloud Stack Database" Transparent="yes"/>
+        <Control Id="CreateDBCheckBoxLabel" Type="Text" X="176" Y="207" Width="340" Height="20"
TabSkip="no" Text="!(loc.CreateDBCheckBoxLabel)" Transparent="yes"/>
       </Dialog>
     </UI>
   </Fragment>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a210b50/scripts/installer/windows/acs.wxs
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs
index 84045c5..8206afa 100644
--- a/scripts/installer/windows/acs.wxs
+++ b/scripts/installer/windows/acs.wxs
@@ -9,13 +9,13 @@
   OF ANY KIND, either express or implied. See the License for the specific
   language governing permissions and limitations under the License. -->
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:fire='http://schemas.microsoft.com/wix/FirewallExtension'
xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'>
-  <Product Name='ACS' Id='eea70ed5-5950-4f01-b4aa-4a07636359bb'
+  <Product Name='!(loc.ProductName)' Id='eea70ed5-5950-4f01-b4aa-4a07636359bb'
     UpgradeCode='d6208c34-7b50-4512-b19e-b904dcc1373e' Language='1033'
-    Codepage='1252' Version='4.4.0' Manufacturer='Apache Cloud Stack'>
+    Codepage='1252' Version='4.4.0' Manufacturer='!(loc.ProductManufacturer)'>
 
-    <Package Id='*' Keywords='Installer' Description="Apache Cloud Stack Installer"
-      Comments='Foobar is a registered trademark of Acme Ltd.'
-      Manufacturer='Apache' Languages='1033' Compressed='yes'
+    <Package Id='*' Keywords='Installer' Description="!(loc.PackageDescription)"
+      Comments='!(loc.PackageComments)'
+      Manufacturer='!(loc.PackageManufacturer)' Languages='1033' Compressed='yes'
       SummaryCodepage='1252' Platform="x64" InstallerVersion="500" />
 
     <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
@@ -28,7 +28,7 @@
         Type="raw" Win64="yes" />
     </Property>
     <Condition
-      Message="Java 7 Is not Installed. Please Install Java 7 and then try"><![CDATA[(Installed
OR JAVA_HOME)]]></Condition>
+      Message="!(loc.Java7ConditionMessage)"><![CDATA[(Installed OR JAVA_HOME)]]></Condition>
 
     <!-- Get Tomcat6 installation path -->
     <Property Id='TOMCATDIRECTORY'>
@@ -37,7 +37,7 @@
         Type="raw" Win64="yes" />
     </Property>
     <Condition
-      Message="Apache tomcat6 is not installed please do install tomcat6 and then try"><![CDATA[(Installed
OR TOMCATDIRECTORY)]]></Condition>
+      Message="!(loc.Tomcat6ConditionMessage)"><![CDATA[(Installed OR TOMCATDIRECTORY)]]></Condition>
 
     <!-- Get Python installation path -->
     <Property Id='PYTHON_HOME'>
@@ -46,7 +46,7 @@
         Win64="yes" />
     </Property>
     <Condition
-      Message="Python 2.7 is not installed Please do install python and then try"><![CDATA[(Installed
OR PYTHON_HOME)]]></Condition>
+      Message="!(loc.Python2ConditionMessage)"><![CDATA[(Installed OR PYTHON_HOME)]]></Condition>
 
     <!-- Get 7Z installation path -->
     <Property Id='SEVENZ_HOME'>
@@ -56,7 +56,7 @@
     <Property Id='MYSQL'>
       <RegistrySearch Id="MySqlSearch" Name="Location" Root="HKLM" Key="SOFTWARE\Wow6432Node\MySQL
AB\MySQL Server 5.1" Type="raw" Win64="yes" />
     </Property>
-    <Condition Message="7Z is not installed please do install 7z and then try"><![CDATA[(Installed
OR SEVENZ_HOME)]]></Condition>
+    <Condition Message="!(loc.SevenZConditionMessage)"><![CDATA[(Installed OR SEVENZ_HOME)]]></Condition>
 
     <!-- Properties for Database Related Information to be collected -->
     <Property Id="DB_USERNAME" Value="cloud" />
@@ -279,9 +279,9 @@
       <Custom Action="SetupDatabases" After="DeleteDirectory">(NOT Installed) AND (<![CDATA[CREATE_DATABASE
<> "1"]]>)
       </Custom>
     </InstallExecuteSequence>
-    <Feature Id='Complete' Title='ACS' Description='The complete package.'
+    <Feature Id='Complete' Title='!(loc.ProductName)' Description='!(loc.FeatureDescription2)'
       Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
-      <Feature Id='MainProgram' Title='Management Server' Description='The main executable.'
+      <Feature Id='MainProgram' Title='!(loc.FeatureTitle1)' Description='!(loc.FeatureDescription1)'
         Level='1'>
         <ComponentRef Id='webappsFolder' />
         <ComponentGroupRef Id='ClientPath' />

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a210b50/scripts/installer/windows/dependencies.wxs
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/dependencies.wxs b/scripts/installer/windows/dependencies.wxs
index 82fcd27..987c561 100644
--- a/scripts/installer/windows/dependencies.wxs
+++ b/scripts/installer/windows/dependencies.wxs
@@ -13,7 +13,7 @@
 <!-- Installing dependencies -->
 	<Bundle UpgradeCode="7cc78eac-106d-400e-b266-1b2c778b16b9" Version="4.4.0">
 		<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense" >
-			<bal:WixStandardBootstrapperApplication LicenseFile="acs_license.rtf" ShowVersion="yes"
ThemeFile="optionstheme.xml"/>
+			<bal:WixStandardBootstrapperApplication LicenseFile="acs_license.rtf" ShowVersion="yes"
ThemeFile="optionstheme.xml" LocalizationFile="optionstheme_en-us.wxl"/>
 		</BootstrapperApplicationRef>
 		<Chain>
 			<MsiPackage Id="MySql" Name="mysql-5.1.73-winx64.msi" DownloadUrl="http://cdn.mysql.com/Downloads/MySQL-5.1/mysql-5.1.73-winx64.msi"
Compressed="no" Visible="yes" ForcePerMachine="yes" DisplayInternalUI="yes" EnableFeatureSelection="yes"
InstallCondition="ACSCheckbox"/>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a210b50/scripts/installer/windows/en-us.wxl
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/en-us.wxl b/scripts/installer/windows/en-us.wxl
new file mode 100644
index 0000000..b43393c
--- /dev/null
+++ b/scripts/installer/windows/en-us.wxl
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+  license agreements. See the NOTICE file distributed with this work for additional
+  information regarding copyright ownership. The ASF licenses this file to you under
+  the Apache License, Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software distributed under
+  the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+  OF ANY KIND, either express or implied. See the License for the specific language
+  governing permissions and limitations under the License. -->
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductName">Apache Cloud Stack</String>
+  <String Id="ProductManufacturer">Apache</String>
+  <String Id="PackageDescription">Apache Cloud Stack Installer</String>
+  <String Id="PackageComments">ACS is a registered trademark</String>
+  <String Id="PackageManufacturer">Apache</String>
+  <String Id="Tomcat6ConditionMessage">Apache tomcat6 is not installed please do install
tomcat6 and then try</String>
+  <String Id="Java7ConditionMessage">Java 7 Is not Installed. Please Install Java 7
and then try</String>
+  <String Id="Python2ConditionMessage">Python 2.7 is not installed Please do install
python and then try</String>
+  <String Id="SevenZConditionMessage">7Z is not installed please do install 7z and
then try</String>
+  <String Id="FeatureTitle1">Management Server</String>
+  <String Id="FeatureDescription1">The Main Executable of Cloud Stack.</String>
+  <String Id="FeatureDescription2">The complete package.</String>
+  <String Id="DatabaseInformationTitle">Provide Database Information</String>
+  <String Id="DatabaseInformationDescription">Please provide the database information
that host the cloud schemas</String>
+  <String Id="DbServerIpLabel">Host Name</String>
+  <String Id="DbUserNameLabel">User Name</String>
+  <String Id="DbPasswordLabel">Password</String>
+  <String Id="DbRootPasswordLabel">Root Password</String>
+  <String Id="CreateDBCheckBoxLabel">Create Cloud Stack Database</String>
+
+  <String Id="InstallVersion">Version 4.0.0.0</String>
+</WixLocalization>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a210b50/scripts/installer/windows/optionstheme.xml
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/optionstheme.xml b/scripts/installer/windows/optionstheme.xml
index 527309f..fa8d585 100644
--- a/scripts/installer/windows/optionstheme.xml
+++ b/scripts/installer/windows/optionstheme.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
   license agreements. See the NOTICE file distributed with this work for additional
   information regarding copyright ownership. The ASF licenses this file to you under
@@ -7,120 +8,62 @@
   the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
   OF ANY KIND, either express or implied. See the License for the specific language
   governing permissions and limitations under the License. -->
-<?xml version="1.0" encoding="utf-8"?>
 <Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
-  <Window Width="485" Height="300" HexStyle="100a0000" FontId="0">#(loc.Caption)
-  </Window>
-  <Font Id="0" Height="-12" Weight="500" Foreground="000000"
-    Background="FFFFFF">Segoe UI</Font>
-  <Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
-  <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
-  <Font Id="3" Height="-12" Weight="500" Foreground="000000"
-    Background="FFFFFF">Segoe UI</Font>
-  <Font Id="4" Height="-12" Weight="500" Foreground="ff0000"
-    Background="FFFFFF" Underline="yes">Segoe UI</Font>
+    <Window Width="485" Height="300" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
+    <Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe
UI</Font>
+    <Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
+    <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
+    <Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe
UI</Font>
+    <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe
UI</Font>
 
-  <Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png"
-    Visible="yes" />
-  <Text X="80" Y="11" Width="-11" Height="64" FontId="1" Visible="yes"
-    DisablePrefix="yes">#(loc.Title)</Text>
+    <Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" Visible="yes"/>
+    <Text X="80" Y="11" Width="-11" Height="64" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
 
-  <Page Name="Help">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2"
-      DisablePrefix="yes">#(loc.HelpHeader)</Text>
-    <Text X="11" Y="112" Width="-11" Height="-35" FontId="3"
-      DisablePrefix="yes">#(loc.HelpText)</Text>
-    <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
-  </Page>
-  <Page Name="Install">
-    <Richedit Name="EulaRichedit" X="11" Y="80" Width="-11"
-      Height="-70" TabStop="yes" FontId="0" HexStyle="0x800000" />
-    <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260"
-      Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)
-    </Checkbox>
-    <Button Name="OptionsButton" X="-171" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)
-    </Button>
-    <Button Name="InstallButton" X="-91" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)
-    </Button>
-    <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)
-    </Button>
-  </Page>
-  <Page Name="Options">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2"
-      DisablePrefix="yes">#(loc.OptionsHeader)</Text>
-    <Checkbox Name="ACSCheckbox" X="31" Y="121" Width="17"
-      Height="17" TabStop="yes" FontId="3">Select to Install Mysql
-    </Checkbox>
-    <Text X="50" Y="121" Width="-11" Height="17" FontId="3"
-      DisablePrefix="yes">Install MySql Database Server</Text>
-    <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0">#(loc.OptionsOkButton)</Button>
-    <Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0">#(loc.OptionsCancelButton)
-    </Button>
-  </Page>
-  <Page Name="Progress">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2"
-      DisablePrefix="yes">#(loc.ProgressHeader)</Text>
-    <Text X="11" Y="121" Width="70" Height="17" FontId="3"
-      DisablePrefix="yes">#(loc.ProgressLabel)</Text>
-    <Text Name="OverallProgressPackageText" X="85" Y="121" Width="-11"
-      Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)
-    </Text>
-    <Progressbar Name="OverallCalculatedProgressbar" X="11"
-      Y="143" Width="-11" Height="15" />
-    <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)
-    </Button>
-  </Page>
-  <Page Name="Modify">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2"
-      DisablePrefix="yes">#(loc.ModifyHeader)</Text>
-    <Button Name="RepairButton" X="-171" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)
-    </Button>
-    <Button Name="UninstallButton" X="-91" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)
-    </Button>
-    <Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
-  </Page>
-  <Page Name="Success">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2"
-      DisablePrefix="yes">#(loc.SuccessHeader)</Text>
-    <Button Name="LaunchButton" X="-91" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)
-    </Button>
-    <Text Name="SuccessRestartText" X="-11" Y="-51" Width="400"
-      Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)
-    </Text>
-    <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)
-    </Button>
-    <Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)
-    </Button>
-  </Page>
-  <Page Name="Failure">
-    <Text X="11" Y="80" Width="-11" Height="30" FontId="2"
-      DisablePrefix="yes">#(loc.FailureHeader)</Text>
-    <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11"
-      Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)
-    </Hypertext>
-    <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11"
-      Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
-    <Text Name="FailureRestartText" X="-11" Y="-51" Width="400"
-      Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)
-    </Text>
-    <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)
-    </Button>
-    <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75"
-      Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)
-    </Button>
-  </Page>
+    <Page Name="Help">
+        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
+        <Text X="11" Y="112" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
+        <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0">#(loc.HelpCloseButton)</Button>
+    </Page>
+    <Page Name="Install">
+        <Richedit Name="EulaRichedit" X="11" Y="80" Width="-11" Height="-70" TabStop="yes"
FontId="0" HexStyle="0x800000" />
+        <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="17" TabStop="yes"
FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
+        <Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
+        <Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0">#(loc.InstallInstallButton)</Button>
+        <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0">#(loc.InstallCloseButton)</Button>
+    </Page>
+    <Page Name="Options">
+        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.OptionsHeader)</Text>
+        <Checkbox Name="ACSCheckbox" X="31" Y="121" Width="17" Height="17" TabStop="yes"
FontId="3">Select to Install Mysql</Checkbox>
+        <Text X="50" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.MysqlInstaller)</Text>
+        <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0">#(loc.OptionsOkButton)</Button>
+        <Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0">#(loc.OptionsCancelButton)</Button>
+    </Page>
+    <Page Name="Progress">
+        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
+        <Text X="11" Y="121" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
+        <Text Name="OverallProgressPackageText" X="85" Y="121" Width="-11" Height="17"
FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
+        <Progressbar Name="OverallCalculatedProgressbar" X="11" Y="143" Width="-11" Height="15"
/>
+        <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0">#(loc.ProgressCancelButton)</Button>
+    </Page>
+    <Page Name="Modify">
+        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
+        <Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
+        <Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0">#(loc.ModifyUninstallButton)</Button>
+        <Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0">#(loc.ModifyCloseButton)</Button>
+    </Page>
+    <Page Name="Success">
+        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+        <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
+        <Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3"
HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
+        <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
+        <Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0">#(loc.SuccessCloseButton)</Button>
+    </Page>
+    <Page Name="Failure">
+        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+        <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3"
TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
+        <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3"
TabStop="yes" HideWhenDisabled="yes" />
+        <Text Name="FailureRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3"
HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
+        <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
+        <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes"
FontId="0">#(loc.FailureCloseButton)</Button>
+    </Page>
 </Theme>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a210b50/scripts/installer/windows/optionstheme_en-us.wxl
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/optionstheme_en-us.wxl b/scripts/installer/windows/optionstheme_en-us.wxl
new file mode 100644
index 0000000..c822929
--- /dev/null
+++ b/scripts/installer/windows/optionstheme_en-us.wxl
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+  license agreements. See the NOTICE file distributed with this work for additional
+  information regarding copyright ownership. The ASF licenses this file to you under
+  the Apache License, Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software distributed under
+  the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+  OF ANY KIND, either express or implied. See the License for the specific language
+  governing permissions and limitations under the License. -->
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+
+  <String Id="Caption">Apache Cloud Stack Setup</String>
+  <String Id="Title">Apache Cloud Stack</String>
+  <String Id="MysqlInstaller">Install MySql Database Server</String>
+  <String Id="InstallVersion">Version 4.0.0.0</String>
+
+  <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
+  <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
+  <String Id="HelpHeader">Setup Help</String>
+  <String Id="HelpText">/install | /repair | /uninstall | /layout [directory] - installs,
repairs, uninstalls or
+   creates a complete local copy of the bundle in directory. Install is the default.
+
+/passive | /quiet -  displays minimal UI with no prompts or displays no UI and
+   no prompts. By default UI and all prompts are displayed.
+
+/norestart   - suppress any attempts to restart. By default UI will prompt before restart.
+/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
+  <String Id="HelpCloseButton">&amp;Close</String>
+  <String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
+  <String Id="InstallOptionsButton">&amp;Options</String>
+  <String Id="InstallInstallButton">&amp;Install</String>
+  <String Id="InstallCloseButton">&amp;Close</String>
+  <String Id="OptionsHeader">Setup Options</String>
+  <String Id="OptionsLocationLabel">Install location:</String>
+  <String Id="OptionsBrowseButton">&amp;Browse</String>
+  <String Id="OptionsOkButton">&amp;OK</String>
+  <String Id="OptionsCancelButton">&amp;Cancel</String>
+  <String Id="ProgressHeader">Setup Progress</String>
+  <String Id="ProgressLabel">Installing:</String>
+  <String Id="OverallProgressPackageText">Initializing...</String>
+  <String Id="ProgressCancelButton">&amp;Cancel</String>
+  <String Id="ModifyHeader">Modify Setup</String>
+  <String Id="ModifyRepairButton">&amp;Repair</String>
+  <String Id="ModifyUninstallButton">&amp;Uninstall</String>
+  <String Id="ModifyCloseButton">&amp;Close</String>
+  <String Id="SuccessHeader">Setup Successful</String>
+  <String Id="SuccessLaunchButton">&amp;Launch</String>
+  <String Id="SuccessRestartText">You must restart your computer before you can use
the software.</String>
+  <String Id="SuccessRestartButton">&amp;Restart</String>
+  <String Id="SuccessCloseButton">&amp;Close</String>
+  <String Id="FailureHeader">Setup Failed</String>
+  <String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail.
Please fix the issues and then retry setup. For more information see the &lt;a href="#"&gt;log
file&lt;/a&gt;.</String>
+  <String Id="FailureRestartText">You must restart your computer to complete the rollback
of the software.</String>
+  <String Id="FailureRestartButton">&amp;Restart</String>
+  <String Id="FailureCloseButton">&amp;Close</String>
+</WixLocalization>
\ No newline at end of file


Mime
View raw message