aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/build.xml181
-rwxr-xr-xbuild/package.php23
2 files changed, 128 insertions, 76 deletions
diff --git a/build/build.xml b/build/build.xml
index b8a88473ba..c9e746c8f0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
- <property name="newversion" value="3.1.8-dev" />
- <property name="prevversion" value="3.1.7" />
- <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6" />
+ <property name="newversion" value="3.2.0-a2-dev" />
+ <property name="prevversion" value="3.2.0-a1" />
+ <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -182,9 +182,6 @@
<exec dir="build" escape="false"
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"
- command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/subsilver2 new_version/phpBB3/styles/subsilver2 >
- save/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />
<exec dir="build" escape="false"
command="git shortlog --summary --numbered release-${prevversion}...HEAD >
@@ -286,6 +283,8 @@
<delete file="${dir}/config.php" />
<delete dir="${dir}/develop" />
<delete dir="${dir}/install/data" />
+ <delete dir="${dir}/config/development" />
+ <delete dir="${dir}/config/test" />
<phingcall target="clean-vendor-dir">
<property name="dir" value="${dir}" />
@@ -311,69 +310,93 @@
<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
+ <delete file="${dir}/vendor/patchwork/utf8/.travis.yml" />
+ <delete file="${dir}/vendor/patchwork/utf8/CHANGELOG.md" />
+ <delete file="${dir}/vendor/patchwork/utf8/phpunit.xml.dist" />
+ <delete file="${dir}/vendor/patchwork/utf8/README.md" />
+
<delete dir="${dir}/vendor/psr/log/Psr/Log/Test" />
<delete file="${dir}/vendor/psr/log/.gitignore" />
<delete file="${dir}/vendor/psr/log/README.md" />
- <delete dir="${dir}/vendor/symfony/config/Symfony/Component/Config/Tests" />
- <delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/.gitignore" />
- <delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/CHANGELOG.md" />
- <delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/README.md" />
- <delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/phpunit.xml.dist" />
-
- <delete dir="${dir}/vendor/symfony/console/Symfony/Component/Console/Tests" />
- <delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/.gitignore" />
- <delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/CHANGELOG.md" />
- <delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/README.md" />
- <delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist" />
-
- <delete dir="${dir}/vendor/symfony/debug/Symfony/Component/Debug/Tests" />
- <delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/.gitignore" />
- <delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md" />
- <delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/README.md" />
- <delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist" />
-
- <delete dir="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests" />
- <delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/.gitignore" />
- <delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/CHANGELOG.md" />
- <delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/README.md" />
- <delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/phpunit.xml.dist" />
-
- <delete dir="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests" />
- <delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore" />
- <delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/CHANGELOG.md" />
- <delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/README.md" />
- <delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist" />
-
- <delete dir="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/Tests" />
- <delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/.gitignore" />
- <delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/CHANGELOG.md" />
- <delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/README.md" />
- <delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/phpunit.xml.dist" />
-
- <delete dir="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests" />
- <delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/.gitignore" />
- <delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/CHANGELOG.md" />
- <delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/README.md" />
- <delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist" />
-
- <delete dir="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests" />
- <delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/.gitignore" />
- <delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CHANGELOG.md" />
- <delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md" />
- <delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist" />
-
- <delete dir="${dir}/vendor/symfony/routing/Symfony/Component/Routing/Tests" />
- <delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/.gitignore" />
- <delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/CHANGELOG.md" />
- <delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/README.md" />
- <delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist" />
-
- <delete dir="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/Tests" />
- <delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore" />
- <delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/CHANGELOG.md" />
- <delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/README.md" />
- <delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist" />
+ <delete dir="${dir}/vendor/s9e/text-formatter/.git" />
+
+ <delete dir="${dir}/vendor/symfony/config/.git" />
+ <delete dir="${dir}/vendor/symfony/config/Tests" />
+ <delete file="${dir}/vendor/symfony/config/.gitignore" />
+ <delete file="${dir}/vendor/symfony/config/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/config/README.md" />
+ <delete file="${dir}/vendor/symfony/config/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/console/.git" />
+ <delete dir="${dir}/vendor/symfony/console/Tests" />
+ <delete file="${dir}/vendor/symfony/console/.gitignore" />
+ <delete file="${dir}/vendor/symfony/console/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/console/README.md" />
+ <delete file="${dir}/vendor/symfony/console/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/debug/.git" />
+ <delete dir="${dir}/vendor/symfony/debug/Tests" />
+ <delete file="${dir}/vendor/symfony/debug/.gitignore" />
+ <delete file="${dir}/vendor/symfony/debug/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/debug/README.md" />
+ <delete file="${dir}/vendor/symfony/debug/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/dependency-injection/.git" />
+ <delete dir="${dir}/vendor/symfony/dependency-injection/Tests" />
+ <delete file="${dir}/vendor/symfony/dependency-injection/.gitignore" />
+ <delete file="${dir}/vendor/symfony/dependency-injection/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/dependency-injection/README.md" />
+ <delete file="${dir}/vendor/symfony/dependency-injection/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/event-dispatcher/.git" />
+ <delete dir="${dir}/vendor/symfony/event-dispatcher/Tests" />
+ <delete file="${dir}/vendor/symfony/event-dispatcher/.gitignore" />
+ <delete file="${dir}/vendor/symfony/event-dispatcher/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/event-dispatcher/README.md" />
+ <delete file="${dir}/vendor/symfony/event-dispatcher/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/filesystem/.git" />
+ <delete dir="${dir}/vendor/symfony/filesystem/Tests" />
+ <delete file="${dir}/vendor/symfony/filesystem/.gitignore" />
+ <delete file="${dir}/vendor/symfony/filesystem/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/filesystem/README.md" />
+ <delete file="${dir}/vendor/symfony/filesystem/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/finder/.git" />
+ <delete dir="${dir}/vendor/symfony/finder/Tests" />
+ <delete file="${dir}/vendor/symfony/finder/.gitignore" />
+ <delete file="${dir}/vendor/symfony/finder/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/finder/README.md" />
+ <delete file="${dir}/vendor/symfony/finder/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/http-foundation/.git" />
+ <delete dir="${dir}/vendor/symfony/http-foundation/Tests" />
+ <delete file="${dir}/vendor/symfony/http-foundation/.gitignore" />
+ <delete file="${dir}/vendor/symfony/http-foundation/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/http-foundation/README.md" />
+ <delete file="${dir}/vendor/symfony/http-foundation/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/http-kernel/.git" />
+ <delete dir="${dir}/vendor/symfony/http-kernel/Tests" />
+ <delete file="${dir}/vendor/symfony/http-kernel/.gitignore" />
+ <delete file="${dir}/vendor/symfony/http-kernel/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/http-kernel/README.md" />
+ <delete file="${dir}/vendor/symfony/http-kernel/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/routing/.git" />
+ <delete dir="${dir}/vendor/symfony/routing/Tests" />
+ <delete file="${dir}/vendor/symfony/routing/.gitignore" />
+ <delete file="${dir}/vendor/symfony/routing/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/routing/README.md" />
+ <delete file="${dir}/vendor/symfony/routing/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/yaml/.git" />
+ <delete dir="${dir}/vendor/symfony/yaml/Symfony/Tests" />
+ <delete file="${dir}/vendor/symfony/yaml/Symfony/.gitignore" />
+ <delete file="${dir}/vendor/symfony/yaml/Symfony/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/yaml/Symfony/README.md" />
+ <delete file="${dir}/vendor/symfony/yaml/Symfony/phpunit.xml.dist" />
<delete dir="${dir}/vendor/twig/twig/doc" />
<delete dir="${dir}/vendor/twig/twig/ext" />
@@ -385,6 +408,34 @@
<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
<delete file="${dir}/vendor/twig/twig/README.markdown" />
+
+ <delete dir="${dir}/vendor/symfony/security-core/.git" />
+ <delete dir="${dir}/vendor/symfony/security-core/Core/Tests" />
+ <delete file="${dir}/vendor/symfony/security-core/Core/.gitignore" />
+ <delete file="${dir}/vendor/symfony/security-core/Core/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/security-core/Core/README.md" />
+ <delete file="${dir}/vendor/symfony/security-core/Core/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/security-csrf/.git" />
+ <delete dir="${dir}/vendor/symfony/security-csrf/Csrf/Tests" />
+ <delete file="${dir}/vendor/symfony/security-csrf/Csrf/.gitignore" />
+ <delete file="${dir}/vendor/symfony/security-csrf/Csrf/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/security-csrf/Csrf/README.md" />
+ <delete file="${dir}/vendor/symfony/security-csrf/Csrf/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
+ <delete dir="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Tests" />
+ <delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore" />
+ <delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/README.md" />
+ <delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/phpunit.xml.dist" />
+
+ <delete dir="${dir}/vendor/symfony/security/.git" />
+ <delete dir="${dir}/vendor/symfony/security/Tests" />
+ <delete file="${dir}/vendor/symfony/security/.gitignore" />
+ <delete file="${dir}/vendor/symfony/security/CHANGELOG.md" />
+ <delete file="${dir}/vendor/symfony/security/README.md" />
+ <delete file="${dir}/vendor/symfony/security/phpunit.xml.dist" />
</target>
<target name="clean-diff-dir">
diff --git a/build/package.php b/build/package.php
index d168957ca5..178a27faad 100755
--- a/build/package.php
+++ b/build/package.php
@@ -196,9 +196,10 @@ if (sizeof($package->old_packages))
*/
$copy_relative_directories = array(
'config/' => array(
+ 'recursive' => true,
'copied' => false,
'copy' => array(
- 'config/*.yml' => 'config',
+ 'config/*' => 'config',
),
),
);
@@ -256,7 +257,15 @@ if (sizeof($package->old_packages))
}
$source_dir_files = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $source_dir_files;
$destination_dir = $dest_filename_dir . '/install/update/new/' . $destination_dir;
- $package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
+
+ if (isset($data['recursive']) && $data['recursive'])
+ {
+ $package->run_command('cp -Rp ' . $source_dir_files . ' ' . $destination_dir);
+ }
+ else
+ {
+ $package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
+ }
}
$copy_relative_directories[$reference]['copied'] = true;
}
@@ -272,7 +281,7 @@ if (sizeof($package->old_packages))
'adm/style/admin.css' => 'adm/style',
'adm/style/admin.js' => 'adm/style',
'adm/style/ajax.js' => 'adm/style',
- 'adm/style/install_*' => 'adm/style',
+ 'adm/style/installer_*' => 'adm/style',
'assets/javascript/*' => 'assets/javascript',
);
@@ -470,22 +479,14 @@ chdir($package->get('dest_dir') . '/install');
// $package->run_command('rm -v database_update.php');
$package->run_command('rm -v install_update.php');
-chdir($package->get('dest_dir'));
-$package->run_command('mv -v styles/subsilver2 ../subsilver2');
-$package->run_command('cp -p docs/COPYING ../subsilver2/license.txt');
-
chdir($package->locations['package_dir']);
foreach ($compress_programs as $extension => $compress_command)
{
$package->begin_status('Packaging phpBB for ' . $extension);
$package->run_command('rm -v ./release_files/' . $package->get('release_filename') . ".{$extension}");
- $package->run_command('rm -v ./release_files/subsilver2_' . $package->get('new_version_number') . ".{$extension}");
// Build Package
$package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name'));
-
- // Build subSilver2 Package
- $package->run_command("$compress_command ./release_files/subsilver2_" . $package->get('new_version_number') . '.' . $extension . ' subsilver2');
}
// Microsoft Web PI packaging