diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-25 22:57:56 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-08-25 22:57:56 -0400 |
| commit | 28f72e427e61d2aa4ba4e5c5722c3e98469a16e1 (patch) | |
| tree | ba787d015208e413151efeefefd60831cce9b925 | |
| parent | 4bc09cd34db4b103693c2188c79067c10b7e0b15 (diff) | |
| parent | 34491f5569c7f4361da4bcf0e2ffb9b9d1274e98 (diff) | |
| download | forums-28f72e427e61d2aa4ba4e5c5722c3e98469a16e1.tar forums-28f72e427e61d2aa4ba4e5c5722c3e98469a16e1.tar.gz forums-28f72e427e61d2aa4ba4e5c5722c3e98469a16e1.tar.bz2 forums-28f72e427e61d2aa4ba4e5c5722c3e98469a16e1.tar.xz forums-28f72e427e61d2aa4ba4e5c5722c3e98469a16e1.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10222] Also build language and styles changes in diff/patch format.
| -rw-r--r-- | build/build.xml | 9 |
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> <!-- |