From 3def0e732e7c1c9553edb5bb1ae0f4238f6cba1f Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Wed, 11 Aug 2010 19:07:16 -0700 Subject: [PATCH] Fix build for real --- wscript | 3 +-- wscript_build | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/wscript b/wscript index a88b1a54b2d..5f9dad132e6 100644 --- a/wscript +++ b/wscript @@ -312,8 +312,7 @@ def _install_files_filtered(self,destdir,listoffiles,**kwargs): if isinstance(listoffiles,str) and '**' in listoffiles: listoffiles = cwd.ant_glob(listoffiles,flat=True) elif isinstance(listoffiles,str) and '*' in listoffiles: - gl=cwd.abspath() + os.sep + listoffiles - listoffiles=_glob(gl) + listoffiles = [ n for x in listoffiles.split() for n in _glob(cwd.abspath() + os.sep + x.replace("/",os.sep)) ] listoffiles = Utils.to_list(listoffiles)[:] listoffiles = [ x for x in listoffiles if not ( x.endswith("~") or x == "override" or "%soverride"%os.sep in x ) ] for n,f in enumerate(listoffiles): diff --git a/wscript_build b/wscript_build index 59e33345f80..1e1bc85af13 100644 --- a/wscript_build +++ b/wscript_build @@ -296,7 +296,7 @@ patterns = Utils.to_list( ) premiumpatterns = patterns + ["cloudstack-proprietary/console-proxy-premium/certs/**"] -artifacts = "target/jar/VMOpsConsoleApplet.jar " + " ".join( "target/jar/cloud-%s.jar"%j for j in "console-proxy console-common agent utils api core".split() ) +artifacts = "target/jar/VMOpsConsoleApplet.jar " + " ".join( "target/jar/cloud-%s.jar"%j for j in "console-proxy console-common agent utils core".split() ) premiumartifacts = artifacts + " target/jar/cloud-console-proxy-premium.jar" sources = " ".join( [ filelist(x,src=True,bld=False,dir=False,flat=True) for x in patterns ] )