aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-08-25 22:57:39 -0400
committerNils Adermann <naderman@naderman.de>2011-08-25 22:57:39 -0400
commit34491f5569c7f4361da4bcf0e2ffb9b9d1274e98 (patch)
tree559a5069d776dcd9c8826cf5acf80b61fbc42ade
parent540ca1a8d88279b120b142c244c96c9fae9a867b (diff)
parentd221d2f7e8183ec47da0e4ece09c76ded8598581 (diff)
downloadforums-34491f5569c7f4361da4bcf0e2ffb9b9d1274e98.tar
forums-34491f5569c7f4361da4bcf0e2ffb9b9d1274e98.tar.gz
forums-34491f5569c7f4361da4bcf0e2ffb9b9d1274e98.tar.bz2
forums-34491f5569c7f4361da4bcf0e2ffb9b9d1274e98.tar.xz
forums-34491f5569c7f4361da4bcf0e2ffb9b9d1274e98.zip
Merge remote-tracking branch 'github-bantu/ticket/10222' into develop-olympus
* github-bantu/ticket/10222: [ticket/10222] Also build language and styles changes in diff/patch format.
-rw-r--r--build/build.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/build/build.xml b/build/build.xml
index 7cfb5d0bf8..eb63bde034 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -119,6 +119,15 @@
<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" />
+ <exec dir="build" escape="false"
+ command="diff -crNEBwd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
+ save/save_${prevversion}_to_${newversion}/prosilver/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />
+ <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" />
</target>
<!--