From 15dd7bb94b09cc7abbffda2d92a3d93d82764171 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Tue, 5 Jan 2010 11:45:23 +0000 Subject: Fix UNZIP command usage, allow file based dependency URLs to be directories, add debug logging of the release script following variable substitution, and debug logging of its output after execution. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@896004 13f79535-47bb-0310-9956-ffa450edef68 --- buildtools/buildCreator/buildCreator.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'buildtools') diff --git a/buildtools/buildCreator/buildCreator.py b/buildtools/buildCreator/buildCreator.py index 4df7553dea..0a26ce09b0 100755 --- a/buildtools/buildCreator/buildCreator.py +++ b/buildtools/buildCreator/buildCreator.py @@ -538,7 +538,7 @@ def postProcess(item, destination): extractcommand=TAR_BIN+" -vxjf "+root+PATH_SEP+file+" -C " + builddir if firstline.find(ZIP_DATA) != -1: - extractcommand=ZIP_BIN+" -v "+root+PATH_SEP+file+" -d "+ builddir + extractcommand=UNZIP_BIN+" -v "+root+PATH_SEP+file+" -d "+ builddir if firstline.find(TAR_DATA) != -1: extractcommand=TAR_BIN+" -vxf "+root+PATH_SEP+file+" -C "+ builddir @@ -722,6 +722,8 @@ def performScript(build, scriptName): script = peformSubstitutionsInScript(build, script) + debug(script) + runScript(script) else: @@ -754,6 +756,12 @@ def sourceDefined(name): def runScript(script): (returncode, stdout, stderr) = runCommandWithOutput(script) + if _debug: + for line in stdout: + debug(line) + for line in stderr: + debug(line) + if returncode != 0: for line in stdout: warn(line) @@ -1144,7 +1152,7 @@ def downloadSource(source, destination): if url.startswith(FTP): command = WGET_BIN+" -P "+targetdir+" "+url else: - command = CP_BIN+" "+url+" "+targetdir + command = CP_BIN+" -R "+url+" "+targetdir else: warn("Target directory(" + targetdir + ") is not empty please ensure contents are valid or run 'clean "+name+"'") -- cgit v1.2.1