aboutsummaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2013-05-091-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR. [ticket/11513] Update all CLI calls to phpunit to use vendor/bin. [ticket/11513] Use PHPUnit from composer in .travis.yml. [ticket/11513] Update (all) composer dependencies. [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency. Conflicts: .travis.yml phpBB/composer.lock
| * [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.Andreas Fischer2013-05-091-2/+4
| | | | | | | | PHPBB3-11513
* | Merge PR #1162 branch 'develop-olympus' into developOleg Pudeyev2012-12-291-9/+33
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Oleg Pudeyev (1) * develop-olympus: [ticket/11291] phing: Also add checkreturn="true" to composer execution. [ticket/11291] phing: Add checkreturn="true" to all new commands. [ticket/11291] phing: Exclude vendor folder from diffs. [ticket/11291] phing packaging: Export composer.phar and install dependencies. [ticket/11291] phing: Remove no longer needed create-package target. [ticket/11291] phing: The package target does not depend on composer. [ticket/11291] phing: Adjust directory format of composer exec. [ticket/11291] phing: Add description for composer target. [ticket/11291] phing: Add --dev to composer install. [ticket/11291] phing: Correct dependencies of composer target. [ticket/11291] phing: Make sure composer is available before calling it.
| * Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympusOleg Pudeyev2012-12-291-9/+33
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11291: [ticket/11291] phing: Also add checkreturn="true" to composer execution. [ticket/11291] phing: Add checkreturn="true" to all new commands. [ticket/11291] phing: Exclude vendor folder from diffs. [ticket/11291] phing packaging: Export composer.phar and install dependencies. [ticket/11291] phing: Remove no longer needed create-package target. [ticket/11291] phing: The package target does not depend on composer. [ticket/11291] phing: Adjust directory format of composer exec. [ticket/11291] phing: Add description for composer target. [ticket/11291] phing: Add --dev to composer install. [ticket/11291] phing: Correct dependencies of composer target. [ticket/11291] phing: Make sure composer is available before calling it.
| | * [ticket/11291] phing: Also add checkreturn="true" to composer execution.Andreas Fischer2012-12-291-0/+1
| | | | | | | | | | | | PHPBB3-11291
| | * [ticket/11291] phing: Add checkreturn="true" to all new commands.Andreas Fischer2012-12-291-1/+4
| | | | | | | | | | | | PHPBB3-11291
| | * [ticket/11291] phing: Exclude vendor folder from diffs.Andreas Fischer2012-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | | Otherwise we end up with very huge diffs and the build process is severely slowed down. PHPBB3-11291
| | * [ticket/11291] phing packaging: Export composer.phar and install dependencies.Andreas Fischer2012-12-291-4/+10
| | | | | | | | | | | | PHPBB3-11291
| | * [ticket/11291] phing: Remove no longer needed create-package target.Andreas Fischer2012-12-291-3/+2
| | | | | | | | | | | | PHPBB3-11291
| | * [ticket/11291] phing: The package target does not depend on composer.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The packaging process does not require running composer in the phpBB tree. It does however require running composer on the git exports, but this is not what the composer target does. PHPBB3-11291
| | * [ticket/11291] phing: Adjust directory format of composer exec.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | Adjust the directory format to what all the other exec calls are using. PHPBB3-11291
| | * [ticket/11291] phing: Add description for composer target.Andreas Fischer2012-12-291-0/+5
| | | | | | | | | | | | PHPBB3-11291
| | * [ticket/11291] phing: Add --dev to composer install.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The composer target runs composer in the phpBB tree in order to load dependencies for testing. The testing framework may have additional development dependencies (e.g. goutte). We also have to load those. PHPBB3-11291
| | * [ticket/11291] phing: Correct dependencies of composer target.Andreas Fischer2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | This command runs composer in the phpBB tree and does not write to the build folders. Thus, it does not have to depend on prepare and clean targets. PHPBB3-11291
| | * [ticket/11291] phing: Make sure composer is available before calling it.Andreas Fischer2012-12-231-3/+12
| | | | | | | | | | | | | | | | | | Older versions of the tree didn't use it. PHPBB3-11291
* | | [develop] Set build version (and thus package name) to 3.1.0-dev.Andreas Fischer2012-12-231-1/+1
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-231-3/+3
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.
| * | [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.Andreas Fischer2012-12-231-3/+3
| |/ | | | | | | | | This is so generated packages are not confused with the already-released 3.0.11 version.
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-08-201-2/+2
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.11] Bumping version number for 3.0.11 final. Conflicts: phpBB/install/database_update.php
| * Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-08-201-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [prep-release-3.0.11] Bumping version number for 3.0.11 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.0.11] Bumping version number for 3.0.11 final.Andreas Fischer2012-08-201-2/+2
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. Conflicts: phpBB/install/database_update.php
| * | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.Andreas Fischer2012-07-231-2/+2
| | |
| * | [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.Andreas Fischer2012-07-211-5/+16
| |/ | | | | | | PHPBB3-11009
* | [ticket/10932] Use included composer.phar in build processNils Adermann2012-06-111-14/+2
| | | | | | | | PHPBB3-10932
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-311-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus. [develop-olympus] Add changelog for 3.0.11 release. [develop-olympus] Bump version numbers for 3.0.11-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.11 releases. Conflicts: phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
| * [develop-olympus] Bump version numbers for 3.0.11-RC1 release.Andreas Fischer2012-05-311-3/+3
| |
* | [ticket/10736] Run composer in phing buildsNils Adermann2012-03-311-5/+28
| | | | | | | | PHPBB3-10736
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-025-10/+6
|\ \ | |/ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header Conflicts: tests/mock/cache.php
| * Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into ↵Andreas Fischer2012-01-025-10/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * unknownbliss/ticket/9916-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header
| | * [ticket/9916] Changing header in non-distributed filesUnknown2012-01-025-10/+6
| | | | | | | | | | | | PHPBB3-9916
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-011-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Bumping version number for 3.0.10 final. Conflicts: phpBB/install/database_update.php
| * | [prep-release-3.0.10] Bumping version number for 3.0.10 final.Andreas Fischer2012-01-011-2/+2
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-041-2/+2
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. Conflicts: phpBB/install/database_update.php
| * [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.Andreas Fischer2011-12-041-2/+2
| |
* | Merge branch 'develop-olympus' into developNils Adermann2011-12-012-0/+59
|\ \ | |/ | | | | | | | | | | * develop-olympus: [ticket/10480] Add a build target for changelog building. [ticket/10480] Add a build script for exporting the changelog from tracker. [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| * [ticket/10480] Add a build target for changelog building.Andreas Fischer2011-11-291-0/+6
| | | | | | | | PHPBB3-10480
| * [ticket/10480] Add a build script for exporting the changelog from tracker.Andreas Fischer2011-11-291-0/+53
| | | | | | | | PHPBB3-10480
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-261-2/+2
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. Conflicts: phpBB/install/database_update.php
| * [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-261-2/+2
| |
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-241-0/+8
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10486] Create git shortlog and git diff --stat in build script.
| * [ticket/10486] Create git shortlog and git diff --stat in build script.Andreas Fischer2011-11-221-0/+8
| | | | | | | | PHPBB3-10486
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-211-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus. [develop-olympus] Add changelog for 3.0.10-RC1 [develop-olympus] Bump version numbers for 3.0.10-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.10 releases. Conflicts: phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
| * [develop-olympus] Bump version numbers for 3.0.10-RC1 release.Andreas Fischer2011-11-201-3/+3
| |
* | Merge branch 'develop-olympus' into developNils Adermann2011-08-251-0/+9
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10222] Also build language and styles changes in diff/patch format.
| * [ticket/10222] Also build language and styles changes in diff/patch format.Andreas Fischer2011-08-251-0/+9
| | | | | | | | PHPBB3-10222
* | Merge branch 'develop-olympus' into developNils Adermann2011-08-071-13/+9
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10313] Create a separate build task for slow tests.
| * [ticket/10313] Create a separate build task for slow tests.Nils Adermann2011-08-071-13/+9
| | | | | | | | PHPBB3-10313
* | Merge branch 'develop-olympus' into developNils Adermann2011-08-071-0/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10313] Include slow unit tests when running build script.
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-12 11:36:44 +0000