You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2014/05/23 12:56:21 UTC
git commit: updated refs/heads/master to 8f98cc3
Repository: cloudstack
Updated Branches:
refs/heads/master f1ef34550 -> 8f98cc304
CLOUDSTACK-6700 : Give Option to install or not MySql Server along with Main Installer on the same server.
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8f98cc30
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8f98cc30
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8f98cc30
Branch: refs/heads/master
Commit: 8f98cc304e6163e0a2b1e8ffe2f4a302568d4845
Parents: f1ef345
Author: Damodar Reddy <da...@citrix.com>
Authored: Wed May 21 14:53:32 2014 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Fri May 23 16:25:38 2014 +0530
----------------------------------------------------------------------
client/pom.xml | 1 +
scripts/installer/windows/acs.wxs | 11 +++++++----
scripts/installer/windows/dependencies.wxs | 5 +++--
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f98cc30/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 09daebc..6d895ce 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -679,6 +679,7 @@
<fileset dir="../scripts/installer/windows/">
<include name="start.bat"/>
<include name="acs_license.rtf"/>
+ <include name="optionstheme.xml"/>
</fileset>
</copy>
<copy todir="./target/client">
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f98cc30/scripts/installer/windows/acs.wxs
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs
index 411d026..84045c5 100644
--- a/scripts/installer/windows/acs.wxs
+++ b/scripts/installer/windows/acs.wxs
@@ -53,6 +53,9 @@
<RegistrySearch Id="SecenZSearch" Name="Path" Root="HKLM"
Key="SOFTWARE\7-Zip" Type="raw" Win64="yes" />
</Property>
+ <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>
<!-- Properties for Database Related Information to be collected -->
@@ -79,7 +82,7 @@
Value="-XX:MaxPermSize=512m -Xmx1024m -Xms256m" />
<Environment Id="Path" Action="set" Name="Path"
Permanent="yes" System="yes" Part="last"
- Value="[JAVA_HOME]\bin;[PYTHON_HOME];[SEVENZ_HOME];[ProgramFilesFolder]\cdrtools" />
+ Value="[JAVA_HOME]\bin;[PYTHON_HOME];[SEVENZ_HOME];[ProgramFilesFolder]\cdrtools;[MYSQL]\bin" />
</Component>
<Component Id='setuptools' Guid='019a51dd-7fc4-4d6c-9277-13cc7b600789'>
<File Id="ez_setup" Source="ez_setup.py" />
@@ -278,7 +281,7 @@
</InstallExecuteSequence>
<Feature Id='Complete' Title='ACS' Description='The complete package.'
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
- <Feature Id='MainProgram' Title='Program' Description='The main executable.'
+ <Feature Id='MainProgram' Title='Management Server' Description='The main executable.'
Level='1'>
<ComponentRef Id='webappsFolder' />
<ComponentGroupRef Id='ClientPath' />
@@ -295,7 +298,7 @@
<ComponentRef Id='ServiceInstaller' />
</Feature>
</Feature>
- <UIRef Id="WixUI_Mondo_Custom" />
- <UIRef Id="WixUI_ErrorProgressText" />
+ <UIRef Id="WixUI_Mondo_Custom" />
+ <UIRef Id="WixUI_ErrorProgressText" />
</Product>
</Wix>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f98cc30/scripts/installer/windows/dependencies.wxs
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/dependencies.wxs b/scripts/installer/windows/dependencies.wxs
index 56ea2a4..82fcd27 100644
--- a/scripts/installer/windows/dependencies.wxs
+++ b/scripts/installer/windows/dependencies.wxs
@@ -13,10 +13,11 @@
<!-- 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"/>
+ <bal:WixStandardBootstrapperApplication LicenseFile="acs_license.rtf" ShowVersion="yes" ThemeFile="optionstheme.xml"/>
</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" />
+ <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"/>
+ <MsiPackage Id="MySqlClient" 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" EnableFeatureSelection="no" DisplayInternalUI="no" InstallCondition="Not ACSCheckbox"/>
<MsiPackage Id="SevenZip" Name="7z920-x64.msi" DownloadUrl="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi" Compressed="no" Visible="yes" ForcePerMachine="yes" After="MySql"/>
<MsiPackage Id="Python" Name="python-2.7.6.amd64.msi" DownloadUrl="https://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi" Compressed="no" Visible="yes" ForcePerMachine="yes" After="SevenZip"/>
<ExePackage Id="Tomcat6" Name="apache-tomcat-6.0.39.exe" PerMachine="yes" DownloadUrl="http://mirror.sdunix.com/apache/tomcat/tomcat-6/v6.0.39/bin/apache-tomcat-6.0.39.exe" Compressed="no" InstallCommand="/S" After="Python"/>