From 7643da7f60f044d52c42f7693d8abdf207800f87 Mon Sep 17 00:00:00 2001 From: Bezleputh Date: Fri, 29 Nov 2013 22:02:19 +0100 Subject: [PATCH] [Windows install] coorect bugs and add architecture management --- contrib/windows-install/HOW_TO.txt | 9 ++++--- .../create-exe-setup-weboob.bat | 2 +- contrib/windows-install/settings.cmd | 4 ++- contrib/windows-install/setup-weboob.bat | 27 ++++++++++--------- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/contrib/windows-install/HOW_TO.txt b/contrib/windows-install/HOW_TO.txt index 0b987a4c..b2cad56b 100644 --- a/contrib/windows-install/HOW_TO.txt +++ b/contrib/windows-install/HOW_TO.txt @@ -2,7 +2,10 @@ 2. update settings.cmd -3. Download http://downloads.sourceforge.net/gnuwin32/wget-1.11.4-1-setup.exe - and http://www.f2ko.de/downloads/Bat_To_Exe_Converter.zip +3. Download http://www.f2ko.de/downloads/Bat_To_Exe_Converter.zip -4. run create-exe-setup-weboob.bat +4. Download http://nebm.ist.utl.pt/~glopes/wget/wget-1.11.4-x64.zip, unzip and rename to => wget-x64.exe + +5. Download http://nebm.ist.utl.pt/~glopes/wget/wget-1.11.4-x86.zip, unzip and rename to => wget-x32.exe + +6. run create-exe-setup-weboob.bat diff --git a/contrib/windows-install/create-exe-setup-weboob.bat b/contrib/windows-install/create-exe-setup-weboob.bat index 9cfe7949..2b54592d 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.exe" -bat "setup-weboob.bat" -save "setup-weboob-%WEBOOB_VERSION%.exe" -icon "ICON\weboobtxt.ico" -include "Bat_To_Exe_Converter.exe" -include "wget-1.11.4-1-setup.exe" -include "weboob-%WEBOOB_VERSION%-py2.7.egg" -include "convertPNG2ICO.py" -include "ez_setup.py" -include "settings.cmd" +"Bat_To_Exe_Converter.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-%WEBOOB_VERSION%-py2.7.egg" -include "convertPNG2ICO.py" -include "ez_setup.py" -include "settings.cmd" \ No newline at end of file diff --git a/contrib/windows-install/settings.cmd b/contrib/windows-install/settings.cmd index 32089ece..41820bb3 100644 --- a/contrib/windows-install/settings.cmd +++ b/contrib/windows-install/settings.cmd @@ -1,3 +1,5 @@ set WEBOOB_VERSION=0.g set WEBOOB=weboob-0.g-py2.7.egg -set LIST_APPLIQUATIONS_QT=qboobmsg qcineoob qcookboob qflatboob qhandjoob qhavedate qvideoob qwebcontentedit weboob-config-qt \ No newline at end of file +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 diff --git a/contrib/windows-install/setup-weboob.bat b/contrib/windows-install/setup-weboob.bat index a2be1815..bed549b3 100644 --- a/contrib/windows-install/setup-weboob.bat +++ b/contrib/windows-install/setup-weboob.bat @@ -8,23 +8,27 @@ set/P HTTP_PROXY=Enter HTTP_PROXY if needed : set/P HTTPS_PROXY=Enter HTTPS_PROXY if needed : echo. -echo 1.GNU/WGET Installation -for %%i in (wget.exe) do set wget=%%~$PATH:i -if not defined wget ( - wget-1.11.4-1-setup.exe -) +echo 1.GNU/WGET Init + +set wget=wget-%ARCHITECTURE%.exe echo. echo 2.Check Python 2.7 Installation set KEY_NAME=HKLM\Software\Python\PythonCore\2.7\InstallPath REG QUERY %KEY_NAME% > nul || ( echo 2.1 Download Python 2.7 - wget -o python_donwload http://www.python.org/ftp/python/2.7.5/python-2.7.5.msi + if %ARCHITECTURE% == x64 ( + set python_msi=python-2.7.5.amd64.msi + ) else ( + set python_msi=python-2.7.5.msi + ) + + "%wget%" -o python_donwload http://www.python.org/ftp/python/2.7.5/%python_msi% echo 2.2 Setup Python 2.7 - python-2.7.5.msi + %python_msi% - del python-2.7.5.msi + del %python_msi% del python_donwload ) @@ -38,12 +42,12 @@ for %%i in (pyuic4.bat) do set qt=%%~$PATH:i if not defined qt ( echo 3.1 Download PyQt4 - wget -o qt_download http://downloads.sourceforge.net/project/pyqt/PyQt4/PyQt-4.10.3/PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-x32.exe?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fpyqt%2Ffiles%2FPyQt4%2FPyQt-4.10.3%2F&ts=1380890340&use_mirror=garr + "%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 echo 3.2 Setup PyQt4 - PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-x32.exe + PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-%ARCHITECTURE%.exe - del PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-x32.exe + del PyQt4-4.10.3-gpl-Py2.7-Qt4.8.5-%ARCHITECTURE%.exe del qt_download ) @@ -110,7 +114,6 @@ if exist "%StartupFolder%\Weboob" ( ) :CreateLauncher -::for /f "delims=. tokens=1" %%i in ('dir /b "%PythonPath%\Lib\site-packages\%WEBOOB%\share\icons\hicolor\64x64\apps\q*.png"') do ( for %%i in (%LIST_APPLIQUATIONS_QT%) do ( echo Process %%i