aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-11-24 20:14:03 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2011-11-24 20:14:03 -0500
commita29a9266e35bce19c2f94da33e95fae0019d145b (patch)
tree0d69d276296325cc064d44c51ffe4efa779e268a
parent6f41f964447cba0a790c5ec226235ab2f8763412 (diff)
parent39c62cd175722f17dadc868fc8ba9e7a287b1297 (diff)
downloadforums-a29a9266e35bce19c2f94da33e95fae0019d145b.tar
forums-a29a9266e35bce19c2f94da33e95fae0019d145b.tar.gz
forums-a29a9266e35bce19c2f94da33e95fae0019d145b.tar.bz2
forums-a29a9266e35bce19c2f94da33e95fae0019d145b.tar.xz
forums-a29a9266e35bce19c2f94da33e95fae0019d145b.zip
Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10: [ticket/10486] Create git shortlog and git diff --stat in build script.
-rw-r--r--build/build.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/build/build.xml b/build/build.xml
index fbc1a91e1b..c942142b5e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -119,6 +119,7 @@
<target name="create-package" depends="prepare-new-version,old-version-diffs">
<exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" />
<exec dir="build" command="php -f build_diff.php '${prevversion}' '${newversion}' > logs/build_diff.log" escape="false" />
+
<exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/language new_version/phpBB3/language >
save/save_${prevversion}_to_${newversion}/language/phpbb-${prevversion}_to_${newversion}_language.patch" />
@@ -128,6 +129,13 @@
<exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/styles/subsilver2 new_version/phpBB3/styles/subsilver2 >
save/save_${prevversion}_to_${newversion}/subsilver2/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />
+
+ <exec dir="build" escape="false"
+ command="git shortlog --summary --numbered release-${prevversion}...HEAD >
+ save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_shortlog.txt" />
+ <exec dir="build" escape="false"
+ command="git diff --stat release-${prevversion}...HEAD >
+ save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_diffstat.txt" />
</target>
<!--