Merge lp:~romaia/stoq/stoq-dev into lp:~stoq-dev/stoq/master-old

Proposed by Ronaldo Maia
Status: Merged
Approved by: Ronaldo Maia
Approved revision: 1578
Merged at revision: not available
Proposed branch: lp:~romaia/stoq/stoq-dev
Merge into: lp:~stoq-dev/stoq/master-old
Diff against target: None lines
To merge this branch: bzr merge lp:~romaia/stoq/stoq-dev
Reviewer Review Type Date Requested Status
George Kussumoto (community) Approve
Review via email: mp+9600@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ronaldo Maia (romaia) wrote :

Atualizando o script stoq-dev para usar o bzr do launchpad.

Revision history for this message
George Kussumoto (georgeyk) wrote :

Ficou faltando o common/, mas se vamos usar o ppa ele é desnecessário.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tools/stoq-dev'
--- tools/stoq-dev 2008-04-14 15:47:36 +0000
+++ tools/stoq-dev 2009-08-03 20:43:09 +0000
@@ -24,58 +24,42 @@
24import subprocess24import subprocess
25import sys25import sys
2626
27# SVN_USER or None for anonymous
28SVN_USER = None
29
30def geturl(project):
31 if SVN_USER:
32 return 'svn+ssh://svn.async.com.br/pub/%s' % (project,)
33 else:
34 return 'svn://svn.async.com.br/%s' % (project,)
35
36class Project(object):27class Project(object):
37 name = None28 name = None
38 env = {}29 env = {}
39 repo = ''30 repo = ''
4031
41class SVNProject(Project):32class BzrProject(Project):
42 def checkout(self):33 def checkout(self):
43 cmd = 'svn co -q %s/trunk %s' % (self.repo, self.name)34 cmd = 'bzr branch %s %s' % (self.repo, self.name)
44 os.system(cmd)
45
46 if SVN_USER is None:
47 return
48 cmd = ('cd %s/common && '
49 'svn switch --relocate svn://svn.async.com.br/common '
50 'svn+ssh://svn.async.com.br/common') % (self.name)
51 os.system(cmd)35 os.system(cmd)
5236
53 def update(self):37 def update(self):
54 cmd = 'svn update'38 cmd = 'bzr pull'
55 os.system(cmd)39 os.system(cmd)
5640
57class Stoq(SVNProject):41class Stoq(BzrProject):
58 name = 'stoq'42 name = 'stoq'
59 env = {'PYTHONPATH': '$tree',43 env = {'PYTHONPATH': '$tree',
60 'PATH': '$tree/bin'}44 'PATH': '$tree/bin'}
61 repo = geturl('stoq')45 repo = 'lp:stoq'
6246
63class Stoqlib(SVNProject):47class Stoqlib(BzrProject):
64 name = 'stoqlib'48 name = 'stoqlib'
65 env = {'PYTHONPATH': '$tree'}49 env = {'PYTHONPATH': '$tree'}
66 repo = geturl('stoqlib')50 repo = 'lp:stoqlib'
6751
68class Stoqdrivers(SVNProject):52class Stoqdrivers(BzrProject):
69 name = 'stoqdrivers'53 name = 'stoqdrivers'
70 env = {'PYTHONPATH': '$tree'}54 env = {'PYTHONPATH': '$tree'}
71 repo = geturl('stoqdrivers')55 repo = 'lp:stoqdrivers'
7256
73class Kiwi(SVNProject):57class Kiwi(BzrProject):
74 name = 'kiwi'58 name = 'kiwi'
75 env = {'PYTHONPATH': '$tree',59 env = {'PYTHONPATH': '$tree',
76 'GAZPACHO_PATH': '$tree/gazpacho-plugin',60 'GAZPACHO_PATH': '$tree/gazpacho-plugin',
77 'PATH': '$tree/bin'}61 'PATH': '$tree/bin'}
78 repo = geturl('kiwi')62 repo = 'lp:kiwi'
7963
80PROJECTS = {64PROJECTS = {
81 'stoqlib': Stoqlib(),65 'stoqlib': Stoqlib(),

Subscribers

People subscribed via source and target branches