diff options
Diffstat (limited to 'setup/package.py')
| -rwxr-xr-x | setup/package.py | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/setup/package.py b/setup/package.py index 862d54def63..d5bd0564423 100755 --- a/setup/package.py +++ b/setup/package.py @@ -17,11 +17,12 @@ from os.path import abspath, dirname, join from sys import stdout from tempfile import NamedTemporaryFile +# apt-get install rsync python-pexpect debhelper python-setuptools #---------------------------------------------------------- # Utils #---------------------------------------------------------- -execfile(join(dirname(__file__), '..', 'openerp', 'release.py')) +execfile(join(dirname(__file__), '..', 'odoo', 'release.py')) version = version.split('-')[0] timestamp = time.strftime("%Y%m%d", time.gmtime()) GPGPASSPHRASE = os.getenv('GPGPASSPHRASE') @@ -33,7 +34,6 @@ PUBLISH_DIRS = { 'windows': 'exe', } ADDONS_NOT_TO_PUBLISH = [ - 'web_analytics' ] def mkdir(d): @@ -196,9 +196,11 @@ class KVM(object): class KVMWinBuildExe(KVM): def run(self): with open(join(self.o.build_dir, 'setup/win32/Makefile.version'), 'w') as f: - f.write("VERSION=%s\n" % self.o.version_full) + f.write("VERSION=%s\n" % version) with open(join(self.o.build_dir, 'setup/win32/Makefile.python'), 'w') as f: f.write("PYTHON_VERSION=%s\n" % self.o.vm_winxp_python_version.replace('.', '')) + with open(join(self.o.build_dir, 'setup/win32/Makefile.servicename'), 'w') as f: + f.write("SERVICENAME=%s\n" % nt_service_name) self.ssh("mkdir -p build") self.rsync('%s/ %s@127.0.0.1:build/server/' % (self.o.build_dir, self.login)) @@ -208,8 +210,6 @@ class KVMWinBuildExe(KVM): class KVMWinTestExe(KVM): def run(self): - # Cannot use o.version_full when the version is not correctly parsed - # (for instance, containing *rc* or *dev*) setuppath = glob("%s/openerp-server-setup-*.exe" % self.o.build_dir)[0] setupfile = setuppath.split('/')[-1] setupversion = setupfile.split('openerp-server-setup-')[1].split('.exe')[0] @@ -217,8 +217,8 @@ class KVMWinTestExe(KVM): self.rsync('"%s" %s@127.0.0.1:' % (setuppath, self.login)) self.ssh("TEMP=/tmp ./%s /S" % setupfile) self.ssh('PGPASSWORD=openpgpwd /cygdrive/c/"Program Files"/"Odoo %s"/PostgreSQL/bin/createdb.exe -e -U openpg mycompany' % setupversion) - self.ssh('/cygdrive/c/"Program Files"/"Odoo %s"/server/openerp-server.exe -d mycompany -i base --stop-after-init' % setupversion) - self.ssh('net start odoo-server-%s' % version) + self.ssh('/cygdrive/c/"Program Files"/"Odoo %s"/server/odoo-bin.exe -d mycompany -i base --stop-after-init' % setupversion) + self.ssh('net start %s' % nt_service_name) _rpc_count_modules(port=18069) #---------------------------------------------------------- @@ -232,9 +232,9 @@ def _prepare_build_dir(o, win32=False): try: for addon_path in glob(join(o.build_dir, 'addons/*')): if addon_path.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH: - shutil.move(addon_path, join(o.build_dir, 'openerp/addons')) + shutil.move(addon_path, join(o.build_dir, 'odoo/addons')) except shutil.Error: - # Thrown when the add-on is already in openerp/addons (if _prepare_build_dir + # Thrown when the add-on is already in odoo/addons (if _prepare_build_dir # has already been called once) pass @@ -291,11 +291,11 @@ def _prepare_testing(o): subprocess.call(["docker", "build", "-t", "odoo-%s-debian-nightly-tests" % version, "."], cwd=os.path.join(o.build_dir, "docker_debian")) if not o.no_rpm: - subprocess.call(["mkdir", "docker_centos"], cwd=o.build_dir) - subprocess.call(["cp", "package.dfcentos", os.path.join(o.build_dir, "docker_centos", "Dockerfile")], + subprocess.call(["mkdir", "docker_fedora"], cwd=o.build_dir) + subprocess.call(["cp", "package.dffedora", os.path.join(o.build_dir, "docker_fedora", "Dockerfile")], cwd=os.path.join(o.odoo_dir, "setup")) - subprocess.call(["docker", "build", "-t", "odoo-%s-centos-nightly-tests" % version, "."], - cwd=os.path.join(o.build_dir, "docker_centos")) + subprocess.call(["docker", "build", "-t", "odoo-%s-fedora-nightly-tests" % version, "."], + cwd=os.path.join(o.build_dir, "docker_fedora")) def test_tgz(o): with docker('odoo-%s-src-nightly-tests' % version, o.build_dir, o.pub) as wheezy: @@ -307,8 +307,8 @@ def test_tgz(o): wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"') wheezy.system('mkdir /var/lib/odoo') wheezy.system('chown odoo:odoo /var/lib/odoo') - wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/openerp/addons -d mycompany -i base --stop-after-init"') - wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/openerp/addons -d mycompany &"') + wheezy.system('su odoo -s /bin/bash -c "odoo --addons-path=/usr/local/lib/python2.7/dist-packages/odoo/addons -d mycompany -i base --stop-after-init"') + wheezy.system('su odoo -s /bin/bash -c "odoo --addons-path=/usr/local/lib/python2.7/dist-packages/odoo/addons -d mycompany &"') def test_deb(o): with docker('odoo-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy: @@ -317,20 +317,20 @@ def test_deb(o): wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"') wheezy.system('/usr/bin/dpkg -i /opt/release/%s' % wheezy.release) wheezy.system('/usr/bin/apt-get install -f -y') - wheezy.system('su odoo -s /bin/bash -c "odoo.py -c /etc/odoo/openerp-server.conf -d mycompany -i base --stop-after-init"') - wheezy.system('su odoo -s /bin/bash -c "odoo.py -c /etc/odoo/openerp-server.conf -d mycompany &"') + wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany -i base --stop-after-init"') + wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany &"') def test_rpm(o): - with docker('odoo-%s-centos-nightly-tests' % version, o.build_dir, o.pub) as centos7: - centos7.release = '*.noarch.rpm' + with docker('odoo-%s-fedora-nightly-tests' % version, o.build_dir, o.pub) as fedora24: + fedora24.release = '*.noarch.rpm' # Start postgresql - centos7.system('su postgres -c "/usr/bin/pg_ctl -D /var/lib/postgres/data start"') - centos7.system('sleep 5') - centos7.system('su postgres -c "createdb mycompany"') + fedora24.system('su postgres -c "/usr/bin/pg_ctl -D /var/lib/postgres/data start"') + fedora24.system('sleep 5') + fedora24.system('su postgres -c "createdb mycompany"') # Odoo install - centos7.system('yum install -d 0 -e 0 /opt/release/%s -y' % centos7.release) - centos7.system('su odoo -s /bin/bash -c "openerp-server -c /etc/odoo/openerp-server.conf -d mycompany -i base --stop-after-init"') - centos7.system('su odoo -s /bin/bash -c "openerp-server -c /etc/odoo/openerp-server.conf -d mycompany &"') + fedora24.system('dnf install -d 0 -e 0 /opt/release/%s -y' % fedora24.release) + fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany -i base --stop-after-init"') + fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany &"') def test_exe(o): KVMWinTestExe(o, o.vm_winxp_image, o.vm_winxp_ssh_key, o.vm_winxp_login).start() @@ -402,7 +402,6 @@ def options(): op.add_option("-b", "--build-dir", default=build_dir, help="build directory (%default)", metavar="DIR") op.add_option("-p", "--pub", default=None, help="pub directory (%default)", metavar="DIR") op.add_option("", "--no-testing", action="store_true", help="don't test the builded packages") - op.add_option("-v", "--version", default='9.0', help="version (%default)") op.add_option("", "--no-debian", action="store_true", help="don't build the debian package") op.add_option("", "--no-rpm", action="store_true", help="don't build the rpm package") @@ -419,9 +418,8 @@ def options(): # derive other options o.odoo_dir = root o.pkg = join(o.build_dir, 'pkg') - o.version_full = '%s-%s' % (o.version, timestamp) - o.work = join(o.build_dir, 'openerp-%s' % o.version_full) - o.work_addons = join(o.work, 'openerp', 'addons') + o.work = join(o.build_dir, 'openerp-%s' % version) + o.work_addons = join(o.work, 'odoo', 'addons') return o |