diff options
| author |   Andreas Fischer <bantu@phpbb.com> | 2014-02-04 02:07:45 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-02-04 02:07:45 +0100 |
| commit | 78116a5298bc0cbbfb70e0ab39d14123c24fcb21 (patch) | |
| tree | 0683b44d0eaa0860d38682d81b82ef71bcf5e20a /build | |
| parent | Merge remote-tracking branch 'github-bantu/ticket/11509' into develop-olympus (diff) | |
| download | phpbb-78116a5298bc0cbbfb70e0ab39d14123c24fcb21.tar.gz phpbb-78116a5298bc0cbbfb70e0ab39d14123c24fcb21.tar.bz2 phpbb-78116a5298bc0cbbfb70e0ab39d14123c24fcb21.zip | |
[ticket/12161] Do not use subdirectories in build/save directory.
This is pretty much pointless because a new build will wipe the save directory
and there are only a few files in there anyway.
PHPBB3-12161
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build/build.xml b/build/build.xml index b668c9bf40..e82e61a18e 100644 --- a/build/build.xml +++ b/build/build.xml @@ -133,20 +133,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" /> |