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

build fix

Browse Source
This commit is contained in:
anthony 2011-01-28 19:19:32 -08:00
parent f7e1b52d51
commit 19e7387702
5 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/build-cloud.xml
View File

@ -61,8 +61,6 @@
<property name="dep.cache.dir" location="${target.dir}/dep-cache" /> <property name="dep.cache.dir" location="${target.dir}/dep-cache" />
<property name="build.log" location="${target.dir}/ant_verbose.txt" /> <property name="build.log" location="${target.dir}/ant_verbose.txt" />
<property name="proprietary.dir" location="${base.dir}/cloudstack-proprietary" />
<property name="thirdparty.dir" location="${base.dir}/thirdparty" /> <property name="thirdparty.dir" location="${base.dir}/thirdparty" />
<property name="deps.dir" location="${base.dir}/deps" /> <property name="deps.dir" location="${base.dir}/deps" />
@ -115,9 +113,6 @@
<property name="test.target.dir" location="${target.dir}/test" /> <property name="test.target.dir" location="${target.dir}/test" />
<property name="test.classes.dir" location="${test.target.dir}/classes" /> <property name="test.classes.dir" location="${test.target.dir}/classes" />
<property name="premium.dir" location="${proprietary.dir}/premium" />
<property name="core-premium.dir" location="${proprietary.dir}/core-premium" />
<!-- directories for branding --> <!-- directories for branding -->
<property name="branding.dir" location="${build.dir}/deploy/branding/${branding.name}" /> <property name="branding.dir" location="${build.dir}/deploy/branding/${branding.name}" />

1
build/package.xml
View File

@ -191,7 +191,6 @@
<zipfileset dir="${console-proxy.dist.dir}" filemode="555"> <zipfileset dir="${console-proxy.dist.dir}" filemode="555">
<include name="**/*.sh" /> <include name="**/*.sh" />
<include name="**/certs/" /> <include name="**/certs/" />
<include name="**/cloud-console-proxy-premium.jar" />
</zipfileset> </zipfileset>
<zipfileset dir="${scripts.dir}/storage/secondary" prefix="scripts/storage/secondary" filemode="555"> <zipfileset dir="${scripts.dir}/storage/secondary" prefix="scripts/storage/secondary" filemode="555">
<exclude name="**/.project" /> <exclude name="**/.project" />

2
console-proxy/scripts/run.bat
View File

@ -1 +1 @@
java -mx700m -cp cloud-console-proxy.jar;cloud-console-proxy-premium.jar;cloud-console-common.jar;log4j-1.2.15.jar;apache-log4j-extras-1.0.jar;gson-1.3.jar;commons-logging-1.1.1.jar;.;.\conf; com.cloud.consoleproxy.ConsoleProxy %* java -mx700m -cp cloud-console-proxy.jar;;cloud-console-common.jar;log4j-1.2.15.jar;apache-log4j-extras-1.0.jar;gson-1.3.jar;commons-logging-1.1.1.jar;.;.\conf; com.cloud.consoleproxy.ConsoleProxy %*

4
scripts/vm/hypervisor/xen/rundomrpre.sh
View File

@ -223,11 +223,9 @@ then
fi fi
fi fi
cpfile=$(dirname $0)/../../../../console-proxy-premium.zip cpfile=$(dirname $0)/../../../../console-proxy.zip
[ -f $cpfile ] || $(dirname $0)/../../../../console-proxy.zip [ -f $cpfile ] || $(dirname $0)/../../../../console-proxy.zip
[ -f $cpfile ] || $(dirname $0)/../../console-proxy-premium.zip
[ -f $cpfile ] || $(dirname $0)/../../console-proxy.zip [ -f $cpfile ] || $(dirname $0)/../../console-proxy.zip
[ -f $cpfile ] || $(dirname $0)/console-proxy-premium.zip
[ -f $cpfile ] || $(dirname $0)/console-proxy.zip [ -f $cpfile ] || $(dirname $0)/console-proxy.zip
if [[ "$template" == "domP" && -f $cpfile ]] if [[ "$template" == "domP" && -f $cpfile ]]
then then

2
wscript_configure
View File

@ -245,7 +245,7 @@ msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api
conf.env.MSCLASSPATH = pathsep.join(msclasspath) conf.env.MSCLASSPATH = pathsep.join(msclasspath)
# the agent and simulator classpaths point to JARs required to run these two applications # the agent and simulator classpaths point to JARs required to run these two applications
agentclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras agent console-common console-proxy core-extras console-proxy-premium".split() ] agentclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras agent console-common console-proxy core-extras".split() ]
conf.env.AGENTCLASSPATH = pathsep.join(agentclasspath) conf.env.AGENTCLASSPATH = pathsep.join(agentclasspath)
conf.env.AGENTSIMULATORCLASSPATH = pathsep.join(agentclasspath+[in_javadir("%s-agent-simulator.jar"%conf.env.PACKAGE)]) conf.env.AGENTSIMULATORCLASSPATH = pathsep.join(agentclasspath+[in_javadir("%s-agent-simulator.jar"%conf.env.PACKAGE)])