remove scattered wscript_build from premium

This commit is contained in:
Frank Zhang 2010-12-05 15:53:33 -08:00
parent 44ad8d1d67
commit fee375b44d

View File

@ -45,6 +45,7 @@ tgen = bld(features='subst', name='configure-info', source="configure-info.in",
tgen.dict = {"CONFIGUREVARS":bld.getconfig()} tgen.dict = {"CONFIGUREVARS":bld.getconfig()}
bld.install_files("${DOCDIR}","configure-info") bld.install_files("${DOCDIR}","configure-info")
# ==================== Java compilation =========================== # ==================== Java compilation ===========================
# discover ant targets and properties # discover ant targets and properties
@ -84,7 +85,6 @@ tgen = bld(rule=Utils.runant, name='runant', source=ant_sources, target=ant_jars
# ======================= End Java compilation ====================== # ======================= End Java compilation ======================
# =================== C / Python compilation ========================= # =================== C / Python compilation =========================
obj = bld(features = 'py',name='pythonmodules') obj = bld(features = 'py',name='pythonmodules')
@ -100,6 +100,8 @@ if bld.env.DISTRO not in ['Windows','Mac']:
# ===================== End C / Python compilation ========================== # ===================== End C / Python compilation ==========================
if buildpremium: bld.recurse(["cloudstack-proprietary/"],'build')
# ================ Third-party / dependency installation =============== # ================ Third-party / dependency installation ===============
excludes = ["cloud-xstream-1.3.1.jar", "cloud-commons-dbcp-1.2.2.jar", excludes = ["cloud-xstream-1.3.1.jar", "cloud-commons-dbcp-1.2.2.jar",
@ -110,7 +112,6 @@ excludes = ["cloud-xstream-1.3.1.jar", "cloud-commons-dbcp-1.2.2.jar",
start_path = bld.path.find_dir ("deps") start_path = bld.path.find_dir ("deps")
bld.install_files('${JAVADIR}',start_path.ant_glob("*.jar", excl = excludes), cwd=start_path) 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 ======================== # =================== End 3rdparty/dep install ========================
@ -383,7 +384,6 @@ else:
start_path = bld.path.find_dir ("scripts") start_path = bld.path.find_dir ("scripts")
bld.substitute('**',"${AGENTLIBDIR}/scripts",chmod=0755, cwd=start_path) bld.substitute('**',"${AGENTLIBDIR}/scripts",chmod=0755, cwd=start_path)
if buildpremium: bld.recurse(["cloudstack-proprietary/scripts"],'build')
# ================== End agent scripts =================== # ================== End agent scripts ===================
@ -399,8 +399,6 @@ bld.install_files_filtered("${SBINDIR}","*/sbindir/* cloudstack-proprietary/*/sb
# ================== Installation of scripts / bindirs / configuration files =========================== # ================== Installation of scripts / bindirs / configuration files ===========================
# 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 # ================= build / install declarations of server project <- this is actually now in client project
start_path = bld.path.find_dir("client/WEB-INF") start_path = bld.path.find_dir("client/WEB-INF")
@ -419,8 +417,6 @@ if not Options.options.PRESERVECONFIG:
start_path = bld.path.find_dir("server") start_path = bld.path.find_dir("server")
if not Options.options.PRESERVECONFIG: if not Options.options.PRESERVECONFIG:
bld.install_files_filtered("${SERVERSYSCONFDIR}","conf/*", cwd=start_path) 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 # ================= end build / install declarations of server project <- this is actually now in client project
# ================ build / install declarations of agent project ================= # ================ build / install declarations of agent project =================
@ -456,9 +452,6 @@ for dsdir in distrospecificdirs:
if Options.options.PRESERVECONFIG: continue if Options.options.PRESERVECONFIG: continue
bld.install_files_filtered(dsdirwithvar, files, cwd=start_path, relative_trick=True,chmod=mode) bld.install_files_filtered(dsdirwithvar, files, cwd=start_path, relative_trick=True,chmod=mode)
# build / install declarations of usage
if buildpremium: bld.recurse(["cloudstack-proprietary/usage"],'build')
# install db data files # install db data files
bld.install_files_filtered("${SETUPDATADIR}",filelist("*/db/* cloudstack-proprietary/*/db/*",excl=Node.exclude_regs + "\ncloud-gate\ncloud-bridge")) bld.install_files_filtered("${SETUPDATADIR}",filelist("*/db/* cloudstack-proprietary/*/db/*",excl=Node.exclude_regs + "\ncloud-gate\ncloud-bridge"))