diff options
| -rw-r--r-- | admin/package.xml | 2 | ||||
| -rw-r--r-- | admin/package2.xml | 2 | ||||
| -rw-r--r-- | admin/packagexml.py | 19 |
3 files changed, 19 insertions, 4 deletions
diff --git a/admin/package.xml b/admin/package.xml index 12e78c0..d55e8a8 100644 --- a/admin/package.xml +++ b/admin/package.xml @@ -12,7 +12,7 @@ <date>%(date)s</date> <state>%(release_stability)s</state> <notes> - <!-- Release notes here. --> + %(release_notes)s </notes> %(contents_version_1)s </release> diff --git a/admin/package2.xml b/admin/package2.xml index 0be1909..e9117c9 100644 --- a/admin/package2.xml +++ b/admin/package2.xml @@ -24,7 +24,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> </stability> <license uri="%(license_uri)s">%(license_name)s</license> <notes> - <!-- Release-specific notes should go here. --> + %(release_notes)s </notes> <contents> %(contents)s diff --git a/admin/packagexml.py b/admin/packagexml.py index 89e30dc..17ee8ab 100644 --- a/admin/packagexml.py +++ b/admin/packagexml.py @@ -90,6 +90,9 @@ def buildDocsXML(*dirs): return "\n".join(lines) if __name__ == "__main__": + def usage(progname): + print "Usage: %s <package version> <xml template file> <release notes file>" % (progname) + import sys import time @@ -104,7 +107,7 @@ if __name__ == "__main__": try: template_f = open(sys.argv[2], 'r') except Exception, e: - print "Usage: %s <package version> <xml template file>" % (sys.argv[0]) + usage(sys.argv[0]) print "Could not open template file:", str(e) sys.exit(1) @@ -113,9 +116,20 @@ if __name__ == "__main__": try: version = sys.argv[1] except: - print "Usage: %s <package version> <xml template file>" % (sys.argv[0]) + usage(sys.argv[0]) sys.exit(2) + # Expect sys.argv[3] to be the name of the release notes file. + try: + release_file = sys.argv[3] + release_file_h = open(release_file, 'r') + release_notes = release_file_h.read() + release_file_h.close() + except Exception, e: + usage(sys.argv[0]) + print str(e) + sys.exit(3) + data = xmlconfig.__dict__.copy() contentsXml = buildContentsXML({'php': 'php'}, *xmlconfig.contents_dirs) @@ -135,6 +149,7 @@ if __name__ == "__main__": data['version'] = version data['uri'] = "%s%s-%s.tgz" % (data['package_base_uri'], data['package_name'], version) + data['release_notes'] = release_notes template_data = template_f.read() print template_data % data |