X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=checkinstall.py;h=e7dca8a83bdc89529b6ece203bf388ba8ecf0e40;hp=38640edf16e94e08a22e2ba650d8f09ec5eb8e8b;hb=002e6a566810e7b7d3349c94e2ef49b3ed1a35b5;hpb=d33694ef233bd4a28e69d88e9eef3c5c129442fe diff --git a/checkinstall.py b/checkinstall.py index 38640ed..e7dca8a 100644 --- a/checkinstall.py +++ b/checkinstall.py @@ -2,12 +2,12 @@ # -*- coding: utf-8 -*- #Author: Pierre Ratinaud #Copyright (c) 2008 Pierre Ratinaud -#Lisense: GNU/GPL +#License: GNU/GPL import os import sys import shutil -from chemins import ConstructConfigPath +from chemins import ConstructConfigPath, ConstructDicoPath from functions import exec_rcode, exec_RCMD import wx import tempfile @@ -23,37 +23,67 @@ def IsNew(self): version_user = self.pref.get('iramuteq','version_nb').split('.') except NoOptionError : return True + userab = False + globab = False if version_user : version_user[0] = int(version_user[0]) version_user[1] = int(version_user[1]) version_glob[0] = int(version_glob[0]) version_glob[1] = int(version_glob[1]) + if len(version_user) == 3 : + if 'a' in version_user[2] : + userab = 'a' + version_user[2] = int(version_user[2].replace('a', '')) + elif 'b' in version_user[2] : + userab = 'b' + version_user[2] = int(version_user[2].replace('b', '')) + else : + version_user[2] = int(version_user[2]) + if len(version_glob) == 3 : + if 'a' in version_glob[2] : + globab = 'a' + version_glob[2] = int(version_glob[2].replace('a', '')) + elif 'b' in version_glob[2] : + globab = 'b' + version_glob[2] = int(version_glob[2].replace('b', '')) + else : + version_glob[2] = int(version_glob[2]) if len(version_user) == len(version_glob) : if version_glob > version_user : return True + elif version_glob == version_user : + if globab == userab : + return False + elif globab > userab : + return True + else : + return False else : return False - if len(version_glob) == 2 : - if version_glob[:2] >= version_user[:2] : + else : + if version_glob > version_user : return True else : return False - elif len(version_glob) == 3 : - if version_glob[:2] <= version_user[:2] : - return False - else : - return True def UpgradeConf(self) : + log.info('upgrade conf') dictuser = self.ConfigPath dictappli = ConstructConfigPath(self.AppliPath, user = False) for item,filein in dictuser.iteritems(): if not item == u'global' and not item == u'history': shutil.copyfile(dictappli[item], filein) + dicoUser = self.DictPath + dicoAppli = ConstructDicoPath(self.AppliPath) + for fi in dicoUser : + if not os.path.exists(dicoUser[fi]) and os.path.exists(dicoAppli[fi]): + shutil.copyfile(dicoAppli[fi], dicoUser[fi]) def CreateIraDirectory(UserConfigPath,AppliPath): if not os.path.exists(UserConfigPath): os.mkdir(UserConfigPath) + if not os.path.exists(os.path.join(UserConfigPath, 'dictionnaires')) : + os.mkdir(os.path.join(UserConfigPath, 'dictionnaires')) def CopyConf(self) : DictUser = self.ConfigPath @@ -67,6 +97,11 @@ def CopyConf(self) : if item == u'preferences' : if not os.path.exists(filein) : shutil.copyfile(DictAppli[item],filein) + dicoUser = self.DictPath + dicoAppli = ConstructDicoPath(self.AppliPath) + for fi in dicoUser : + if not os.path.exists(dicoUser[fi]) and os.path.exists(dicoAppli[fi]): + shutil.copyfile(dicoAppli[fi], dicoUser[fi]) def CheckRPath(PathPath): if not os.path.exists(PathPath.get('PATHS','rpath')): @@ -87,12 +122,14 @@ def FindRPAthWin32(): if progpaths != [] : for progpath in progpaths : rpath = os.path.join(progpath, "R") - if os.path.exists(rpath) : - for i in range(7,20): - for j in range(0,15): - path=os.path.join(rpath,"R-2."+str(i)+"."+str(j),'bin','R.exe') - if os.path.exists(path): - BestPath=path + if os.path.exists(rpath) : + for maj in range(2,4) : + for i in range(0,30): + for j in range(0,20): + for poss in ['', 'i386', 'x64'] : + path=os.path.join(rpath,"R-%i.%i.%i" % (maj, i, j),'bin',poss,'R.exe') + if os.path.exists(path): + BestPath=path return BestPath def FindRPathNix(): @@ -110,22 +147,8 @@ def RLibsAreInstalled(self) : else : return True -def install_textometrieR(self) : - dlg = wx.ProgressDialog("Installation de textometrieR", - "Veuillez patientez...", - maximum= 2, - parent=self, - style=wx.PD_APP_MODAL | wx.PD_AUTO_HIDE | wx.PD_ELAPSED_TIME | wx.PD_CAN_ABORT - ) - dlg.Center() - dlg.Update(1, 'Installation de textometrieR') - path = os.path.join(self.AppliPath, 'Rlib', 'textometrieR') - exec_RCMD(self.RPath, path) - dlg.Update(2,'fini') - dlg.Destroy() - def CheckRPackages(self): - listdep = ['ca', 'gee', 'ape', 'igraph','proxy', 'wordcloud', 'textometrieR'] + listdep = ['ca', 'rgl', 'gee', 'ape', 'igraph','proxy', 'wordcloud', 'irlba', 'textometry'] nolib = [] i=0 dlg = wx.ProgressDialog("Test des librairies de R", "test en cours...", maximum = len(listdep), parent=self, style=wx.PD_APP_MODAL | wx.PD_AUTO_HIDE | wx.PD_ELAPSED_TIME | wx.PD_CAN_ABORT) @@ -145,10 +168,6 @@ def CheckRPackages(self): log.info('packages %s : OK' % bib) dlg.Update(len(listdep),'fini') dlg.Destroy() - install_textoR = False - if 'textometrieR' in nolib : - nolib.pop(nolib.index('textometrieR')) - install_textoR = True if nolib != [] : txt = '\n'.join(nolib) msg = u"""Les bibliothèques de R suivantes sont manquantes : @@ -164,7 +183,7 @@ Sans ces bibliothèques, IRamuteq ne fonctionnera pas. - ou laisser IRamuteq les installer automatiquement en cliquant sur VALIDER . Les bibliothèques seront téléchargées depuis le site miroir de R %s. """ % (txt, self.pref.get('iramuteq','rmirror')) - dial = wx.MessageDialog(self, msg, u"Installation incomplète", wx.OK | wx.CANCEL | wx.NO_DEFAULT | wx.ICON_WARNING) + dial = wx.MessageDialog(self, msg, u"Installation incomplète", wx.OK | wx.CANCEL | wx.ICON_WARNING) dial.CenterOnParent() val = dial.ShowModal() if val == wx.ID_OK : @@ -205,9 +224,7 @@ Sans ces bibliothèques, IRamuteq ne fonctionnera pas. dlg.Update(len(nolib) + 1, 'fin') dlg.Destroy() dial.Destroy() - if install_textoR : - install_textometrieR(self) - if nolib == [] and not install_textoR : + if nolib == [] : self.pref.set('iramuteq', 'rlibs', True) with open(self.ConfigPath['preferences'], 'w') as f : self.pref.write(f)