diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-04 13:05:20 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-04 13:05:20 +0100 |
| commit | 1a31f03a7b89e2a88f188e9f68c96469aa40be79 (patch) | |
| tree | 95a2abfa19fa9c8666534404b9ecffe41059f9a3 /build | |
| parent | db9fd30e7c74f5812e38270123656926f02173fa (diff) | |
| parent | c955d0145697fb866aefd1454127218b976009cd (diff) | |
| download | forums-1a31f03a7b89e2a88f188e9f68c96469aa40be79.tar forums-1a31f03a7b89e2a88f188e9f68c96469aa40be79.tar.gz forums-1a31f03a7b89e2a88f188e9f68c96469aa40be79.tar.bz2 forums-1a31f03a7b89e2a88f188e9f68c96469aa40be79.tar.xz forums-1a31f03a7b89e2a88f188e9f68c96469aa40be79.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12162] Set language to C before running diff to ensure its english
[ticket/11509] Be exact when referencing the branch name.
[ticket/12161] Do not use subdirectories in build/save directory.
[ticket/11509] Run commit message checker only in one environment.
[ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.
Conflicts:
.travis.yml
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build/build.xml b/build/build.xml index d4ba927d96..c65c71d2dc 100644 --- a/build/build.xml +++ b/build/build.xml @@ -139,7 +139,7 @@ <property name="dir" value="build/old_versions/release-${version}" /> </phingcall> - <exec dir="build/old_versions" command="diff -crNEBwd release-${version} release-${newversion} > + <exec dir="build/old_versions" command="LC_ALL=C diff -crNEBwd release-${version} release-${newversion} > ../new_version/patches/phpBB-${version}_to_${newversion}.patch" escape="false" /> </target> @@ -167,20 +167,20 @@ <exec dir="build" command="php -f package.php '${versions}' > logs/package.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" /> + save/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" /> + save/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" /> + save/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" /> + save/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" /> + save/phpbb-${prevversion}_to_${newversion}_git_diffstat.txt" /> <phingcall target="checksum-dir"> <property name="dir" value="build/new_version/release_files" /> |