diff --git a/client/pom.xml b/client/pom.xml index 6d895ce9815..c55d5b7b44b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -680,6 +680,7 @@ + @@ -845,6 +846,12 @@ target/Setup_Databases.wixobj target/python-site-packages.wixobj + + en-us + + + target/en-us.wxl + target/acs.msi @@ -867,7 +874,13 @@ target/dependencies.wixobj - target/acs-4.4.0.0.exe + + en-US + + + target/en-us.wxl + + target/acs-${project.version}.exe candle diff --git a/scripts/installer/windows/Setup_Databases.wxs b/scripts/installer/windows/Setup_Databases.wxs index f4e8fa1559d..0254c61a698 100644 --- a/scripts/installer/windows/Setup_Databases.wxs +++ b/scripts/installer/windows/Setup_Databases.wxs @@ -11,7 +11,7 @@ - + 1 @@ -19,18 +19,18 @@ - + - + - + - + - + - + diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs index 84045c5794f..8206afae2cb 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. --> - + Codepage='1252' Version='4.4.0' Manufacturer='!(loc.ProductManufacturer)'> - @@ -28,7 +28,7 @@ Type="raw" Win64="yes" /> + Message="!(loc.Java7ConditionMessage)"> @@ -37,7 +37,7 @@ Type="raw" Win64="yes" /> + Message="!(loc.Tomcat6ConditionMessage)"> @@ -46,7 +46,7 @@ Win64="yes" /> + Message="!(loc.Python2ConditionMessage)"> @@ -56,7 +56,7 @@ - + @@ -279,9 +279,9 @@ (NOT Installed) AND ( "1"]]>) - - diff --git a/scripts/installer/windows/dependencies.wxs b/scripts/installer/windows/dependencies.wxs index 82fcd278e51..987c561daf6 100644 --- a/scripts/installer/windows/dependencies.wxs +++ b/scripts/installer/windows/dependencies.wxs @@ -13,7 +13,7 @@ - + diff --git a/scripts/installer/windows/en-us.wxl b/scripts/installer/windows/en-us.wxl new file mode 100644 index 00000000000..b43393c16cc --- /dev/null +++ b/scripts/installer/windows/en-us.wxl @@ -0,0 +1,33 @@ + + + + Apache Cloud Stack + Apache + Apache Cloud Stack Installer + ACS is a registered trademark + Apache + Apache tomcat6 is not installed please do install tomcat6 and then try + Java 7 Is not Installed. Please Install Java 7 and then try + Python 2.7 is not installed Please do install python and then try + 7Z is not installed please do install 7z and then try + Management Server + The Main Executable of Cloud Stack. + The complete package. + Provide Database Information + Please provide the database information that host the cloud schemas + Host Name + User Name + Password + Root Password + Create Cloud Stack Database + + Version 4.0.0.0 + \ No newline at end of file diff --git a/scripts/installer/windows/optionstheme.xml b/scripts/installer/windows/optionstheme.xml index 527309f3db0..fa8d585b719 100644 --- a/scripts/installer/windows/optionstheme.xml +++ b/scripts/installer/windows/optionstheme.xml @@ -1,3 +1,4 @@ + - - #(loc.Caption) - - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI + #(loc.Caption) + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI - - #(loc.Title) + + #(loc.Title) - - #(loc.HelpHeader) - #(loc.HelpText) - - - - - #(loc.InstallAcceptCheckbox) - - - - - - - #(loc.OptionsHeader) - Select to Install Mysql - - Install MySql Database Server - - - - - #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - - - - - - #(loc.ModifyHeader) - - - - - - #(loc.SuccessHeader) - - #(loc.SuccessRestartText) - - - - - - #(loc.FailureHeader) - #(loc.FailureHyperlinkLogText) - - - #(loc.FailureRestartText) - - - - + + #(loc.HelpHeader) + #(loc.HelpText) + + + + + #(loc.InstallAcceptCheckbox) + + + + + + #(loc.OptionsHeader) + Select to Install Mysql + #(loc.MysqlInstaller) + + + + + #(loc.ProgressHeader) + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) + + + + + #(loc.ModifyHeader) + + + + + + #(loc.SuccessHeader) + + #(loc.SuccessRestartText) + + + + + #(loc.FailureHeader) + #(loc.FailureHyperlinkLogText) + + #(loc.FailureRestartText) + + + \ No newline at end of file diff --git a/scripts/installer/windows/optionstheme_en-us.wxl b/scripts/installer/windows/optionstheme_en-us.wxl new file mode 100644 index 00000000000..c822929d313 --- /dev/null +++ b/scripts/installer/windows/optionstheme_en-us.wxl @@ -0,0 +1,57 @@ + + + + + Apache Cloud Stack Setup + Apache Cloud Stack + Install MySql Database Server + Version 4.0.0.0 + + Are you sure you want to cancel? + Previous version + Setup Help + /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%. + &Close + I &agree to the license terms and conditions + &Options + &Install + &Close + Setup Options + Install location: + &Browse + &OK + &Cancel + Setup Progress + Installing: + Initializing... + &Cancel + Modify Setup + &Repair + &Uninstall + &Close + Setup Successful + &Launch + You must restart your computer before you can use the software. + &Restart + &Close + Setup Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + \ No newline at end of file