[Pkg-owncloud-commits] [php-sabredav] 03/23: Using pear.sabredav.org
David Prévot
taffit at moszumanska.debian.org
Sat Nov 30 15:44:00 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag version-1.0.12
in repository php-sabredav.
commit 010783dcb2d90262fdb11c10acbc0f8a19e77b3a
Author: Evert Pot <evert at rooftopsolutions.nl>
Date: Tue Mar 23 18:34:06 2010 +0900
Using pear.sabredav.org
---
ChangeLog | 4 ++
bin/pearpackage.php | 153 ----------------------------------------------
bin/pearpackage2.php | 9 +--
build.xml | 6 --
lib/Sabre/DAV/Version.php | 2 +-
5 files changed, 6 insertions(+), 168 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a24c250..cef8704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1.0.11-stable (2010-03-23)
+ * Non-public release. This release is identical to 1.0.10, but it is used
+ to test releasing packages to pear.sabredav.org.
+
1.0.10-stable (2010-03-22)
* Fixed: Issue 34: Invalid Lock-Token header response.
* Added: Issue 35: Addign SabreDAV version to HTTP OPTIONS responses.
diff --git a/bin/pearpackage.php b/bin/pearpackage.php
deleted file mode 100755
index ad28674..0000000
--- a/bin/pearpackage.php
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
- * PEAR package.xml generator.
- *
- * This file contains all includes to the rest of the SabreDAV library
- * Make sure the lib/ directory is in PHP's include_path
- *
- * @package Sabre
- * @subpackage DAV
- * @version $Id: Sabre.includes.php 489 2009-07-28 19:02:28Z evertpot $
- * @copyright Copyright (C) 2007-2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @author Michael Gauthier
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-require_once 'PEAR/PackageFileManager2.php';
-require_once dirname(__FILE__) . '/../lib/Sabre/DAV/Version.php';
-PEAR::setErrorHandling(PEAR_ERROR_DIE);
-
-$apiVersion = Sabre_DAV_Version::VERSION;
-$apiState = Sabre_DAV_Version::STABILITY;
-
-$releaseVersion = Sabre_DAV_Version::VERSION;
-$releaseState = Sabre_DAV_Version::STABILITY;
-
-$description = <<<TEXT
- SabreDAV allows you to easily integrate your existing web application
- with WebDAV.
-
- Feature list:
-
- * Fully WebDAV compliant
- * Supports Windows XP, Windows Vista, Mac OS/X, DavFSv2, Cadaver,
- Netdrive.
- * Passing all Litmus tests
- * Supporting class 1, 2 and 3 webdav servers
- * Locking support
- * Custom property support
- * Supports: RFC2518 and revisions from RFC4918
- * Has built-in support for (basic/digest) authentication (RFC2617)
-TEXT;
-
-$package = new PEAR_PackageFileManager2();
-
-$package->setOptions(
- array(
- //'filelistgenerator' => 'hg',
- 'simpleoutput' => true,
- 'baseinstalldir' => '/',
- 'packagedirectory' => './',
- 'dir_roles' => array(
- 'bin' => 'script',
-// 'docs' => 'doc',
- 'examples' => 'doc',
- 'lib/Sabre' => 'php',
- 'lib/Sabre.autoload.php' => 'php',
- 'lib/Sabre.includes.php' => 'php',
- 'tests' => 'test'
- ),
- 'exceptions' => array(
- 'ChangeLog' => 'doc',
- 'LICENCE' => 'doc',
- ),
- 'ignore' => array(
- 'build.xml',
- 'bin/*',
- 'docs/*',
- )
- )
-);
-
-$package->setPackage('Sabre_DAV');
-$package->setSummary(
- 'SabreDAV allows you to easily integrate your existing web ' .
- 'application with WebDAV'
-);
-$package->setDescription($description);
-
-// We're generating 2 different packages. One for pearfarm, and one for plain download
-if (isset($argv) && in_array('pearfarm',$argv)) {
- $package->setChannel('evert.pearfarm.org');
-} else {
- $package->setUri('http://sabredav.googlecode.com/files/Sabre_DAV-' . $releaseVersion);
-}
-
-$package->setPackageType('php');
-$package->setLicense('BSD', 'http://code.google.com/p/sabredav/wiki/License');
-
-$package->setNotes('Maintance release. See ChangeLog for more details.');
-$package->setReleaseVersion($releaseVersion);
-$package->setReleaseStability($releaseState);
-$package->setAPIVersion($apiVersion);
-$package->setAPIStability($apiState);
-
-$package->addMaintainer(
- 'lead',
- 'evert',
- 'Evert Pot',
- 'http://www.rooftopsolutions.nl/'
-);
-
-$package->addExtensionDep('required', 'dom');
-$package->addExtensionDep('required', 'xmlwriter');
-$package->setPhpDep('5.2.1');
-$package->setPearinstallerDep('1.4.0');
-$package->generateContents();
-
-$package->addRelease();
-
-/*
- * Files get installed without the lib/ directory so they fit in PEAR's
- * file naming scheme.
- */
-function getDirectory($path)
-{
- $files = array();
-
- $ignore = array('.', '..', '.svn','.DS_Store');
-
- $d = opendir($path);
-
- while (false !== ($file = readdir($d))) {
- $newPath = $path . '/' . $file;
- if (!in_array($file, $ignore)) {
- if (is_dir($newPath)) {
- $files = array_merge($files, getDirectory($newPath));
- } else {
- $files[] = $newPath;
- }
- }
- }
-
- closedir($d);
- return $files;
-}
-$files = getDirectory('lib');
-foreach ($files as $file) {
- // strip off 'lib/' dir
- $package->addInstallAs($file, substr($file, 4));
-}
-
-if (isset($_GET['make'])
- || (isset($_SERVER['argv']) && @in_array('make',$_SERVER['argv']))
-) {
- $package->writePackageFile();
-
-} else {
- $package->debugPackageFile();
-}
-
-?>
diff --git a/bin/pearpackage2.php b/bin/pearpackage2.php
index 6a47f4b..517a856 100755
--- a/bin/pearpackage2.php
+++ b/bin/pearpackage2.php
@@ -30,14 +30,7 @@ $notes = 'New release. Read the ChangeLog and announcement for more details';
$minPHPVersion = '5.2.1';
-// We are generating 2 types of packages:
-// 1. Generated for a uri (direct install)
-// 2. Installed from PearFarm
-if (isset($argv) && in_array('pearfarm',$argv)) {
- $channel = '<channel>evert.pearfarm.org</channel>';
-} else {
- $channel = '<uri>http://sabredav.googlecode.com/files/Sabre_DAV-' . $version . '</uri>';
-}
+$channel = '<channel>pear.sabredav.org</channel>';
/* This function is intended to generate the full file list */
diff --git a/build.xml b/build.xml
index 1ad04ff..e36fcf2 100644
--- a/build.xml
+++ b/build.xml
@@ -2,9 +2,6 @@
<project name="SabreDAV" default="build" basedir=".">
<target name="build" depends="init,test">
- <exec command="bin/pearpackage2.php make pearfarm" checkreturn="true" />
- <exec command="pear package" passthru="1" />
- <move file="Sabre_DAV-${sabredav.version}.tgz" tofile="Sabre_DAV-${sabredav.version}_PEARFARM.tgz" />
<exec command="bin/pearpackage2.php make" checkreturn="true" />
<exec command="pear package" passthru="1" />
</target>
@@ -14,14 +11,11 @@
<delete dir="apidocs" />
<delete file="package.xml" />
<delete file="Sabre_DAV-${sabredav.version}.tgz" />
- <delete file="Sabre_DAV-${sabredav.version}_PEARFARM.tgz" />
</target>
<target name="release" depends="init,test,build">
<echo>Creating Mercurial release tag</echo>
<exec command="hg tag version-${sabredav.version}" checkreturn="true" passthru="1" />
- <echo>Pushing to pearfarm</echo>
- <exec command="pearfarm push Sabre_DAV-${sabredav.version}_PEARFARM.tgz" checkreturn="true" passthru="1" />
<echo>Uploading to Google Code</echo>
<propertyprompt propertyName="googlecode.username" defaultValue="evertpot" promptText="Enter your googlecode username" useExistingValue="true" />
<propertyprompt propertyName="googlecode.password" promptText="Enter your googlecode password" useExistingValue="true" />
diff --git a/lib/Sabre/DAV/Version.php b/lib/Sabre/DAV/Version.php
index d3c6ed1..f055f1e 100644
--- a/lib/Sabre/DAV/Version.php
+++ b/lib/Sabre/DAV/Version.php
@@ -15,7 +15,7 @@ class Sabre_DAV_Version {
/**
* Full version number
*/
- const VERSION = '1.0.10';
+ const VERSION = '1.0.11';
/**
* Stability : alpha, beta, stable
--
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