incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: final try
Date Fri, 07 Sep 2012 11:20:03 GMT
Updated Branches:
  refs/heads/4.0 9167f6992 -> 23574cca1


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/23574cca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/23574cca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/23574cca

Branch: refs/heads/4.0
Commit: 23574cca1d5a5e8b3ac664b36efc60bdcd342a8e
Parents: 9167f69
Author: Edison Su <sudison@gmail.com>
Authored: Fri Sep 7 04:19:33 2012 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Fri Sep 7 04:19:33 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/23574cca/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/23574cca/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 ()


Mime
View raw message