projects
/
pithos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into debian-0.9
[pithos]
/
fabfile.py
diff --git
a/fabfile.py
b/fabfile.py
index
78ee633
..
3a08c56
100644
(file)
--- a/
fabfile.py
+++ b/
fabfile.py
@@
-42,8
+42,7
@@
from fabric.colors import *
env.project_root = "./"
env.develop = False
env.autoremove = True
env.project_root = "./"
env.develop = False
env.autoremove = True
-env.packages = ['snf-pithos-lib', 'snf-pithos-backend', 'snf-pithos-app',
- 'snf-pithos-tools']
+env.packages = ['snf-pithos-backend', 'snf-pithos-app', 'snf-pithos-tools']
env.capture = False
env.colors = True
env.pypi_root = 'pypi'
env.capture = False
env.colors = True
env.pypi_root = 'pypi'
@@
-53,12
+52,11
@@
env.roledefs = {
}
}
-# colored logging
+# coloured logging
notice = lambda x: sys.stdout.write(yellow(x) + "\n")
info = lambda x: sys.stdout.write(green(x) + "\n")
error = lambda x: sys.stdout.write(red(x) + "\n")
notice = lambda x: sys.stdout.write(yellow(x) + "\n")
info = lambda x: sys.stdout.write(green(x) + "\n")
error = lambda x: sys.stdout.write(red(x) + "\n")
-
def dev():
env.develop = True
def dev():
env.develop = True
@@
-87,7
+85,10
@@
def remove_pkg(p):
def build_pkg(p):
info ("building package: %s" % p)
with lcd(package_root(p)):
def build_pkg(p):
info ("building package: %s" % p)
with lcd(package_root(p)):
- local("rm -r dist build")
+ try:
+ local("rm -r dist build")
+ except:
+ pass
local("python setup.py egg_info -d sdist")
local("python setup.py egg_info -d sdist")
@@
-167,9
+168,8
@@
def co(c):
# Debian packaging helpers
#
# Debian packaging helpers
#
-env.debian_branch = 'debian-0.8'
-env.deb_packages = ['snf-pithos-lib', 'snf-pithos-backend',
- 'snf-pithos-tools', 'snf-pithos-app']
+env.debian_branch = 'debian-0.9'
+env.deb_packages = ['snf-pithos-backend', 'snf-pithos-tools', 'snf-pithos-app']
env.signdebs = False
env.debrelease = False # Increase release number in Debian changelogs
env.upstream = 'packaging'
env.signdebs = False
env.debrelease = False # Increase release number in Debian changelogs
env.upstream = 'packaging'
@@
-223,7
+223,7
@@
def signdebs():
env.signdebs = True
env.signdebs = True
-def builddeb(p, master="packaging", branch="debian-0.8"):
+def builddeb(p, master="packaging", branch="debian-0.9"):
with co(branch):
info("Building debian package for %s" % p)
with lcd(package_root(p)):
with co(branch):
info("Building debian package for %s" % p)
with lcd(package_root(p)):
@@
-239,7
+239,7
@@
def builddeb(p, master="packaging", branch="debian-0.8"):
info("Done building debian package for %s" % p)
info("Done building debian package for %s" % p)
-def builddeball(b="debian-0.8"):
+def builddeball(b="debian-0.9"):
for p in env.deb_packages:
builddeb(p=p, branch=b)
for p in env.deb_packages:
builddeb(p=p, branch=b)
@@
-249,3
+249,4
@@
def builddeball(b="debian-0.8"):
def uploadtars():
put("packages/*.tar.gz", 'www/pypi/')
def uploadtars():
put("packages/*.tar.gz", 'www/pypi/')
+