diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 21:00:04 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 21:00:04 +0200 |
commit | a3883a6f23b5036f02ccfe6ee895d4f911fa86fc (patch) | |
tree | 3c8471157174421be5ebf3b2a96074572de4c55c /build | |
parent | 9713f52fc6dd2f02800ac845533dba12061f6f29 (diff) | |
parent | 4276962e788a0e4b111696a5d8bd69d0e2ad7df8 (diff) | |
download | forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar.gz forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar.bz2 forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.tar.xz forums-a3883a6f23b5036f02ccfe6ee895d4f911fa86fc.zip |
Merge branch '3.1.x'
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'build')
-rw-r--r-- | build/build.xml | 8 | ||||
-rw-r--r-- | build/build_helper.php | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/build/build.xml b/build/build.xml index 4225122ec2..3e445196ef 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- a few settings for the build --> <property name="newversion" value="3.2.0-a1-dev" /> <property name="prevversion" value="3.1.4" /> - <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3" /> + <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.5-RC1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> @@ -149,7 +149,7 @@ <property name="dir" value="build/old_versions/release-${version}" /> </phingcall> - <exec dir="build/old_versions" command="LC_ALL=C diff -crNEBwd release-${version} release-${newversion} > + <exec dir="build/old_versions" command="LC_ALL=C diff -crNEBZbd release-${version} release-${newversion} > ../new_version/patches/phpBB-${version}_to_${newversion}.patch" escape="false" /> <exec dir="build/old_versions" command="LC_ALL=C diff -qr release-${version} release-${newversion} | grep 'Only in release-${version}' > ../new_version/patches/phpBB-${version}_to_${newversion}.deleted" escape="false" /> </target> @@ -177,10 +177,10 @@ <target name="package" depends="clean,prepare,prepare-new-version,old-version-diffs"> <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 > + command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB3/language > 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 > + command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver > save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" /> <exec dir="build" escape="false" diff --git a/build/build_helper.php b/build/build_helper.php index 35e8cd744b..3ff1b89eab 100644 --- a/build/build_helper.php +++ b/build/build_helper.php @@ -22,11 +22,11 @@ class build_package // -r - compare recursive // -N - Treat missing files as empty // -E - Ignore tab expansions - // not used: -b - Ignore space changes. - // -w - Ignore all whitespace + // -Z - Ignore white space at line end. + // -b - Ignore changes in the amount of white space. // -B - Ignore blank lines // -d - Try to find smaller set of changes - var $diff_options = '-crNEBwd'; + var $diff_options = '-crNEBZbd'; var $diff_options_long = '-x images -crNEB'; // -x fonts -x imageset //imageset not used here, because it includes the imageset.cfg file. ;) var $verbose = false; |