apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "CLOUDSTACK-6834 : 3. Some description changes words like CloudStack etc 4. Change Default installation location if possible include version number 5. Mysql Connector Installer along with other dependecies 6. Add run Service Checkbox 7. Add ReadMe checkbox"

Browse Source 
This reverts commit ce5061e107f743e52b23445fd97fcf60d8160ec6.
This commit is contained in:
Koushik Das 2014-07-04 10:04:04 +05:30
parent 8c61566d61
commit 4607c26949
9 changed files with 13 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/pom.xml
View File

@ -681,7 +681,6 @@
<include name="acs_license.rtf"/>
<include name="optionstheme.xml"/>
<include name="*.wxl"/>
<include name="*.txt"/>
</fileset>
</copy>
<copy todir="./target/client">
@ -720,7 +719,6 @@
<get src="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi" dest="target" verbose="false" usetimestamp="true"/>
<get src="https://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi" dest="target" verbose="false" usetimestamp="true"/>
<get src="http://dev.mysql.com/get/Downloads/MySQL-5.1/mysql-5.1.73-winx64.msi" dest="target" verbose="false" usetimestamp="true"/>
<get src="http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-gpl-5.1.30.msi" dest="target" verbose="false" usetimestamp="true"/>
<get src="http://mirror.sdunix.com/apache/tomcat/tomcat-6/v6.0.39/bin/apache-tomcat-6.0.39.exe" dest="target" verbose="false" usetimestamp="true"/>
<get src="http://downloads.sourceforge.net/project/cdrtoolswin/1.0/Binaries/CDR-Tools.exe?r=&amp;ts=1398764640&amp;use_mirror=kaz" dest="target" verbose="false" usetimestamp="true"/>
<get src="https://bootstrap.pypa.io/ez_setup.py" dest="target" verbose="false" usetimestamp="true"/>
@ -748,26 +746,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9</version>
<executions>
<execution>
<id>regex-property</id>
<goals>
<goal>regex-property</goal>
</goals>
<configuration>
<name>final.version</name>
<value>${project.version}</value>
<regex>-SNAPSHOT</regex>
<replacement></replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.cloudstack</groupId>
<artifactId>Wix-cloudstack-maven-plugin</artifactId>
@ -849,11 +827,10 @@
<extension>WixUIExtension</extension>
<extension>WixUtilExtension</extension>
</extensions>
<arguments>-dVersion=${final.version} -dSourceClient=SourceDir\client -dSetupPathDir=SourceDir\setup -dUtilitiesPathDir=SourceDir\scripts -dPythonSitePackagesDir=SourceDir\python-site-packages</arguments>
<arguments>-dSourceClient=SourceDir\client -dSetupPathDir=SourceDir\setup -dUtilitiesPathDir=SourceDir\scripts -dPythonSitePackagesDir=SourceDir\python-site-packages</arguments>
<sourceFiles>
<sourceFile>../scripts/installer/windows/acs.wxs</sourceFile>
<sourceFile>../scripts/installer/windows/WixInstallerDialog.wxs</sourceFile>
<sourceFile>../scripts/installer/windows/ExitDialog.wxs</sourceFile>
<sourceFile>../scripts/installer/windows/Setup_Databases.wxs</sourceFile>
<sourceFile>target/client.wxs</sourceFile>
<sourceFile>target/setupdb.wxs</sourceFile>
@ -867,7 +844,6 @@
<objectFile>target/setupdb.wixobj</objectFile>
<objectFile>target/utilities.wixobj</objectFile>
<objectFile>target/WixInstallerDialog.wixobj</objectFile>
<sourceFile>target/ExitDialog.wixobj</sourceFile>
<objectFile>target/Setup_Databases.wixobj</objectFile>
<objectFile>target/python-site-packages.wixobj</objectFile>
</objectFiles>

1
pom.xml
View File

@ -819,7 +819,6 @@
<exclude>tools/ngui/static/js/lib/*</exclude>
<exclude>**/.checkstyle</exclude>
<exclude>scripts/installer/windows/acs_license.rtf</exclude>
<exclude>scripts/installer/windows/readme.txt</exclude>
</excludes>
</configuration>
</plugin>

48
scripts/installer/windows/ExitDialog.wxs
View File

@ -1,48 +0,0 @@
<?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. -->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<UI>
<Dialog Id="ExitDialog_custom" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
<Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
<Control Id="OptionalReadMeText" Type="Text" X="135" Y="160" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALREADMETEXT]">
<Condition Action="show">WIXUI_EXITDIALOGOPTIONALREADMETEXT AND NOT Installed</Condition>
</Control>
<Control Id="OptionalReadMeCheckBox" Type="CheckBox" X="135" Y="170" Width="220" Height="10" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALRAEDMECHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALREADMECHECKBOXTEXT]">
<Condition Action="show">WIXUI_EXITDIALOGOPTIONALREADMECHECKBOXTEXT AND NOT Installed</Condition>
</Control>
<Control Id="OptionalText" Type="Text" X="135" Y="110" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
<Condition Action="show">WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed</Condition>
</Control>
<Control Id="OptionalRunServiceCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="10" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
<Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
</Control>
</Dialog>
<InstallUISequence>
<Show Dialog="ExitDialog_custom" OnExit="success" Overridable="yes" />
</InstallUISequence>
<AdminUISequence>
<Show Dialog="ExitDialog_custom" OnExit="success" Overridable="yes" />
</AdminUISequence>
</UI>
</Fragment>
</Wix>

2
scripts/installer/windows/WixInstallerDialog.wxs
View File

@ -28,7 +28,7 @@
<DialogRef Id="UserExit" />
<DialogRef Id="DatabaseInformation" />
<Publish Dialog="ExitDialog_custom" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>

39
scripts/installer/windows/acs.wxs
View File

@ -11,7 +11,7 @@
<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='!(loc.ProductName)' Id='eea70ed5-5950-4f01-b4aa-4a07636359bb'
UpgradeCode='d6208c34-7b50-4512-b19e-b904dcc1373e' Language='1033'
Codepage='1252' Version='!(wix.Version)' Manufacturer='!(loc.ProductManufacturer)'>
Codepage='1252' Version='4.4.0' Manufacturer='!(loc.ProductManufacturer)'>
<Package Id='*' Keywords='Installer' Description="!(loc.PackageDescription)"
Comments='!(loc.PackageComments)'
@ -67,8 +67,8 @@
<Directory Id='TARGETDIR' Name='SourceDir'>
<Directory Id='ProgramFilesFolder' Name='PFiles'>
<Directory Id='Acme' Name='Apache Software Foundation'>
<Directory Id='INSTALLDIR' Name='CloudStack!(wix.Version)'>
<Directory Id='Acme' Name='Apache'>
<Directory Id='INSTALLDIR' Name='CS'>
<Component Id='MainExecutable'
Guid='5980d204-a63a-45db-a7e8-cbd50b2d314b'>
<CreateFolder />
@ -139,9 +139,6 @@
</Component>
</Directory>
</Directory>
<Component Id="ReadmeFile" Guid="53c03092-438f-4da1-b15d-ceee90c79df0">
<File Id="CopyReadmeFile" KeyPath="yes" Source="readme.txt" />
</Component>
</DirectoryRef>
<DirectoryRef Id="WEBAPPS">
<Component Id="copyToConf" Guid="99da8926-1eec-4a7f-ac7f-1326d8e73ea0"
@ -249,9 +246,6 @@
<CustomAction Id="CopySitePackages" Directory='INSTALLDIR'
ExeCommand='[SystemFolder]cmd.exe /c xcopy /S "[INSTALLDIR]\python-site-packages" [PYTHON_HOME]\Lib\site-packages'
Execute="deferred" Return="check"/>
<CustomAction Id="CopyMysqlConnctorJar" Directory='INSTALLDIR'
ExeCommand='[SystemFolder]cmd.exe /c copy "[ProgramFilesFolder]\MySQL\MySQL Connector J\mysql-connector-java-5.1.30-bin.jar" "[CSMANAGEMENT]\lib\"'
Execute="deferred" Return="check"/>
<CustomAction Id="DeleteDirectory" Directory='INSTALLDIR'
ExeCommand='[SystemFolder]cmd.exe /c RD /S /Q "[INSTALLDIR]\python-site-packages"'
Execute="deferred" Return="check" />
@ -284,8 +278,7 @@
<Custom Action="GenerateSSLKey" After="PublishProduct">NOT Installed
</Custom>
<Custom Action="CopySitePackages" After="GenerateSSLKey">NOT Installed</Custom>
<Custom Action="CopyMysqlConnctorJar" After="CopySitePackages">NOT Installed</Custom>
<Custom Action="DeleteDirectory" After="CopyMysqlConnctorJar">NOT Installed</Custom>
<Custom Action="DeleteDirectory" After="CopySitePackages">NOT Installed</Custom>
<Custom Action="DbHostWithPort" After="InstallFiles"><![CDATA[DB_PORT]]></Custom>
<Custom Action="DeployDB" After="DeleteDirectory">(NOT Installed) AND (CREATE_DATABASE = "1")
</Custom>
@ -309,31 +302,9 @@
<ComponentRef Id='MainExecutable' />
<ComponentRef Id='setuptools' />
<ComponentRef Id='ServiceInstaller' />
<ComponentRef Id='ReadmeFile' />
</Feature>
</Feature>
<!-- This is to enable check box to start the service -->
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="!(loc.LaunchService)" />
<!-- This is to start the service -->
<CustomAction Id="LaunchApplication" Directory='INSTALLDIR' ExeCommand="[SystemFolder]cmd.exe /c sc start ACSService" Impersonate="yes" Execute="immediate" Return="asyncNoWait"/>
<!-- This is to enable check box to view read me file -->
<Property Id="WIXUI_EXITDIALOGOPTIONALREADMECHECKBOXTEXT" Value="!(loc.ReadMe)" />
<Property Id="WixShellExecTarget" Value="[#CopyReadmeFile]" />
<!-- This is to open readme.txt file -->
<CustomAction Id="LaunchFile" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
<UI>
<UIRef Id="WixUI_Mondo_Custom" />
<Publish Dialog="ExitDialog_custom"
Control="Finish"
Event="DoAction"
Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
<Publish Dialog="ExitDialog_custom"
Control="Finish"
Event="DoAction"
Value="LaunchFile">WIXUI_EXITDIALOGOPTIONALRAEDMECHECKBOX = 1 and NOT Installed</Publish>
</UI>
<UIRef Id="WixUI_Mondo_Custom" />
<UIRef Id="WixUI_ErrorProgressText" />
</Product>
</Wix>

1
scripts/installer/windows/dependencies.wxs
View File

@ -17,7 +17,6 @@
</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"/>
<MsiPackage Id="MySqlConnector" Name="mysql-connector-java-gpl-5.1.30.msi" DownloadUrl="http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-gpl-5.1.30.msi" Compressed="no" Visible="yes" ForcePerMachine="yes" EnableFeatureSelection="no" DisplayInternalUI="no"/>
<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"/>

10
scripts/installer/windows/en-us.wxl
View File

@ -9,9 +9,9 @@
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 CloudStack</String>
<String Id="ProductName">Apache Cloud Stack</String>
<String Id="ProductManufacturer">Apache</String>
<String Id="PackageDescription">Apache CloudStack Installer</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>
@ -19,7 +19,7 @@
<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 CloudStack.</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>
@ -28,7 +28,7 @@
<String Id="DbPasswordLabel">Password</String>
<String Id="DbRootPasswordLabel">Root Password</String>
<String Id="DbServerPortLabel">Port</String>
<String Id="CreateDBCheckBoxLabel">Create CloudStack Database</String>
<String Id="CreateDBCheckBoxLabel">Create Cloud Stack Database</String>
<String Id="GenerateSSLKey">Generating SSL Keys which is needed to talk to Management Server.</String>
<String Id="DeployDB">Creating Database and needed Schemas for management server.</String>
<String Id="SetupDatabases">Updating db.properties with the given database configuration.</String>
@ -38,8 +38,6 @@
<String Id="DeleteFiles">Deleting un-necessary files from installation directory.</String>
<String Id="UpdateTomcatCatalinaBase">Updating Tomcat Catalina Base with Management Server Home.</String>
<String Id="UpdateTomcatClassPath">Updating Tomcat Classpath with necessary paths.</String>
<String Id="LaunchService">Launch CloudStack Server</String>
<String Id="ReadMe">Open Readme</String>
<String Id="InstallVersion">Version 4.0.0.0</String>
</WixLocalization>

4
scripts/installer/windows/optionstheme_en-us.wxl
View File

@ -10,8 +10,8 @@
governing permissions and limitations under the License. -->
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="Caption">Apache CloudStack Setup</String>
<String Id="Title">Apache CloudStack</String>
<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>

1
scripts/installer/windows/readme.txt
View File

@ -1 +0,0 @@
Need to Add the Readme Content in this file....