From 8fe7d4094d320a49cfc0b7c1c7226f4cb3d1f0db Mon Sep 17 00:00:00 2001
From: Frank Zhang <frank@cloud.com>
Date: Sat, 4 Dec 2010 21:39:55 -0800
Subject: [PATCH] remove wscript_build from client/ and server/

---
 client/wscript_build | 13 -------------
 server/wscript_build |  4 ----
 wscript_build        | 21 +++++++++++++++++++--
 3 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 client/wscript_build
 delete mode 100644 server/wscript_build

diff --git a/client/wscript_build b/client/wscript_build
deleted file mode 100644
index 2cc94177383..00000000000
--- a/client/wscript_build
+++ /dev/null
@@ -1,13 +0,0 @@
-import Options
-
-start_path = bld.path.find_dir("WEB-INF")
-bld.install_files('${MSENVIRON}/webapps/client/WEB-INF',
-	start_path.ant_glob("**",src=True,bld=False,dir=False,flat=True),
-	cwd=start_path,relative_trick=True)
-
-bld.install_files("${MSCONF}/resources",'WEB-INF/classes/resources/*.properties',chmod=0640)
-
-if not Options.options.PRESERVECONFIG:
-	bld.install_files_filtered("${MSCONF}","tomcatconf/*")
-	bld.install_files("${MSCONF}",'tomcatconf/db.properties',chmod=0640)
-	bld.setownership("${MSCONF}/db.properties","root",bld.env.MSUSER)
diff --git a/server/wscript_build b/server/wscript_build
deleted file mode 100644
index f6660680f77..00000000000
--- a/server/wscript_build
+++ /dev/null
@@ -1,4 +0,0 @@
-import Options
-
-if not Options.options.PRESERVECONFIG:
-	bld.install_files_filtered("${SERVERSYSCONFDIR}","conf/*")
diff --git a/wscript_build b/wscript_build
index 7f34bdb53b6..113440510f7 100644
--- a/wscript_build
+++ b/wscript_build
@@ -370,9 +370,26 @@ bld.install_files_filtered("${SBINDIR}","*/sbindir/* cloudstack-proprietary/*/sb
 # build / install declarations of test project
 if buildpremium: bld.recurse(["cloudstack-proprietary/test"],'build')
 
-# build / install declarations of server project <- this is actually now in client project
-bld.recurse(["client","server"],'build')
+# ================= build / install declarations of server project <- this is actually now in client project
+start_path = bld.path.find_dir("client/WEB-INF")
+bld.install_files('${MSENVIRON}/webapps/client/WEB-INF',
+	start_path.ant_glob("**",src=True,bld=False,dir=False,flat=True),
+	cwd=start_path,relative_trick=True)
+
+start_path = bld.path.find_dir("client")
+bld.install_files("${MSCONF}/resources",'WEB-INF/classes/resources/*.properties',chmod=0640, cwd=start_path)
+
+if not Options.options.PRESERVECONFIG:
+	bld.install_files_filtered("${MSCONF}","tomcatconf/*", cwd=start_path)
+	bld.install_files("${MSCONF}",'tomcatconf/db.properties',chmod=0640, cwd=start_path)
+	bld.setownership("${MSCONF}/db.properties","root",bld.env.MSUSER)
+
+start_path = bld.path.find_dir("server")
+if not Options.options.PRESERVECONFIG:
+	bld.install_files_filtered("${SERVERSYSCONFDIR}","conf/*", cwd=start_path)
+
 if buildpremium: bld.recurse(["cloudstack-proprietary/premium"],'build')
+# ================= end build / install declarations of server project <- this is actually now in client project
 
 # build / install declarations of agent project
 bld.recurse(["agent"],'build')