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

Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor

Browse Source
This commit is contained in:
abhishek 2010-08-20 14:21:28 -07:00
commit 799984659a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wscript_configure
View File

@ -232,10 +232,13 @@ conf.env.USAGECLASSPATH = pathsep.join(usageclasspath)
# 1. source directories (without including the JARs) # 1. source directories (without including the JARs)
# JARs are not included because in case of parallel compilation (IOW, all the time), javac picks up half-written JARs and die # JARs are not included because in case of parallel compilation (IOW, all the time), javac picks up half-written JARs and die
compilecp = []# list(srcdirs) compilecp = []# list(srcdirs)
# 2.a) the thirdparty/ directory in the source if on Windows / Mac
# 2.b) the deps/ directory in the source if on Linux # 2.b) the deps/ directory in the source if on Linux
if conf.env.DISTRO in ["Windows","Mac"]: compilecp+= _glob(_join("cloudstack-proprietary","thirdparty","*.jar")) # 2.a) the thirdparty/ directory if available
else: compilecp+= _glob(_join("deps","*.jar")) if conf.env.DISTRO in ["Windows","Mac"]:
pass
else:
compilecp+= _glob(_join("deps","*.jar"))
compilecp+= _glob(_join("cloudstack-proprietary","thirdparty","*.jar"))
# 3. the system classpath (system-installed JARs) # 3. the system classpath (system-installed JARs)
compilecp+= [ conf.env.SYSTEMCLASSPATH ] compilecp+= [ conf.env.SYSTEMCLASSPATH ]
compilecp+= _glob(_join(conf.env.TOMCATHOME,'bin',"*.jar")) compilecp+= _glob(_join(conf.env.TOMCATHOME,'bin',"*.jar"))