projects
/
iramuteq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add rgl
[iramuteq]
/
checkinstall.py
diff --git
a/checkinstall.py
b/checkinstall.py
index
65af3ff
..
5fb6ef1
100644
(file)
--- a/
checkinstall.py
+++ b/
checkinstall.py
@@
-50,6
+50,11
@@
def UpgradeConf(self) :
for item,filein in dictuser.iteritems():
if not item == u'global' and not item == u'history':
shutil.copyfile(dictappli[item], filein)
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):
def CreateIraDirectory(UserConfigPath,AppliPath):
if not os.path.exists(UserConfigPath):
@@
-95,7
+100,7
@@
def FindRPAthWin32():
for progpath in progpaths :
rpath = os.path.join(progpath, "R")
if os.path.exists(rpath) :
for progpath in progpaths :
rpath = os.path.join(progpath, "R")
if os.path.exists(rpath) :
- for i in range(
7
,20):
+ for i in range(
13
,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):
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):
@@
-132,7
+137,7
@@
def install_textometrieR(self) :
dlg.Destroy()
def CheckRPackages(self):
dlg.Destroy()
def CheckRPackages(self):
- listdep = ['ca', '
gee', 'ape', 'igraph','proxy', 'wordcloud
', 'textometrieR']
+ listdep = ['ca', '
rgl', 'gee', 'ape', 'igraph','proxy', 'wordcloud', 'irlba
', 'textometrieR']
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)
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)