diff --git a/.travis.yml b/.travis.yml index 9549104..7b1b6b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ addons: - libevent-dev - libarchive-dev - intltool - - re2c - libjansson-dev - libonig-dev - libfuse-dev diff --git a/README.markdown b/README.markdown index 2808343..ab9c1a7 100644 --- a/README.markdown +++ b/README.markdown @@ -1,4 +1,4 @@ -Seafile Server Core +Seafile Server Core [![Build Status](https://secure.travis-ci.org/haiwen/seafile-server.svg?branch=master)](http://travis-ci.org/haiwen/seafile-server) ============ Seafile is an open source cloud storage system with features on privacy protection and teamwork. Collections of files are called libraries, and each library can be synced separately. A library can also be encrypted with a user chosen password. Seafile also allows users to create groups and easily sharing files into groups. diff --git a/integration-tests/install-deps.sh b/integration-tests/install-deps.sh index 929be27..b018279 100755 --- a/integration-tests/install-deps.sh +++ b/integration-tests/install-deps.sh @@ -13,21 +13,6 @@ wget https://dl.bintray.com/lins05/generic/libevhtp-bin/$libevhtp_bin tar xf $libevhtp_bin find $HOME/opt -# download precompiled libzdb -# zdb_bin=libzdb-bin_2.11.1.tar.gz -# wget https://dl.bintray.com/lins05/generic/libzdb-bin/$zdb_bin -# tar xf $zdb_bin -# sed -i -e "s|prefix=/opt/local|prefix=$HOME/opt/local|g" $HOME/opt/local/lib/pkgconfig/zdb.pc -# find $HOME/opt -pushd /tmp/ -git clone --depth=1 https://github.com/haiwen/libzdb.git -cd libzdb -./bootstrap -./configure --prefix=$HOME/opt/local -make -j2 -make install -popd - # download seahub thirdpart python libs WGET="wget --no-check-certificate" downloads=$HOME/downloads diff --git a/integration-tests/run.py b/integration-tests/run.py index a40dacd..cd9bc73 100755 --- a/integration-tests/run.py +++ b/integration-tests/run.py @@ -68,7 +68,7 @@ def prepend_env_value(name, value, seperator=':', env=None): def get_project_branch(project, default_branch='master'): - if project.name == 'seafile': + if project.name == 'seafile-server': return TRAVIS_BRANCH conf = json.loads(requests.get( 'https://raw.githubusercontent.com/haiwen/seafile-test-deploy/master/branches.json').text) @@ -117,7 +117,8 @@ class Project(object): tarball = glob.glob('*.tar.gz')[0] info('copying %s to %s', tarball, SRCDIR) shell('cp {} {}'.format(tarball, SRCDIR)) - m = re.match('{}-(.*).tar.gz'.format(self.name), basename(tarball)) + name = 'seafile' if self.name == 'seafile-server' else self.name + m = re.match('{}-(.*).tar.gz'.format(name), basename(tarball)) if m: self.version = m.group(1) @@ -126,20 +127,20 @@ class Project(object): shell('git checkout {}'.format(branch)) -class Ccnet(Project): +class CcnetServer(Project): def __init__(self): - super(Ccnet, self).__init__('ccnet') + super(CcnetServer, self).__init__('ccnet') -class Seafile(Project): - configure_cmd = './configure --enable-client --enable-server' +class SeafileServer(Project): + configure_cmd = './configure' def __init__(self): - super(Seafile, self).__init__('seafile') + super(SeafileServer, self).__init__('seafile-server') @chdir def copy_dist(self): - super(Seafile, self).copy_dist() + super(SeafileServer, self).copy_dist() global seafile_version seafile_version = self.version @@ -181,7 +182,7 @@ class SeafObj(Project): def build_server(libsearpc, ccnet, seafile): cmd = [ 'python', - join(TOPDIR, 'seafile/scripts/build/build-server.py'), + join(TOPDIR, 'seafile-server/scripts/build/build-server.py'), '--yes', '--version=%s' % seafile.version, '--libsearpc_version=%s' % libsearpc.version, @@ -196,14 +197,14 @@ def build_server(libsearpc, ccnet, seafile): def fetch_and_build(): libsearpc = Project('libsearpc') - ccnet = Ccnet() - seafile = Seafile() + ccnet = CcnetServer() + seafile = SeafileServer() seahub = Seahub() seafobj = SeafObj() seafdav = SeafDAV() for project in (libsearpc, ccnet, seafile, seahub, seafdav, seafobj): - if project.name != 'seafile': + if project.name != 'seafile-server': project.clone() project.copy_dist()