Skip to content

Commit 8f98cc3

Browse files
Damodar ReddyAbhinandan Prateek
Damodar Reddy
authored and
Abhinandan Prateek
committed
CLOUDSTACK-6700 : Give Option to install or not MySql Server along with Main Installer on the same server.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
1 parent f1ef345 commit 8f98cc3

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

‎client/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,7 @@
679679
<fileset dir="../scripts/installer/windows/">
680680
<include name="start.bat"/>
681681
<include name="acs_license.rtf"/>
682+
<include name="optionstheme.xml"/>
682683
</fileset>
683684
</copy>
684685
<copy todir="./target/client">

‎scripts/installer/windows/acs.wxs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
<RegistrySearch Id="SecenZSearch" Name="Path" Root="HKLM"
5454
Key="SOFTWARE\7-Zip" Type="raw" Win64="yes" />
5555
</Property>
56+
<Property Id='MYSQL'>
57+
<RegistrySearch Id="MySqlSearch" Name="Location" Root="HKLM" Key="SOFTWARE\Wow6432Node\MySQL AB\MySQL Server 5.1" Type="raw" Win64="yes" />
58+
</Property>
5659
<Condition Message="7Z is not installed please do install 7z and then try"><![CDATA[(Installed OR SEVENZ_HOME)]]></Condition>
5760

5861
<!-- Properties for Database Related Information to be collected -->
@@ -79,7 +82,7 @@
7982
Value="-XX:MaxPermSize=512m -Xmx1024m -Xms256m" />
8083
<Environment Id="Path" Action="set" Name="Path"
8184
Permanent="yes" System="yes" Part="last"
82-
Value="[JAVA_HOME]\bin;[PYTHON_HOME];[SEVENZ_HOME];[ProgramFilesFolder]\cdrtools" />
85+
Value="[JAVA_HOME]\bin;[PYTHON_HOME];[SEVENZ_HOME];[ProgramFilesFolder]\cdrtools;[MYSQL]\bin" />
8386
</Component>
8487
<Component Id='setuptools' Guid='019a51dd-7fc4-4d6c-9277-13cc7b600789'>
8588
<File Id="ez_setup" Source="ez_setup.py" />
@@ -278,7 +281,7 @@
278281
</InstallExecuteSequence>
279282
<Feature Id='Complete' Title='ACS' Description='The complete package.'
280283
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
281-
<Feature Id='MainProgram' Title='Program' Description='The main executable.'
284+
<Feature Id='MainProgram' Title='Management Server' Description='The main executable.'
282285
Level='1'>
283286
<ComponentRef Id='webappsFolder' />
284287
<ComponentGroupRef Id='ClientPath' />
@@ -295,7 +298,7 @@
295298
<ComponentRef Id='ServiceInstaller' />
296299
</Feature>
297300
</Feature>
298-
<UIRef Id="WixUI_Mondo_Custom" />
299-
<UIRef Id="WixUI_ErrorProgressText" />
301+
<UIRef Id="WixUI_Mondo_Custom" />
302+
<UIRef Id="WixUI_ErrorProgressText" />
300303
</Product>
301304
</Wix>

‎scripts/installer/windows/dependencies.wxs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
<!-- Installing dependencies -->
1414
<Bundle UpgradeCode="7cc78eac-106d-400e-b266-1b2c778b16b9" Version="4.4.0">
1515
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense" >
16-
<bal:WixStandardBootstrapperApplication LicenseFile="acs_license.rtf" ShowVersion="yes"/>
16+
<bal:WixStandardBootstrapperApplication LicenseFile="acs_license.rtf" ShowVersion="yes" ThemeFile="optionstheme.xml"/>
1717
</BootstrapperApplicationRef>
1818
<Chain>
19-
<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" />
19+
<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"/>
20+
<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"/>
2021
<MsiPackage Id="SevenZip" Name="7z920-x64.msi" DownloadUrl="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi" Compressed="no" Visible="yes" ForcePerMachine="yes" After="MySql"/>
2122
<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"/>
2223
<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"/>

0 commit comments

Comments
 (0)