diff --git a/contrib/windows-install/HOW_TO.txt b/contrib/windows-install/HOW_TO.txt index 98fb51b8..60520afc 100644 --- a/contrib/windows-install/HOW_TO.txt +++ b/contrib/windows-install/HOW_TO.txt @@ -1,4 +1,4 @@ -1. Replace weboob egg file +1. Generate and Replace weboob egg file (./setup.py install --qt bdist_egg) 2. update settings.cmd diff --git a/contrib/windows-install/create-exe-setup-weboob.bat b/contrib/windows-install/create-exe-setup-weboob.bat index db062477..fc5bd719 100644 --- a/contrib/windows-install/create-exe-setup-weboob.bat +++ b/contrib/windows-install/create-exe-setup-weboob.bat @@ -1,3 +1,3 @@ @echo off call settings.cmd -"Bat_To_Exe_Converter_%ARCHITECTURE%.exe" -bat "setup-weboob.bat" -save "setup-weboob-%WEBOOB_VERSION%-%ARCHITECTURE%.exe" -icon "ICON\weboobtxt.ico" -include "Bat_To_Exe_Converter.exe" -include "wget-%ARCHITECTURE%.exe" -include "%WEBOOB%" -include "convertPNG2ICO.py" -include "ez_setup.py" -include "settings.cmd" \ No newline at end of file +"Bat_To_Exe_Converter_%LOCAL_ARCHITECTURE%.exe" -bat "setup-weboob.bat" -save "setup-weboob-%WEBOOB_VERSION%-%ARCHITECTURE%.exe" -icon "ICON\weboobtxt.ico" -include "Bat_To_Exe_Converter_%ARCHITECTURE%.exe" -include "wget-%ARCHITECTURE%.exe" -include "%WEBOOB%" -include "convertPNG2ICO.py" -include "ez_setup.py" -include "settings.cmd" diff --git a/contrib/windows-install/settings.cmd b/contrib/windows-install/settings.cmd index 41820bb3..19f01dc7 100644 --- a/contrib/windows-install/settings.cmd +++ b/contrib/windows-install/settings.cmd @@ -1,5 +1,6 @@ -set WEBOOB_VERSION=0.g -set WEBOOB=weboob-0.g-py2.7.egg +set WEBOOB_VERSION=0.i +set WEBOOB=weboob-0.i-py2.7.egg set LIST_APPLIQUATIONS_QT=qboobmsg qcineoob qcookboob qflatboob qhandjoob qhavedate qvideoob qwebcontentedit weboob-config-qt REM x32 | x64 -set ARCHITECTURE=x32 \ No newline at end of file +set ARCHITECTURE=x32 +set LOCAL_ARCHITECTURE=x64 diff --git a/contrib/windows-install/setup-weboob.bat b/contrib/windows-install/setup-weboob.bat index 470f7284..c56a2213 100644 --- a/contrib/windows-install/setup-weboob.bat +++ b/contrib/windows-install/setup-weboob.bat @@ -18,17 +18,17 @@ echo 2.Check Python 2.7 Installation set KEY_NAME=HKLM\Software\Python\PythonCore\2.7\InstallPath if %ARCHITECTURE% == x64 ( - set KEY_NAME=HKLM\SOFTWARE\Wow6432Node\Python\PythonCore\2.7\InstallPath + set KEY_NAME=HKLM\SOFTWARE\Python\PythonCore\2.7\InstallPath ) REG QUERY !KEY_NAME! > nul || ( set PYTHON_MSI=python-2.7.5.msi if %ARCHITECTURE% == x64 ( - set PYTHON_MSI=python-2.7.5.amd64.msi + set PYTHON_MSI=python-2.7.5.amd64.msi ) echo 2.1 Download !PYTHON_MSI! - "%WGET%" -o python_donwload "http://www.python.org/ftp/python/2.7.5/!PYTHON_MSI!" + "%WGET%" -o python_donwload --no-check-certificate "http://www.python.org/ftp/python/2.7.5/!PYTHON_MSI!" echo 2.2 Setup !PYTHON_MSI! !PYTHON_MSI! @@ -100,6 +100,9 @@ echo -- feedparser echo. echo -- pillow %PythonPath%Scripts\easy_install.exe pillow==2.3.0 || goto :InstallFailed +echo. +echo -- requests +%PythonPath%Scripts\easy_install.exe requests==2.3.0 || goto :InstallFailed echo. echo 6.Install WeBoob @@ -136,7 +139,7 @@ for %%i in (%LIST_APPLIQUATIONS_QT%) do ( del "%StartupFolder%\Weboob\%%i.exe" ) - "Bat_To_Exe_Converter_%ARCHITECTURE%.exe" -bat "%%i.bat" -save "%StartupFolder%\Weboob\%%i.exe" -icon "%PythonPath%\Lib\site-packages\%WEBOOB%\share\icons\hicolor\64x64\apps\%%i.ico" %%i" + "Bat_To_Exe_Converter_%ARCHITECTURE%.exe" -bat "%%i.bat" -save "%StartupFolder%\Weboob\%%i.exe" -icon "%PythonPath%\Lib\site-packages\%WEBOOB%\share\icons\hicolor\64x64\apps\%%i.ico" "%%i" del "%%i.bat" del "%PythonPath%\Lib\site-packages\%WEBOOB%\share\icons\hicolor\64x64\apps\%%i.ico" ) @@ -144,6 +147,10 @@ for %%i in (%LIST_APPLIQUATIONS_QT%) do ( goto :InstallSucceed :InstallSucceed + +del ez_setup.py +del convertPNG2ICO.py + echo. echo INSTALLATION PROCESS SUCCEED goto :Quit