summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-10-21 14:38:49 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-10-21 14:38:49 +0000
commitbf28e02cd20d3355bf13ed27ed8911878122e5f6 (patch)
treed082c0f04bea6069a0937f464db178c87f696d9a
parentf0d27b2ee762d36eba7fcc73ceb35df73ae35819 (diff)
downloadqpid-python-bf28e02cd20d3355bf13ed27ed8911878122e5f6.tar.gz
Update to buildCreator to REVISIONS.txt. Includes URL for source. along with a list of patches that have been applied for the patch entry.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@828034 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xqpid/buildtools/buildCreator/buildCreator.py21
1 files changed, 20 insertions, 1 deletions
diff --git a/qpid/buildtools/buildCreator/buildCreator.py b/qpid/buildtools/buildCreator/buildCreator.py
index 977a1d228a..4df7553dea 100755
--- a/qpid/buildtools/buildCreator/buildCreator.py
+++ b/qpid/buildtools/buildCreator/buildCreator.py
@@ -1012,9 +1012,14 @@ def createVersionSubstitution(build, filename):
# We can assume source is valid.
for s in sources:
if sourceDependency == getName(s):
+ # provide header <source>:<type>:<revision>
substitution += "\n " + ECHO_BIN + " -n '" + sourceDependency + ":" \
+ getType(s) + ":' >> " + filename
substitution += "\n" + getVersionCommand(s) + " >>" + filename
+ # Add Source URL to Revisions file
+ url = getValue(s.getElementsByTagName(URL)[0])
+ substitution += "\n" + ECHO_BIN + " \"URL:" + url + "\" >> "+filename
+ # Add Patches applied to this source to revisions file
substitution += addPatchVersions(s, filename)
return substitution
@@ -1053,8 +1058,22 @@ def addPatchVersions(source, filename):
getValue(patch.getElementsByTagName(PREFIX)[0]) + "\" >> " + filename
if (patch.getElementsByTagName(PATH).length > 0):
- substitution += "\n" + ECHO_BIN + " \"\t\tPREFIX: " + \
+ substitution += "\n" + ECHO_BIN + " \"\t\tPATH: " + \
getValue(patch.getElementsByTagName(PATH)[0]) + "\" >> " + filename
+
+ global _rootDir
+ patchSource= _rootDir + PATH_SEP + PATCH_DIR + PATH_SEP + getName(patch)
+
+ #
+ # Include the list of patches files applied
+ #
+ for root, dirs, files in os.walk(patchSource):
+ if '.svn' in dirs:
+ dirs.remove('.svn')
+ files.sort()
+ for patchName in files:
+ substitution += "\n" + ECHO_BIN + " \"\t\tFILE: " + patchName + "\" >> " + filename
+