[Pkg-owncloud-commits] [php-sabredav] 161/163: Merge branch '1.7' into 1.8
David Prévot
taffit at moszumanska.debian.org
Tue May 20 18:55:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag upstream/2.0.0_beta1
in repository php-sabredav.
commit 0d064536ed3c7974e486b6ebb5b17ad7a974fe18
Merge: 1942f1f 06acde1
Author: Evert Pot <me at evertpot.com>
Date: Thu May 15 20:14:02 2014 -0400
Merge branch '1.7' into 1.8
Conflicts:
ChangeLog
build.xml
composer.json
lib/Sabre/DAV/Version.php
ChangeLog | 7 ++-
bin/build.php | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
build.xml | 72 ------------------------------
composer.json | 3 +-
4 files changed, 144 insertions(+), 75 deletions(-)
diff --cc ChangeLog
index db414b0,79e1be8..92fe1a2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,67 -1,8 +1,71 @@@
+1.8.10-stable (2014-05-15)
+ * The zip release ships with sabre/vobject 2.1.4.
+ * includes changes from version 1.7.12.
+
+1.8.9-stable (2014-02-26)
+ * The zip release ships with sabre/vobject 2.1.3.
+ * includes changes from version 1.7.11.
+
+1.8.8-stable (2014-02-09)
+ * The zip release ships with sabre/vobject 2.1.3.
+ * includes changes from version 1.7.10.
+
+1.8.7-stable (2013-10-02)
+ * the zip release ships with sabre/vobject 2.1.3.
+ * includes changes from version 1.7.9.
+
+1.8.6-stable (2013-06-18)
+ * The zip release ships with sabre/vobject 2.1.0.
+ * Includes changes from version 1.7.8.
+
+1.8.5-stable (2013-04-11)
+ * The zip release ships with sabre/vobject 2.0.7.
+ * Includes changes from version 1.7.7.
+
+1.8.4-stable (2013-04-08)
+ * The zip release ships with sabre/vobject 2.0.7.
+ * Includes changes from version 1.7.6.
+
+1.8.3-stable (2013-03-01)
+ * The zip release ships with sabre/vobject 2.0.6.
+ * Includes changes from version 1.7.5.
+ * Fixed: organizer email-address for shared calendars is now prefixed with
+ mailto:, as it should.
+
+1.8.2-stable (2013-01-19)
+ * The zip release ships with sabre/vobject 2.0.5.
+ * Includes changes from version 1.7.4.
+
+1.8.1-stable (2012-12-01)
+ * The zip release ships with sabre/vobject 2.0.5.
+ * Includes changes from version 1.7.3.
+ * Fixed: Typo in 1.7 migration script caused it to fail.
+
+1.8.0-stable (2012-11-08)
+ * The zip release ships with sabre/vobject 2.0.5.
+ * BC Break: Moved the entire codebase to PHP namespaces.
+ * BC Break: Every backend package (CalDAV, CardDAV, Auth, Locks,
+ Principals) now has consistent naming conventions. There's a
+ BackendInterface, and an AbstractBackend class.
+ * BC Break: Changed a bunch of constructor signatures in the CalDAV
+ package, to reduce dependencies on the ACL package.
+ * BC Break: Sabre_CalDAV_ISharedCalendar now also has a getShares method,
+ so sharees can figure out who is also on a shared calendar.
+
+ * Added: Sabre_DAVACL_IPrincipalCollection interface, to advertise support
+ for principal-property-search on any node.
+ * Added: Simple console script to fire up a fileserver in the current
+ directory using PHP 5.4's built-in webserver.
+ * Added: Sharee's can now also read out the list of invites for a shared
+ calendar.
+ * Added: The Proxy principal classes now both implement an interface, for
+ greater flexiblity.
+
- 1.7.12-stable (????-??-??)
+ 1.7.13-stable (????-??-??)
+ * Changed: Removed phing and went with a custom build script for now.
+
+ 1.7.12-stable (2014-05-15)
+ * The zip release ships with sabre/vobject 2.1.4.
* Updated: Issue #439. Lots of updates in PATCH support. The
Sabre_DAV_PartialUpdate_IFile interface is now deprecated and will be
removed in a future version.
diff --cc bin/build.php
index 0000000,0d7001a..11cca1e
mode 000000,100644..100644
--- a/bin/build.php
+++ b/bin/build.php
@@@ -1,0 -1,138 +1,137 @@@
+ <?php
+
+ $tasks = [
+
+ 'buildzip' => [
+ 'init', 'test', 'clean',
+ ],
+ 'markrelease' => [
+ 'init', 'test', 'clean',
+ ],
+ 'clean' => [],
+ 'test' => [
+ 'composerupdate',
+ ],
+ 'init' => [],
+ 'composerupdate' => [],
+ ];
+
+ $default = 'buildzip';
+
+ $baseDir = __DIR__ . '/../';
+ chdir($baseDir);
+
+ $currentTask = $default;
+ if ($argc > 1) $currentTask = $argv[1];
+ $version = null;
+ if ($argc > 2) $version = $argv[2];
+
+ if (!isset($tasks[$currentTask])) {
+ echo "Task not found: ", $currentTask, "\n";
+ die(1);
+ }
+
+ // Creating the dependency graph
+ $newTaskList = [];
+ $oldTaskList = [$currentTask => true];
+
+ while(count($oldTaskList)>0) {
+
+ foreach($oldTaskList as $task=>$foo) {
+
+ if (!isset($tasks[$task])) {
+ echo "Dependency not found: " . $task, "\n";
+ die(1);
+ }
+ $dependencies = $tasks[$task];
+
+ $fullFilled = true;
+ foreach($dependencies as $dependency) {
+ if (isset($newTaskList[$dependency])) {
+ // Already in the fulfilled task list.
+ continue;
+ } else {
+ $oldTaskList[$dependency] = true;
+ $fullFilled = false;
+ }
+
+ }
+ if ($fullFilled) {
+ unset($oldTaskList[$task]);
+ $newTaskList[$task] = 1;
+ }
+
+ }
+
+ }
+
+ foreach(array_keys($newTaskList) as $task) {
+
+ echo "task: " . $task, "\n";
+ call_user_func($task);
+ echo "\n";
+
+ }
+
+ function init() {
+
+ global $version;
+ if (!$version) {
+ include __DIR__ . '/../vendor/autoload.php';
- $version = Sabre_DAV_Version::VERSION;
++ $version = Sabre\DAV\Version::VERSION;
+ }
+
+ echo " Building sabre/dav " . $version, "\n";
+
+ }
+
+ function clean() {
+
+ global $baseDir;
+ echo " Removing build files\n";
+ $outputDir = $baseDir . '/build/SabreDAV';
+ if (is_dir($outputDir)) {
+ system('rm -r ' . $baseDir . '/build/SabreDAV');
+ }
+
+ }
+
+ function composerupdate() {
+
- return;
+ global $baseDir;
+ echo " Updating composer packages to latest version\n\n";
+ system('cd ' . $baseDir . '; composer update --dev');
+ }
+
+ function test() {
+
- return;
+ global $baseDir;
+
+ echo " Running all unittests.\n";
+ echo " This may take a while.\n\n";
+ system(__DIR__ . '/phpunit --configuration ' . $baseDir . '/tests/phpunit.xml --stop-on-failure', $code);
+ if ($code != 0) {
+ echo "PHPUnit reported error code $code\n";
+ die(1);
+ }
+
+ }
+
+ function buildzip() {
+
+ global $baseDir, $version;
+ echo " Asking composer to download sabre/dav $version\n\n";
+ system("composer create-project --no-dev sabre/dav build/SabreDAV $version", $code);
+ if ($code!==0) {
+ echo "Composer reported error code $code\n";
++ die(1);
+ }
+ // <zip destfile="build/SabreDAV-${sabredav.version}.zip" basedir="build/SabreDAV" prefix="SabreDAV/" />
+
+ echo "\n";
+ echo "Zipping the sabredav distribution\n\n";
+ system('cd build; zip -qr sabredav-' . $version . '.zip SabreDAV');
+
+ echo "Done.";
+
+ }
diff --cc composer.json
index 321c3e7,03fb934..c858191
--- a/composer.json
+++ b/composer.json
@@@ -27,9 -27,7 +27,8 @@@
"ext-libxml" : "*"
},
"require-dev" : {
- "phpunit/phpunit" : "~4.0.0"
+ "phpunit/phpunit" : "~4.0.0",
- "phing/phing" : "~2.4",
+ "evert/phpdoc-md" : "~0.0.7"
},
"provide" : {
"evert/sabredav" : "1.7.*"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git
More information about the Pkg-owncloud-commits
mailing list