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

CLOUDSTACK-6563: Integrating setuptools for python into MSI

Browse Source 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
This commit is contained in:
Damodar Reddy 2014-05-19 12:26:43 +05:30 committed by Abhinandan Prateek
parent 6052a181dd
commit 61c765b230
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/pom.xml
View File

@ -728,6 +728,7 @@
<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/MySQL-5.1/mysql-5.1.73-winx64.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://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="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"/>
</target> </target>
</configuration> </configuration>
</execution> </execution>

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

@ -81,6 +81,9 @@
Permanent="yes" System="yes" Part="last" 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" />
</Component> </Component>
<Component Id='setuptools' Guid='019a51dd-7fc4-4d6c-9277-13cc7b600789'>
<File Id="ez_setup" Source="ez_setup.py" />
</Component>
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
@ -242,6 +245,9 @@
<CustomAction Id="DeleteFiles" Directory='CSMANAGEMENT' <CustomAction Id="DeleteFiles" Directory='CSMANAGEMENT'
ExeCommand='[SystemFolder]cmd.exe /c del "[CSMANAGEMENT]\webapps\client\WEB-INF\classes\db.properties" "[CSMANAGEMENT]\webapps\client\WEB-INF\classes\log4j*.xml"' ExeCommand='[SystemFolder]cmd.exe /c del "[CSMANAGEMENT]\webapps\client\WEB-INF\classes\db.properties" "[CSMANAGEMENT]\webapps\client\WEB-INF\classes\log4j*.xml"'
Execute="commit" Return="check" /> Execute="commit" Return="check" />
<CustomAction Id="SetuptoolsInstallation" Directory='INSTALLDIR'
ExeCommand='[PYTHON_HOME]\python "[INSTALLDIR]\ez_setup.py"'
Execute="commit" Return="check" />
<CustomAction Id="GenerateSSLKey" Directory='CSMANAGEMENT' <CustomAction Id="GenerateSSLKey" Directory='CSMANAGEMENT'
ExeCommand='[PYTHON_HOME]\python "[CSMANAGEMENT]\webapps\client\WEB-INF\classes\scripts\common\keys\ssl-keys.py" "[CSMANAGEMENT]\lib"' ExeCommand='[PYTHON_HOME]\python "[CSMANAGEMENT]\webapps\client\WEB-INF\classes\scripts\common\keys\ssl-keys.py" "[CSMANAGEMENT]\lib"'
Execute="commit" Return="check" /> Execute="commit" Return="check" />
@ -259,7 +265,8 @@
</Custom> </Custom>
<Custom Action="UpdateTomcatCatalinaBase" Before="DeleteFiles">NOT <Custom Action="UpdateTomcatCatalinaBase" Before="DeleteFiles">NOT
Installed</Custom> Installed</Custom>
<Custom Action="DeleteFiles" Before="GenerateSSLKey">NOT Installed</Custom> <Custom Action="DeleteFiles" Before="SetuptoolsInstallation">NOT Installed</Custom>
<Custom Action="SetuptoolsInstallation" Before="GenerateSSLKey">NOT Installed</Custom>
<Custom Action="GenerateSSLKey" Before="InstallFinalize">NOT Installed <Custom Action="GenerateSSLKey" Before="InstallFinalize">NOT Installed
</Custom> </Custom>
<Custom Action="CopySitePackages" Before="InstallFinalize">NOT Installed</Custom> <Custom Action="CopySitePackages" Before="InstallFinalize">NOT Installed</Custom>
@ -284,6 +291,7 @@
<ComponentRef Id='copyToConf' /> <ComponentRef Id='copyToConf' />
<ComponentRef Id='firewallRules' /> <ComponentRef Id='firewallRules' />
<ComponentRef Id='MainExecutable' /> <ComponentRef Id='MainExecutable' />
<ComponentRef Id='setuptools' />
<ComponentRef Id='ServiceInstaller' /> <ComponentRef Id='ServiceInstaller' />
</Feature> </Feature>
</Feature> </Feature>