← Back to branch summary

~fva-openerp/openerp-tools/trunk

« back to all changes in this revision

Viewing changes to packaging61/package61.py

  • Committer: Antony Lesuisse
  • Date: 2011-12-19 23:42:04 UTC
  • Revision ID: al@openerp.com-20111219234204-2lfoqafmvtfnf8x3
packaging kvm cleanups (untested)

Show diffs side-by-side

added added

removed removed

Lines of Context:
packaging61/package61.py
87
87
        self.o = o
88
88
        self.image = image
89
89
        self.ssh_key = ssh_key
 
90
        self.login = 'openerp'
90
91
    def start(self):
91
92
        l="kvm -net nic -net user,hostfwd=tcp:127.0.0.1:10022-:22,hostfwd=tcp:127.0.0.1:18069-:8069 -drive".split(" ")
92
93
        #l.append('file=%s,if=virtio,index=0,boot=on,snapshot=on'%self.image)
102
103
            #os.kill(pid,15)
103
104
            time.sleep(5)
104
105
    def ssh(self,cmd):
105
 
        l=['ssh','-o','UserKnownHostsFile=/dev/null','-o','StrictHostKeyChecking=no','-p','10022','-i',self.ssh_key,'openerp@127.0.0.1',cmd]
 
106
        l=['ssh','-o','UserKnownHostsFile=/dev/null','-o','StrictHostKeyChecking=no','-p','10022','-i',self.ssh_key,'%s@127.0.0.1'%self.login,cmd]
106
107
        system(l)
 
108
    def rsync_ssh():
 
109
        return 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022 -i %s'%self.ssh_key
107
110
    def rsync(self,src,dest):
108
 
        l=['rsync','-rtv','-e','ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022 -i %s'%self.ssh_key,src,'openerp@127.0.0.1:%s'%dest]
 
111
        l=['rsync','-rtv','-e',self.rsync_ssh(),'--delete',src,'%s@127.0.0.1:%s'%(self.login,dest)]
109
112
        system(l)
110
113
    def run(self):
111
114
        pass
157
160
class KVMWinBuildExe(KVM):
158
161
    def run(self):
159
162
        # The revno is the one from the server
160
 
        revno = subprocess.Popen(['bzr', 'revno', self.o.server_dir], stdout=subprocess.PIPE).communicate()[0].strip()
161
 
        date = time.strftime("%Y%m%d")
162
 
        system('ssh -i %s -p 10022 Naresh@127.0.0.1 "mkdir -p openerp-packaging/server"'%(self.ssh_key,))
163
 
        system('rsync -av -e "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022 -i %s" --delete --exclude .bzr/ --exclude .bzrignore --exclude /packages/ %s/ Naresh@127.0.0.1:openerp-packaging/server' % (self.ssh_key, self.o.work))
 
163
        #revno = subprocess.Popen(['bzr', 'revno', self.o.server_dir], stdout=subprocess.PIPE).communicate()[0].strip()
 
164
        self.login = 'Naresh'
 
165
        self.ssh("mkdir -p openerp-packaging/server")
 
166
        system('rsync -av -e "%s% --delete --exclude .bzr/ --exclude .bzrignore --exclude /packages/ %s/ Naresh@127.0.0.1:openerp-packaging/server' % (self.rsync_ssh(), self.o.work))
164
167
        f = open('windows/Makefile.version','w')
165
 
        f.write("MAJOR_VERSION=%s\n" % self.o.version)
166
 
        f.write("MINOR_VERSION=%s\n" % '0')
167
 
        f.write("REVISION_VERSION=%s\n" % revno)
168
 
        f.write("BUILD_VERSION=%s\n" % date)
 
168
        f.write("VERSION=%s.%s\n" % (self.o.version,self.o.timestamp))
169
169
        f.close()
170
 
        system('rsync -av -e "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s -p 10022" --delete windows Naresh@127.0.0.1:openerp-packaging/'%(self.ssh_key,))
171
 
        system('ssh -i %s -p 10022 Naresh@127.0.0.1 "cd openerp-packaging/windows;time make allinone;"'%(self.ssh_key,))
172
 
        system('rsync -av -e "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s -p 10022" Naresh@127.0.0.1:openerp-packaging/windows/files/ %s/%s/ '%(self.ssh_key, 'packages', self.o.version))
 
170
        system('rsync -av -e "%s" --delete windows Naresh@127.0.0.1:openerp-packaging/'%(self.rsync_ssh(),))
 
171
        system('cd openerp-packaging/windows;time make allinone;');
 
172
        system('rsync -av -e "%s" Naresh@127.0.0.1:openerp-packaging/windows/files/ %s/%s/ '%(self.rsync_ssh(), 'packages', self.o.version))
173
173
        print "KVMWinBuildExe.run(): done"
174
174
 
175
175
class KVMWinBuildGtk(KVM):
251
251
if __name__ == '__main__':
252
252
    main()
253
253
 
254
 
#
255
 
#def windows_test_base(version):
256
 
#    """ Install a Windows .exe in a Windows virtual machine """
257
 
#    # The revno is the one from the server
258
 
#    revno = subprocess.Popen(['bzr','revno',os.path.join(REPOS,version,'server')], stdout=subprocess.PIPE).communicate()[0].strip()
259
 
#    date = time.strftime("%Y%m%d")
260
 
#    setuppath = "packages/%s/openerp-server-setup-%s-%s-r%s.exe" % (version, version, date, revno)
261
 
#    windows_test_setup_base(setuppath)
262
 
#
263
254
#def windows_test_setup_base(setuppath):
264
255
#    setupdir, setupexe = os.path.split(setuppath)
265
256
#    setup_no_ext, ext = os.path.splitext(setupexe)