Page MenuHomePhorge
Files F174720

No OneTemporary
Actions

View Options

diff --git a/autogen.sh b/autogen.sh
index 53c793b..1602b7c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,87 +1,79 @@
#!/bin/bash
package="iRony"
chwala_dir="../kolab-chwala.git/"
roundcube_dir="../roundcubemail.git/"
roundcube_plugins_dir="../roundcubemail-plugins-kolab.git/"
if [ $# -ne 1 ]; then
echo "Usage: $0 <version>"
exit 1
fi
version=$1
if [ ! -z "$(git tag -l | grep -E '${package}-${version}$')" ]; then
echo "Version ${version} already exists"
exit 1
fi
if [ ! -d "${chwala_dir}/lib" ]; then
echo "No directory ${chwala_dir}/lib/"
exit 1
fi
if [ ! -d "${roundcube_dir}/program/lib/Roundcube/" ]; then
echo "No directory ${roundcube_dir}/program/lib/Roundcube/"
exit 1
fi
if [ ! -d "${roundcube_plugins_dir}/plugins/" ]; then
echo "No directory ${roundcube_plugins_dir}/plugins/"
exit 1
fi
if [ -f "./composer.phar" ]; then
git clean -d -f -x
rm -rf vendor/
fi
cp -a ${chwala_dir}/lib lib/FileAPI
pushd lib/FileAPI/ext/
-rm -rf \
- Auth/ \
- HTTP/ \
- Mail/ \
- Net/ \
- PEAR5.php \
- PEAR.php \
- Roundcube/
-
+rm -rf Roundcube/
popd
cp -a ${roundcube_dir}/program/lib/Roundcube/ lib/Roundcube
cp -a ${roundcube_plugins_dir}/plugins/ lib/plugins
curl -sS https://getcomposer.org/installer | php
if [ $? -ne 0 ]; then
echo "Getting composer failed... Bye!"
exit 1
fi
cp composer.json composer-dev.json
cp composer-dist.json composer.json
./composer.phar install --no-dev
if [ $? -ne 0 ]; then
echo "Running ./composer.phar install failed... Bye!"
exit 1
fi
if [ -d "../${package}-${version}/" ]; then
rm -rf ../${package}-${version}/
fi
mkdir -p ../${package}-${version}/
cp -a * ../${package}-${version}/.
find ../${package}-${version}/ -type d -name ".git" -exec rm -rf {} \; 2>/dev/null
find ../${package}-${version}/ -mindepth 1 -maxdepth 1 -type f -name "composer.phar" -delete 2>/dev/null
pwd=$(pwd)
pushd ..
tar czvf ${pwd}/${package}-${version}.tar.gz ${package}-${version}/
popd
diff --git a/composer.json b/composer.json
index 65ae297..271161c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,28 +1,27 @@
{
- "name": "kolab/irony",
- "description": "iRony - The Kolab WebDAV/CalDAV/CardDAV Server",
- "license": "AGPL-3.0",
- "version": "0.4-dev",
- "repositories": [
- {
- "type": "pear",
- "url": "https://pear.php.net/"
- },
- {
- "type": "vcs",
- "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
- }
- ],
- "require": {
- "php": ">=5.4.1",
- "sabre/dav" : "2.1.*"
- },
- "require-dev": {
- "pear/mail_mime": ">=1.8.9",
- "pear/mail_mime-decode": "~1.5.5",
- "pear-pear.php.net/net_idna2": ">=0.1.1",
- "pear-pear.php.net/net_ldap2": ">=2.0.12",
- "kolab/Net_LDAP3": "dev-master"
- },
- "minimum-stability": "dev"
+ "name": "kolab/irony",
+ "description": "iRony - The Kolab WebDAV/CalDAV/CardDAV Server",
+ "license": "AGPL-3.0",
+ "version": "0.4-dev",
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
+ }
+ ],
+ "require": {
+ "php": ">=5.4.1",
+ "sabre/dav" : "~2.1.6"
+ },
+ "require-dev": {
+ "pear/pear-core-minimal": "~1.10.1",
+ "pear/net_socket": "~1.2.1",
+ "pear/auth_sasl": "~1.1.0",
+ "pear/net_idna2": "~0.2.0",
+ "pear/mail_mime": "~1.10.0",
+ "pear/net_smtp": "~1.7.1",
+ "pear/net_ldap2": "~2.2.0",
+ "kolab/net_ldap3": "dev-master",
+ "phpunit/phpunit": "~4.4.0"
+ }
}
diff --git a/test/bootstrap.php b/test/bootstrap.php
index 934b2cc..6f0dd2e 100644
--- a/test/bootstrap.php
+++ b/test/bootstrap.php
@@ -1,48 +1,48 @@
<?php
/**
* iRony, the Kolab WebDAV/CalDAV/CardDAV Server
*
* @author Thomas Bruederli <bruederli@kolabsys.com>
* @author Aleksander Machniak <machniak@kolabsys.com>
*
* Copyright (C) 2013-2016, Kolab Systems AG <contact@kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
if (php_sapi_name() != 'cli') {
die("Not in shell mode (php-cli)");
}
// define some environment variables used throughout the app and libraries
define('TESTS_DIR', __DIR__ . '/');
define('KOLAB_DAV_ROOT', realpath('../'));
define('KOLAB_DAV_VERSION', '0.4-dev');
define('KOLAB_DAV_START', microtime(true));
define('RCUBE_INSTALL_PATH', KOLAB_DAV_ROOT . '/');
define('RCUBE_CONFIG_DIR', KOLAB_DAV_ROOT . '/config/');
define('RCUBE_PLUGINS_DIR', KOLAB_DAV_ROOT . '/lib/plugins/');
// suppress error notices
ini_set('error_reporting', E_ALL &~ E_NOTICE &~ E_STRICT);
// use composer's autoloader for dependencies
-$loader = require_once(KOLAB_DAV_ROOT . '/vendor/autoload.php');
+$loader = require(KOLAB_DAV_ROOT . '/vendor/autoload.php');
$loader->set('Kolab', array(KOLAB_DAV_ROOT . '/lib')); // register iRony namespace(s)
$loader->setUseIncludePath(true); // enable include_path to load PEAR classes from their default location
// load the Roundcube framework with its autoloader
require_once KOLAB_DAV_ROOT . '/lib/Roundcube/bootstrap.php';

File Metadata

Mime Type
text/x-diff
Expires
Sun, Jan 19, 3:49 AM (19 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
120071
Default Alt Text
(5 KB)

Event Timeline