You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/07 14:13:45 UTC
[2/6] git commit: final try
final try
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/02b46c58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/02b46c58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/02b46c58
Branch: refs/heads/master
Commit: 02b46c5892116f842050fb99a33ce010d5506559
Parents: 022de34
Author: Edison Su <su...@gmail.com>
Authored: Fri Sep 7 04:19:33 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Fri Sep 7 05:13:08 2012 -0700
----------------------------------------------------------------------
wscript | 5 +----
wscript_build | 4 +++-
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/02b46c58/wscript
----------------------------------------------------------------------
diff --git a/wscript b/wscript
index 17a11d3..f46217d 100644
--- a/wscript
+++ b/wscript
@@ -292,7 +292,6 @@ Utils.discover_ant_targets_and_properties = discover_ant_targets_and_properties
def runant(tsk):
environ = dict(os.environ)
- depsclasspath = [ os.path.abspath(x) for x in _glob(_join(".","deps","*.jar")) ]
environ["CATALINA_HOME"] = tsk.env.TOMCATHOME
environ["ANT_HOME"] = _join("tools","ant","apache-ant-1.7.1")
if tsk.generator.env.DISTRO == "Windows":
@@ -303,7 +302,7 @@ def runant(tsk):
else:
stanzas = [
_join(environ["ANT_HOME"],"bin","ant"),
- "-Dthirdparty.classpath=%s:%s"%(tsk.env.CLASSPATH.replace(os.pathsep,","), pathsep.join(depsclasspath)),
+ "-Dthirdparty.classpath=%s"%(tsk.env.CLASSPATH.replace(os.pathsep,",")),
]
stanzas += tsk.generator.antargs
ret = Utils.exec_command(" ".join(stanzas),cwd=tsk.generator.bld.srcnode.abspath(),env=environ,log=True)
@@ -640,7 +639,6 @@ def rpm(context):
shutil.move(tarball,_join(sourcedir,tarball))
specfile = "%s.spec"%APPNAME
- Utils.exec_command("mvn install -P deps")
checkdeps = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"--nobuild",specfile]+packagever+releasever)
dorpm = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"-bb",specfile]+buildnumber+prerelease+packagever+releasever)
try: checkdeps()
@@ -697,7 +695,6 @@ def deb(context):
tarball = Scripting.dist('', VERSION)
srcdir = "%s/%s-%s"%(outputdir,APPNAME,VERSION)
- Utils.exec_command("mvn install -P deps")
if _exists(srcdir): shutil.rmtree(srcdir)
mkdir_p(outputdir)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/02b46c58/wscript_build
----------------------------------------------------------------------
diff --git a/wscript_build b/wscript_build
index 3598880..354dc88 100644
--- a/wscript_build
+++ b/wscript_build
@@ -430,7 +430,9 @@ def build_usage_dir ():
Utils.pprint ("GREEN", "Installed files of usage/")
-
+def install_mvn():
+ Utils.exec_command("mvn install -P deps")
+install_mvn()
# Get started to execute here
build_utils_docs ()
build_jars ()