[windows installer] fix #1668

check python version
add Gpg4win installation
This commit is contained in:
Bezleputh 2014-11-24 17:02:30 +01:00 committed by Florent
commit 2aa44acd20
2 changed files with 234 additions and 170 deletions

View file

@ -1,6 +1,9 @@
set WEBOOB_VERSION=0.i
set WEBOOB=weboob-0.i-py2.7.egg
set WEBOOB_VERSION=1.0
set WEBOOB=weboob-1.0-py2.7.egg
set LIST_APPLIQUATIONS_QT=qboobmsg qcineoob qcookboob qflatboob qhandjoob qhavedate qvideoob qwebcontentedit weboob-config-qt
REM x32 | x64
set ARCHITECTURE=x32
set ARCHITECTURE=x64
set LOCAL_ARCHITECTURE=x64
REM version required for WEBOOB
set PYTHON_VERSION=2.7
set PYTHON_MINOR_VERSION=6

View file

@ -14,28 +14,63 @@ echo 1.GNU/WGET Init
set WGET=wget-%ARCHITECTURE%.exe
echo.
echo 2.Check Python 2.7 Installation
echo 2.Check Python Installation
rem check first possible key
set KEY_NAME=HKLM\Software\Python\PythonCore\2.7\InstallPath
if %ARCHITECTURE% == x64 (
set KEY_NAME=HKLM\SOFTWARE\Python\PythonCore\2.7\InstallPath
)
REG QUERY !KEY_NAME! > nul || (
set PYTHON_MSI=python-2.7.5.msi
set IsPythonInstalled=0
REG QUERY !KEY_NAME! >NUL 2>NUL
if %ERRORLEVEL% EQU 0 (
set IsPythonInstalled=1
) else (
rem first key doesn't exist, test the second possible key
set KEY_NAME=HKCU\Software\Python\PythonCore\2.7\InstallPath
REG QUERY !KEY_NAME! >NUL 2>NUL
if %ERRORLEVEL% EQU 0 (
set IsPythonInstalled=1
)
)
if %IsPythonInstalled% EQU 1 (
rem check installed python version
for /F "tokens=4" %%A IN ('REG QUERY !KEY_NAME!') do (
set PythonPath=%%A
)
!PythonPath!python.exe --version 2>&1 | find /i "!PYTHON_VERSION!" > tmp.txt
if %ERRORLEVEL% EQU 1 (
set IsPythonInstalled=0
) else (
FOR /F "eol=; tokens=3 delims=." %%i in (tmp.txt) do set minor_version=%%i
if !minor_version! LSS !PYTHON_MINOR_VERSION! (
set IsPythonInstalled=0
)
)
del tmp.txt
)
if %IsPythonInstalled% EQU 0 (
rem Python is not installed
set PYTHON_MSI=python-!PYTHON_VERSION!.msi
if %ARCHITECTURE% == x64 (
set PYTHON_MSI=python-2.7.5.amd64.msi
set PYTHON_MSI=python-!PYTHON_VERSION!.amd64.msi
)
echo 2.1 Download !PYTHON_MSI!
"%WGET%" -o python_donwload --no-check-certificate "http://www.python.org/ftp/python/2.7.5/!PYTHON_MSI!"
"%WGET%" -o python_donwload --no-check-certificate "http://www.python.org/ftp/python/!PYTHON_VERSION!/!PYTHON_MSI!"
echo 2.2 Setup !PYTHON_MSI!
!PYTHON_MSI!
del !PYTHON_MSI!
del python_donwload
)
)
for /F "tokens=4" %%A IN ('REG QUERY !KEY_NAME!') do (
set PythonPath=%%A
@ -47,22 +82,40 @@ set KEY_NAME=HKLM\Software\PyQt4\Py2.7\InstallPath
REG QUERY %KEY_NAME% > nul || (
echo 3.1 Download PyQt4
"%WGET%" -o qt_download http://heanet.dl.sourceforge.net/project/pyqt/PyQt4/PyQt-4.10.3/PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-%ARCHITECTURE%.exe
"%WGET%" -o qt_download http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.3/PyQt4-4.11.3-gpl-Py2.7-Qt4.8.6-%ARCHITECTURE%.exe
echo 3.2 Setup PyQt4
PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-%ARCHITECTURE%.exe
PyQt4-4.11.3-gpl-Py2.7-Qt4.8.6-%ARCHITECTURE%.exe
del PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-%ARCHITECTURE%.exe
del PyQt4-4.11.3-gpl-Py2.7-Qt4.8.6-%ARCHITECTURE%.exe
del qt_download
)
echo.
echo 4.Check EasyInstall
echo 4.Check Gpg4win Installation
set ShouldReboot=0
set KEY_NAME=HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\GPG4Win
REG QUERY %KEY_NAME% > nul || (
echo 4.1 Download Gpg4win
"%WGET%" -o gpg4win_download http://files.gpg4win.org/gpg4win-2.2.2.exe
echo 4.2 Setup Gpg4win
gpg4win-2.2.2.exe
set ShouldReboot=1
del gpg4win-2.2.2.exe
del gpg4win_download
)
echo.
echo 5.Check EasyInstall
if exist "%PythonPath%Scripts\easy_install.exe" (
goto :InstallWeboobDependances
) else (
echo 4.1 Setup setuptools
echo 5.1 Setup setuptools
%PythonPath%python.exe ez_setup.py || goto :InstallFailed
del setuptools-1.1.6.tar.gz
@ -72,7 +125,7 @@ if exist "%PythonPath%Scripts\easy_install.exe" (
:InstallWeboobDependances
echo.
echo 5.Install Weboob Dependances
echo 6.Install Weboob Dependances
echo.
echo -- cssselect
%PythonPath%Scripts\easy_install.exe cssselect || goto :InstallFailed
@ -148,11 +201,12 @@ goto :InstallSucceed
:InstallSucceed
del ez_setup.py
del convertPNG2ICO.py
echo.
echo INSTALLATION PROCESS SUCCEED
if %ShouldReboot% EQU 1 (
echo.
echo YOU SHOULD REBOOT BEFORE USING WEBOOB
)
goto :Quit
:InstallFailed
@ -161,4 +215,11 @@ echo INSTALLATION PROCESS FAILED
goto :Quit
:Quit
del "%WEBOOB%"
del ez_setup.py
del convertPNG2ICO.py
del settings.cmd
pause