From 73de0138dedfe0faaae857544746915315a0dbeb Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Tue, 2 Sep 2014 17:25:18 +0200
Subject: [PATCH] [FIX] Windows packaging: correct Makefile.version writing and
remove useless lib installation
---
setup/package.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/setup/package.py b/setup/package.py
index 36f71a7bdc8f..9bcf321fc81a 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -198,15 +198,13 @@ class KVM(object):
class KVMWinBuildExe(KVM):
def run(self):
- self.ssh("mkdir -p build")
- self.ssh('easy_install decorator') # TODO sle: cannot figure how to include it in the vdi properly ...
- self.ssh('easy_install passlib')
- self.rsync('%s/ %s@127.0.0.1:build/server/' % (self.o.build_dir, self.login))
with open(join(self.o.build_dir, 'setup/win32/Makefile.version'), 'w') as f:
f.write("VERSION=%s\n" % self.o.version_full)
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('.', ''))
- self.rsync('%s %s@127.0.0.1:build/server/setup/win32/' % (join(self.o.build_dir, 'setup/win32'), self.login))
+
+ self.ssh("mkdir -p build")
+ self.rsync('%s/ %s@127.0.0.1:build/server/' % (self.o.build_dir, self.login))
self.ssh("cd build/server/setup/win32;time make allinone;")
self.rsync('%s@127.0.0.1:build/server/setup/win32/release/ %s/' % (self.login, self.o.build_dir), '')
print "KVMWinBuildExe.run(): done"
--
GitLab