added the linkoauth dependency
This commit is contained in:
Tarek Ziadé
Родитель
f94c326609
Коммит
d4d1db2976
26
Makefile
26
Makefile
|
|
@ -1,3 +1,15 @@
|
|||
APPNAME = server-shared-send
|
||||
DEPS = server-share-core
|
||||
VIRTUALENV = virtualenv
|
||||
NOSE = bin/nosetests -s --with-xunit
|
||||
TESTS = linkdrop/tests
|
||||
PYTHON = bin/python
|
||||
EZ = bin/easy_install
|
||||
COVEROPTS = --cover-html --cover-html-dir=html --with-coverage --cover-package=linkdrop
|
||||
COVERAGE = bin/coverage
|
||||
PYLINT = bin/pylint
|
||||
PKGS = linkdrop
|
||||
|
||||
version := 0.3.2
|
||||
PYTHON := python
|
||||
ifeq ($(TOPSRCDIR),)
|
||||
|
|
@ -81,4 +93,16 @@ dist:
|
|||
rpm:
|
||||
$(PYTHON) setup.py bdist_rpm
|
||||
|
||||
.PHONY: xpi clean dist rpm
|
||||
build:
|
||||
$(VIRTUALENV) --no-site-packages --distribute .
|
||||
$(PYTHON) build.py $(APPNAME) $(DEPS)
|
||||
$(EZ) nose
|
||||
$(EZ) WebTest
|
||||
$(EZ) Funkload
|
||||
$(EZ) pylint
|
||||
$(EZ) coverage
|
||||
|
||||
test:
|
||||
$(NOSE) $(TESTS)
|
||||
|
||||
.PHONY: xpi clean dist rpm build test
|
||||
|
|
|
|||
|
|
@ -0,0 +1,174 @@
|
|||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Sync Server
|
||||
#
|
||||
# The Initial Developer of the Original Code is the Mozilla Foundation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2010
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Tarek Ziade (tarek@mozilla.com)
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
|
||||
|
||||
CURDIR = os.path.dirname(__file__)
|
||||
REPO_ROOT = 'git@github.com:mozilla/%s.git'
|
||||
PYTHON = sys.executable
|
||||
|
||||
|
||||
def verify_tag(tag):
|
||||
if tag == 'tip' or tag.isdigit():
|
||||
return True
|
||||
sub = subprocess.Popen('hg tags', shell=True, stdout=subprocess.PIPE)
|
||||
tags = [tag_ for tag_ in
|
||||
[line.split()[0] for line in
|
||||
sub.stdout.read().strip().split('\n')]
|
||||
if tag_.startswith('rpm-')]
|
||||
return tag in tags
|
||||
|
||||
|
||||
def get_latest_tag():
|
||||
sub = subprocess.Popen('hg tags', shell=True, stdout=subprocess.PIPE)
|
||||
tags = [tag for tag in
|
||||
[line.split()[0] for line in
|
||||
sub.stdout.read().strip().split('\n')]
|
||||
if tag.startswith('rpm-')]
|
||||
if len(tags) == 0:
|
||||
raise ValueError('Could not find a rpm tag')
|
||||
|
||||
return tags[0]
|
||||
|
||||
|
||||
def _run(command):
|
||||
print(command)
|
||||
os.system(command)
|
||||
|
||||
|
||||
def _envname(name):
|
||||
return name.upper().replace('-', '_')
|
||||
|
||||
|
||||
def _update_cmd(project, latest_tags=False):
|
||||
if latest_tags:
|
||||
return 'git checkout -r "%s"' % get_latest_tag()
|
||||
else:
|
||||
|
||||
# looking for an environ with a specific tag or rev
|
||||
rev = os.environ.get(_envname(project))
|
||||
if rev is not None:
|
||||
|
||||
if not verify_tag(rev):
|
||||
print('Unknown tag or revision: %s' % rev)
|
||||
sys.exit(1)
|
||||
|
||||
return 'git checkout -r "%s"' % rev
|
||||
return 'git checkout'
|
||||
|
||||
|
||||
def build_app(name, latest_tags, deps):
|
||||
# building deps first
|
||||
build_deps(deps, latest_tags)
|
||||
|
||||
# build the app now
|
||||
if not _has_spec():
|
||||
latest_tags = False
|
||||
|
||||
_run(_update_cmd(name, latest_tags))
|
||||
_run('%s setup.py develop' % PYTHON)
|
||||
|
||||
|
||||
def build_deps(deps, latest_tags):
|
||||
"""Will make sure dependencies are up-to-date"""
|
||||
location = os.getcwd()
|
||||
# do we want the latest tags ?
|
||||
try:
|
||||
deps_dir = os.path.abspath(os.path.join(CURDIR, 'deps'))
|
||||
if not os.path.exists(deps_dir):
|
||||
os.mkdir(deps_dir)
|
||||
|
||||
for dep in deps:
|
||||
repo = REPO_ROOT % dep
|
||||
target = os.path.join(deps_dir, dep)
|
||||
if os.path.exists(target):
|
||||
os.chdir(target)
|
||||
_run('git pull')
|
||||
else:
|
||||
_run('git clone %s %s' % (repo, target))
|
||||
os.chdir(target)
|
||||
|
||||
update_cmd = _update_cmd(dep, latest_tags)
|
||||
_run(update_cmd)
|
||||
_run('%s setup.py develop' % PYTHON)
|
||||
finally:
|
||||
os.chdir(location)
|
||||
|
||||
|
||||
def _has_spec():
|
||||
specs = [file_ for file_ in os.listdir('.')
|
||||
if file_.endswith('.spec')]
|
||||
return len(specs)
|
||||
|
||||
|
||||
def main(project_name, deps):
|
||||
# check the provided values in the environ
|
||||
latest_tags = 'LATEST_TAGS' in os.environ
|
||||
|
||||
if not latest_tags:
|
||||
# if we have some tags in the environ, check that they are all defined
|
||||
projects = list(deps)
|
||||
|
||||
# is the root a project itself or just a placeholder ?
|
||||
if _has_spec():
|
||||
projects.append(project_name)
|
||||
|
||||
tags = {}
|
||||
missing = 0
|
||||
for project in projects:
|
||||
tag = _envname(project)
|
||||
if tag in os.environ:
|
||||
tags[tag] = os.environ[tag]
|
||||
else:
|
||||
tags[tag] = 'Not provided'
|
||||
missing += 1
|
||||
|
||||
# we want all tag or no tag
|
||||
if missing > 0 and missing < len(projects):
|
||||
print("You did not specify all tags: ")
|
||||
for project, tag in tags.items():
|
||||
print(' %s: %s' % (project, tag))
|
||||
sys.exit(1)
|
||||
|
||||
build_app(project_name, latest_tags, deps)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
project_name = sys.argv[1]
|
||||
deps = [dep.strip() for dep in sys.argv[2].split(',')]
|
||||
main(project_name, deps)
|
||||
|
|
@ -0,0 +1,103 @@
|
|||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Sync Server
|
||||
#
|
||||
# The Initial Developer of the Original Code is the Mozilla Foundation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2010
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Tarek Ziade (tarek@mozilla.com)
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
"""
|
||||
Bootstrap file -- will try to make sure _build.py is up-to-date, then run it.
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import urllib2
|
||||
|
||||
|
||||
def _rename(path):
|
||||
if not os.path.exists(path):
|
||||
return
|
||||
|
||||
root = 0
|
||||
newname = path + '.bak.%d' % root
|
||||
while os.path.exists(newname):
|
||||
root += 1
|
||||
newname = path + '.bak.%d' % root
|
||||
os.rename(path, newname)
|
||||
|
||||
|
||||
def _update():
|
||||
# getting the file age
|
||||
if os.path.exists('._build.etag'):
|
||||
with open('._build.etag') as f:
|
||||
current_etag = f.read().strip()
|
||||
headers = {'If-None-Match': current_etag}
|
||||
else:
|
||||
headers = {}
|
||||
current_etag = None
|
||||
|
||||
request = urllib2.Request('http://moz.ziade.org/_build.py',
|
||||
headers=headers)
|
||||
|
||||
# checking the last version on our server
|
||||
try:
|
||||
url = urllib2.urlopen(request, timeout=5)
|
||||
etag = url.headers.get('ETag')
|
||||
except urllib2.HTTPError, e:
|
||||
if e.getcode() != 412:
|
||||
raise
|
||||
# we're up-to-date (precondition failed)
|
||||
etag = current_etag
|
||||
except urllib2.URLError:
|
||||
# timeout error
|
||||
etag = None
|
||||
|
||||
if etag is not None and current_etag != etag:
|
||||
# we need to update our version
|
||||
_rename('_build.py')
|
||||
content = url.read()
|
||||
with open('_build.py', 'w') as f:
|
||||
f.write(content)
|
||||
|
||||
with open('._build.etag', 'w') as f:
|
||||
f.write(etag)
|
||||
|
||||
|
||||
def main():
|
||||
#_update()
|
||||
# we're good, let's import the file and run it
|
||||
mod = __import__('_build')
|
||||
project_name = sys.argv[1]
|
||||
deps = [dep.strip() for dep in sys.argv[2].split(',')]
|
||||
mod.main(project_name, deps)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
3
setup.py
3
setup.py
|
|
@ -46,8 +46,7 @@ setup(
|
|||
"python-dateutil",
|
||||
"python-openid",
|
||||
"python-memcached",
|
||||
"gdata", # google api support
|
||||
"twitter>=1.4.2"
|
||||
"linkoauth",
|
||||
],
|
||||
setup_requires=["PasteScript>=1.6.3"],
|
||||
packages=find_packages(exclude=['ez_setup']),
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче