From 006e12606e21426f6b6b551eae22941d0d304d50 Mon Sep 17 00:00:00 2001
From: Frank Zhang <frank@cloud.com>
Date: Sat, 4 Dec 2010 21:50:26 -0800
Subject: [PATCH] remove wscript_build from deps

---
 deps/wscript_build | 1 -
 wscript_build      | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 deps/wscript_build

diff --git a/deps/wscript_build b/deps/wscript_build
deleted file mode 100644
index 0167a5697cb..00000000000
--- a/deps/wscript_build
+++ /dev/null
@@ -1 +0,0 @@
-bld.install_files('${JAVADIR}',bld.path.ant_glob("*.jar", excl=["cloud-xstream-1.3.1.jar", "cloud-commons-dbcp-1.2.2.jar", "cloud-commons-httpclient-3.1.jar", "cloud-commons-pool-1.4.jar", "cloud-servlet-api.jar", "cloud-commons-logging-1.1.1.jar", "cloud-ws-commons-util-1.0.2.jar", "cloud-commons-collections-3.2.1.jar", "vmware*.jar"]))
diff --git a/wscript_build b/wscript_build
index 113440510f7..57a9cb29149 100644
--- a/wscript_build
+++ b/wscript_build
@@ -94,7 +94,14 @@ bld.recurse(["daemonize","python"],'build')
 
 # ================ Third-party / dependency installation ===============
 
-bld.recurse(["deps"],'build')
+excludes = ["cloud-xstream-1.3.1.jar", "cloud-commons-dbcp-1.2.2.jar", 
+			"cloud-commons-httpclient-3.1.jar", "cloud-commons-pool-1.4.jar",
+			"cloud-servlet-api.jar", "cloud-commons-logging-1.1.1.jar",
+			"cloud-ws-commons-util-1.0.2.jar",
+			"cloud-commons-collections-3.2.1.jar", "vmware*.jar"]
+
+start_path = bld.path.find_dir ("deps")
+bld.install_files('${JAVADIR}',start_path.ant_glob("*.jar", excl = excludes), cwd=start_path)
 if buildpremium: bld.recurse(['cloudstack-proprietary/thirdparty'],'build')
 
 # =================== End 3rdparty/dep install ========================