openerp-brazil-team team mailing list archive
-
openerp-brazil-team team
-
Mailing list archive
-
Message #01369
[Merge] lp:~openerp-brazil-team/openerp/openerp-br into lp:openerp
adelcio diniz has proposed merging lp:~openerp-brazil-team/openerp/openerp-br into lp:openerp.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-brazil-team/openerp/openerp-br/+merge/104860
--
https://code.launchpad.net/~openerp-brazil-team/openerp/openerp-br/+merge/104860
Your team OpenERP Brazil Team is subscribed to branch lp:~openerp-brazil-team/openerp/openerp-br.
=== modified file 'README.txt'
--- README.txt 2011-09-14 09:41:35 +0000
+++ README.txt 2012-05-06 19:25:20 +0000
@@ -1,7 +1,7 @@
Obtaining OpenERP with bzr_set.py
=================================
-Execute bzr_set with the version you wish to use::
+Execute bzr_set with the version you wish to use:
python bzr_set.py -v 6.0
@@ -11,5 +11,4 @@
* Download the appropriate source code branches
* Setup modules in your server as symbolic links
-
All symbolic links are set in the server at this point, so you can run it directly.
=== modified file 'bzr_set.py'
--- bzr_set.py 2011-03-07 10:59:15 +0000
+++ bzr_set.py 2012-05-06 19:25:20 +0000
@@ -19,15 +19,23 @@
f._setup_outf()
return f.run(*args, **kwargs)
-_VERSIONS = ('4.2', '5.0', '6.0', 'trunk')
-_DEFAULT_VERSION = '6.0'
+_VERSIONS = ('4.2', '5.0', '6.0', '6.1', 'trunk')
+_DEFAULT_VERSION = '6.1'
_EXTRA_ADDONS_MAP = {
'4.2': '4.2-extra-addons',
'5.0': 'stable_5.0-extra-addons',
'6.0': 'extra-6.0',
+ '6.1': 'trunk-extra-addons',
'trunk': 'trunk-extra-addons',
}
+_L10N_MAP = {
+ '5.0': '5.0',
+ '6.0': '6.0',
+ '6.1': 'trunk',
+ 'trunk': 'trunk',
+}
+
def update_openerp(dest_dir, version=_DEFAULT_VERSION, lplogin=None, export=False, revision=None, verbose=False):
"""
if lplogin == None -> make a branch instead of a checkout
@@ -49,27 +57,44 @@
BASEURL = 'lp:'
else:
BASEURL = 'bzr+ssh://%s@xxxxxxxxxxxxxxxxxxxx/' % (lplogin,)
-
+
# map branch URLs according to version
extraversion = _EXTRA_ADDONS_MAP[version]
communityversion = 'trunk'
webversion = version
+ l10nversion = _L10N_MAP[version]
bzr_repository = {
- 'server': (BASEURL + '~openerp/openobject-server/' + version, True),
+ 'server': (BASEURL + '~openerp/openobject-server/' + version, True),
'client': (BASEURL + '~openerp/openobject-client/' + version, True),
'addons': (BASEURL + '~openerp/openobject-addons/' + version, True),
'addons-extra': (BASEURL + '~openerp-commiter/openobject-addons/' + extraversion, False),
- 'addons-community': (BASEURL + '~openerp-community/openobject-addons/' + communityversion + '-addons-community', False),
+ #'addons-community': (BASEURL + '~openerp-community/openobject-addons/' + communityversion + '-addons-community', False),
'web': (BASEURL + '~openerp/openobject-client-web/' + webversion, True),
- }
-
- bzr_links = {
- 'addons/*': 'server/bin/addons/',
- }
+ 'br': (BASEURL + '~openerp-brazil-core-team/openerp.pt-br-localiz/' + l10nversion, True),
+ }
+
+ bzr_l10n_links = {
+ 'br/*': 'addons/',
+ 'addons-extra/account_fiscal_position_rule': 'addons/',
+ 'addons-extra/account_fiscal_position_rule_sale': 'addons/',
+ 'addons-extra/account_fiscal_position_rule_stock': 'addons/',
+ 'addons-extra/account_fiscal_position_rule_purchase': 'addons/',
+ 'addons-extra/account_product_fiscal_classification': 'addons/',
+ }
+
+ if version in ('4.2', '5.0', '6.0'):
+ bzr_links = {
+ 'addons/*': 'server/bin/addons/',
+ }
+ else:
+ bzr_links = {
+ 'addons/*': 'server/openerp/addons/',
+ }
+ bzr_repository['web'] = (BASEURL + '~openerp/openerp-web/' + webversion, True)
if branch:
- cmd = {'new': lambda u, l, r: run_cmd('branch', u, l, revision=r),
+ cmd = {'new': lambda u, l, r: run_cmd('branch', u, l, stacked=True, revision=r),
'update': lambda u, l, r: run_cmd('pull', u, directory=l, overwrite=True, revision=r),
}
else:
@@ -110,6 +135,17 @@
cmd[status](bzrdir, local, rev and [rev] or None)
# Doing symlinks
+ log('(Re)Computing l10n Symbolic links...')
+ for src2,dest2 in bzr_l10n_links.items():
+ src2 = os.path.join(dest_dir, src2)
+ dest2 = os.path.join(dest_dir, dest2)
+ for src in glob.glob(src2):
+ dest = os.path.join(dest2, os.path.basename(src))
+ if not os.path.isdir(dest):
+ os.symlink(os.path.realpath(src), dest)
+
+
+ # Doing symlinks
log('(Re)Computing Symbolic links...')
for src2,dest2 in bzr_links.items():
src2 = os.path.join(dest_dir, src2)
@@ -120,9 +156,11 @@
os.symlink(os.path.realpath(src), dest)
log('='*79)
- log('Sources of OpenERP have been installed. If you develop new features,')
- log('you can get more information on how to contribute to the project here:')
- log('\thttp://test.openobject.com')
+ log('Sources of OpenERP and Brazilian localization have been installed. ')
+ log('If you develop new features, you can get more information on how to ')
+ log('contribute to the project here:')
+ log('\thttp://www.openobject.com/community')
+ log('\thttp://www.openerpbrasil.org' )
log('='*79)
#