[IMP] move webrelease into addons/web

bzr revid: al@openerp.com-20110909141317-uvo90sxlg8o5w9dx

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 290bca1..a6e438a 100644 (file)
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -1,6 +1,5 @@
 {
     "name" : "web",
-    "version" : "2.0",
     "depends" : [],
     'active': True,
     'js' : [

diff --git a/addons/web/common/release.py b/addons/web/common/release.py
new file mode 100644 (file)
index 0000000..47570c0
--- /dev/null
+++ b/addons/web/common/release.py
@@ -0,0 +1,10 @@
+name = 'openerp-web'
+version = '6.1.0 alpha'
+description = "Web Client of OpenERP, the Enterprise Management Software"
+long_description = "OpenERP Web is the web client of the OpenERP, a free enterprise management software"
+author = "OpenERP SA"
+author_email = "info@openerp.com"
+support_email = 'support@openerp.com'
+url = "http://www.openerp.com/"
+download_url = ''
+license = "AGPL"

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 415db15..c85072d 100644 (file)
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -12,17 +12,18 @@ import textwrap
 import xmlrpclib
 import time
 import zlib
-import webrelease
 from xml.etree import ElementTree
 from cStringIO import StringIO
 
+from babel.messages.pofile import read_po
+
 import web.common.dispatch as openerpweb
 import web.common.ast
 import web.common.nonliterals
+import web.common.release
 openerpweb.ast = web.common.ast
 openerpweb.nonliterals = web.common.nonliterals
 
-from babel.messages.pofile import read_po
 
 # Should move to openerpweb.Xml2Json
 class Xml2Json:
@@ -195,7 +196,7 @@ class WebClient(openerpweb.Controller):
     @openerpweb.jsonrequest
     def version_info(self, req):
         return {
-            "version": webrelease.version
+            "version": web.common.release.version
         }
 
 class Database(openerpweb.Controller):

diff --git a/setup.py b/setup.py
index cbbd469..45be08f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import re
 import sys
 from setuptools import setup
 
-execfile('webrelease.py')
+execfile('addons/web/common/release.py')
 
 version_dash_incompatible = False
 if 'bdist_rpm' in sys.argv:

diff --git a/webrelease.py b/webrelease.py
deleted file mode 100644 (file)
index 77eb46d..0000000
--- a/webrelease.py
+++ /dev/null
@@ -1,11 +0,0 @@
-
-name = 'openerp-web-proto'
-version = '6.1.0 alpha'
-description = "Web Client of OpenERP, the Enterprise Management Software"
-long_description = "OpenERP Web is the web client of the OpenERP, a free enterprise management software"
-author = "OpenERP S.A."
-author_email = "info@openerp.com"
-support_email = 'support@openerp.com'
-url = "http://www.openerp.com/"
-download_url = ''
-license = "OEPL"