diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-12-01 22:21:30 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-12-01 22:21:30 +0100 |
| commit | cafe74a88de1adfc09ea23207ff1736a08b95cce (patch) | |
| tree | 824fc895360958c9f5c2f1f3e889f4826e5edbbd | |
| parent | 050fb83dfe8d952163193828553599807c7c3e6e (diff) | |
| parent | 7f8968595b78d49c4ffafada67700ad929693739 (diff) | |
| download | forums-cafe74a88de1adfc09ea23207ff1736a08b95cce.tar forums-cafe74a88de1adfc09ea23207ff1736a08b95cce.tar.gz forums-cafe74a88de1adfc09ea23207ff1736a08b95cce.tar.bz2 forums-cafe74a88de1adfc09ea23207ff1736a08b95cce.tar.xz forums-cafe74a88de1adfc09ea23207ff1736a08b95cce.zip | |
Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
[ticket/10480] Add a build target for changelog building.
[ticket/10480] Add a build script for exporting the changelog from tracker.
[ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| -rw-r--r-- | build/build.xml | 6 | ||||
| -rwxr-xr-x | build/build_changelog.php | 53 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 |
3 files changed, 60 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index 18b03243c2..2c42e1e162 100644 --- a/build/build.xml +++ b/build/build.xml @@ -138,6 +138,12 @@ save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_diffstat.txt" /> </target> + <target name="changelog" depends="prepare"> + <exec dir="build" escape="false" + command="php -f build_changelog.php '${newversion}' > + save/changelog_${newversion}.html" /> + </target> + <!-- This target can be called using phingcall to retrieve a clean checkout of a commit from git. It will only export the phpBB directory. diff --git a/build/build_changelog.php b/build/build_changelog.php new file mode 100755 index 0000000000..4eb5ebd83b --- /dev/null +++ b/build/build_changelog.php @@ -0,0 +1,53 @@ +#!/usr/bin/env php +<?php +/** +* +* @package build +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU General Public License +* +*/ + +if ($_SERVER['argc'] != 2) +{ + echo "Please specify the new version as argument (e.g. build_changelog.php '1.0.2').\n"; + exit(1); +} + +$fixVersion = $_SERVER['argv'][1]; + +$query = 'project = PHPBB3 + AND resolution = Fixed + AND fixVersion = "' . $fixVersion . '" + AND status IN ("Unverified Fix", Closed)'; + +$url = 'http://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000'; +$xml = simplexml_load_string(file_get_contents($url)); + +foreach ($xml->xpath('//item') as $item) +{ + $key = (string) $item->key; + + $keyUrl = 'http://tracker.phpbb.com/browse/' . $key; + $keyLink = '<a href="' . $keyUrl . '">' . $key . '</a>'; + + $value = str_replace($key, $keyLink, htmlspecialchars($item->title)); + $value = str_replace(']', '] -', $value); + + $types[(string) $item->type][$key] = $value; +} + +ksort($types); +foreach ($types as $type => $tickets) +{ + echo "<h4>$type</h4>\n"; + echo "<ul>\n"; + + uksort($tickets, 'strnatcasecmp'); + + foreach ($tickets as $ticket) + { + echo "<li>$ticket</li>\n"; + } + echo "</ul>\n"; +} diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 39d3e24b13..a4bbfb7d7f 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -178,7 +178,7 @@ <h4>Improvement</h4> <ul> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8616">PHPBB3-8616</a>] - Add direct link to PM to notification message</li> -<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] - Forums that can be listed but not red expose forum information</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] - Forums that can be listed but not read expose forum information</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9297">PHPBB3-9297</a>] - Add support for Extended Passive Mode (EPSV) in class ftp_fsock to better support IPv6 connections.</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9307">PHPBB3-9307</a>] - Mass email $max_chunk_size</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9361">PHPBB3-9361</a>] - Edit account settings - Improved clarification needed</li> |