You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2012/09/06 20:07:19 UTC

[3/3] git commit: Take the jars from the webapp, this takes care of all dependencies

Take the jars from the webapp, this takes care of all dependencies


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9534c2aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9534c2aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9534c2aa

Branch: refs/heads/maven-waf
Commit: 9534c2aaf50b784f6a0a52d60ac53b406f2b499f
Parents: 623f199
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Thu Sep 6 20:01:42 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Thu Sep 6 20:01:42 2012 +0200

----------------------------------------------------------------------
 wscript_build |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9534c2aa/wscript_build
----------------------------------------------------------------------
diff --git a/wscript_build b/wscript_build
index 0dc07f4..bbffb18 100644
--- a/wscript_build
+++ b/wscript_build
@@ -133,13 +133,12 @@ def build_jars ():
 							 mvnargs = mvn_args)
 
 	jarnode = bld.srcnode.find_dir ('.')
-	jars_str = jarnode.ant_glob ('**/target/*.jar').split ()
+	jars_str = jarnode.ant_glob ('client/target/cloud-client-ui-4.0.0-SNAPSHOT/WEB-INF/lib/*.jar').split ()
 	ant_jars = []
 	excludes = [ "cloud-*tests.jar" ]
 
 	for a in jars_str:
-		if _basename (a).startswith ("cloud-") \
-			and not _basename (a) in excludes:
+		if not _basename (a) in excludes:
 			a = jarnode.abspath () + os.sep + a
 			ant_jars.append (a)