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/20 11:28:31 UTC
git commit: updated refs/heads/master to 61c765b
Repository: cloudstack
Updated Branches:
refs/heads/master 6052a181d -> 61c765b23
CLOUDSTACK-6563: Integrating setuptools for python into MSI
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/61c765b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61c765b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61c765b2
Branch: refs/heads/master
Commit: 61c765b23027784483c5130c24373b0d1773e107
Parents: 6052a18
Author: Damodar Reddy <da...@citrix.com>
Authored: Mon May 19 12:26:43 2014 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Tue May 20 14:57:44 2014 +0530
----------------------------------------------------------------------
client/pom.xml | 1 +
scripts/installer/windows/acs.wxs | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61c765b2/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index a77c70b..b3d857d 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -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://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=&ts=1398764640&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>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61c765b2/scripts/installer/windows/acs.wxs
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs
index 1c100e8..411d026 100644
--- a/scripts/installer/windows/acs.wxs
+++ b/scripts/installer/windows/acs.wxs
@@ -81,6 +81,9 @@
Permanent="yes" System="yes" Part="last"
Value="[JAVA_HOME]\bin;[PYTHON_HOME];[SEVENZ_HOME];[ProgramFilesFolder]\cdrtools" />
</Component>
+ <Component Id='setuptools' Guid='019a51dd-7fc4-4d6c-9277-13cc7b600789'>
+ <File Id="ez_setup" Source="ez_setup.py" />
+ </Component>
</Directory>
</Directory>
</Directory>
@@ -242,6 +245,9 @@
<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"'
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'
ExeCommand='[PYTHON_HOME]\python "[CSMANAGEMENT]\webapps\client\WEB-INF\classes\scripts\common\keys\ssl-keys.py" "[CSMANAGEMENT]\lib"'
Execute="commit" Return="check" />
@@ -259,7 +265,8 @@
</Custom>
<Custom Action="UpdateTomcatCatalinaBase" Before="DeleteFiles">NOT
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>
<Custom Action="CopySitePackages" Before="InstallFinalize">NOT Installed</Custom>
@@ -284,6 +291,7 @@
<ComponentRef Id='copyToConf' />
<ComponentRef Id='firewallRules' />
<ComponentRef Id='MainExecutable' />
+ <ComponentRef Id='setuptools' />
<ComponentRef Id='ServiceInstaller' />
</Feature>
</Feature>