nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[windows] fix bugs in windows installer scripts

Browse source
This commit is contained in:
Bezleputh 2014-05-20 17:24:55 +02:00
commit 06bfed431a
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contrib/windows-install/HOW_TO.txt
View file

@ -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 2. update settings.cmd

2
contrib/windows-install/create-exe-setup-weboob.bat
View file

@ -1,3 +1,3 @@
@echo off @echo off
call settings.cmd 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" "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"

7
contrib/windows-install/settings.cmd
View file

@ -1,5 +1,6 @@
set WEBOOB_VERSION=0.g set WEBOOB_VERSION=0.i
set WEBOOB=weboob-0.g-py2.7.egg set WEBOOB=weboob-0.i-py2.7.egg
set LIST_APPLIQUATIONS_QT=qboobmsg qcineoob qcookboob qflatboob qhandjoob qhavedate qvideoob qwebcontentedit weboob-config-qt set LIST_APPLIQUATIONS_QT=qboobmsg qcineoob qcookboob qflatboob qhandjoob qhavedate qvideoob qwebcontentedit weboob-config-qt
REM x32 | x64 REM x32 | x64
set ARCHITECTURE=x32 set ARCHITECTURE=x32
set LOCAL_ARCHITECTURE=x64

15
contrib/windows-install/setup-weboob.bat
View file

@ -18,17 +18,17 @@ echo 2.Check Python 2.7 Installation
set KEY_NAME=HKLM\Software\Python\PythonCore\2.7\InstallPath set KEY_NAME=HKLM\Software\Python\PythonCore\2.7\InstallPath
if %ARCHITECTURE% == x64 ( 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 || ( REG QUERY !KEY_NAME! > nul || (
set PYTHON_MSI=python-2.7.5.msi set PYTHON_MSI=python-2.7.5.msi
if %ARCHITECTURE% == x64 ( 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! 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! echo 2.2 Setup !PYTHON_MSI!
!PYTHON_MSI! !PYTHON_MSI!
@ -100,6 +100,9 @@ echo -- feedparser
echo. echo.
echo -- pillow echo -- pillow
%PythonPath%Scripts\easy_install.exe pillow==2.3.0 || goto :InstallFailed %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.
echo 6.Install WeBoob echo 6.Install WeBoob
@ -136,7 +139,7 @@ for %%i in (%LIST_APPLIQUATIONS_QT%) do (
del "%StartupFolder%\Weboob\%%i.exe" 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 "%%i.bat"
del "%PythonPath%\Lib\site-packages\%WEBOOB%\share\icons\hicolor\64x64\apps\%%i.ico" 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 goto :InstallSucceed
:InstallSucceed :InstallSucceed
del ez_setup.py
del convertPNG2ICO.py
echo. echo.
echo INSTALLATION PROCESS SUCCEED echo INSTALLATION PROCESS SUCCEED
goto :Quit goto :Quit