aboutsummaryrefslogtreecommitdiffstats
path: root/build/build.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNathan Guse2013-10-031-0/+12
|\ | | | | | | | | * develop-olympus: [ticket/11877] Create package links and checksums for announcement via script.
| * [ticket/11877] Create package links and checksums for announcement via script.Andreas Fischer2013-10-011-0/+12
| | | | | | | | PHPBB3-11877
* | Merge branch 'develop-olympus' into developNils Adermann2013-09-301-0/+18
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/11876] Replace MD5 with SHA256. [ticket/11876] Move checksum generation from build PHP files to phing build.xml
| * [ticket/11876] Replace MD5 with SHA256.Andreas Fischer2013-09-301-1/+1
| | | | | | | | PHPBB3-11876
| * [ticket/11876] Move checksum generation from build PHP files to phing build.xmlAndreas Fischer2013-09-301-0/+18
| | | | | | | | | | | | This also removes paths from the checksum files. PHPBB3-11876
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-301-1/+1
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. Conflicts: build/build.xml
| * [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.Andreas Fischer2013-09-301-1/+1
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-271-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. [prep-release-3.0.12] Bumping version number for 3.0.12 final. Conflicts: build/build.xml phpBB/install/database_update.php
| * [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.Andreas Fischer2013-09-271-3/+3
| |
| * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-271-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Bumping version number for 3.0.12 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-271-2/+2
| | |
| * | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-051-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-021-2/+2
| | |
| * | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-011-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.Andreas Fischer2013-08-011-2/+2
| | |
* | | Merge remote-tracking branch 'github-phpbb/develop-olympus' into developNils Adermann2013-07-141-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | * github-phpbb/develop-olympus: [ticket/11704] Use the correct directory for dependency checking. [ticket/11704] Correctly escape "
| * | [ticket/11704] Use the correct directory for dependency checking.Andreas Fischer2013-07-141-1/+1
| | | | | | | | | | | | PHPBB3-11704
| * | [ticket/11704] Correctly escape "Andreas Fischer2013-07-141-1/+1
| |/ | | | | | | PHPBB3-11704
* | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-13/+29
|\ \ | |/ | | | | | | * develop-olympus: [ticket/11674] Do not include vendor folder if there are no dependencies.
| * [ticket/11674] Do not include vendor folder if there are no dependencies.Andreas Fischer2013-07-131-13/+29
| | | | | | | | PHPBB3-11674
| * [develop-olympus] Bump version numbers for 3.0.12-RC1 release.Andreas Fischer2013-07-121-1/+1
| |
* | 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
|/ /
* | [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 '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 '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
* [develop-olympus] Bump version numbers for 3.0.11-RC1 release.Andreas Fischer2012-05-311-3/+3
|
* [prep-release-3.0.10] Bumping version number for 3.0.10 final.Andreas Fischer2012-01-011-2/+2
|
* [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.Andreas Fischer2011-12-041-2/+2
|
* [ticket/10480] Add a build target for changelog building.Andreas Fischer2011-11-291-0/+6
| | | | PHPBB3-10480
* [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-261-2/+2
|
* [ticket/10486] Create git shortlog and git diff --stat in build script.Andreas Fischer2011-11-221-0/+8
| | | | PHPBB3-10486
* [develop-olympus] Bump version numbers for 3.0.10-RC1 release.Andreas Fischer2011-11-201-3/+3
|