gajim: ability to compite the installer for gtk3 version

changeset 49137edc585e in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=49137edc585e description: ability to compite the installer for gtk3 version

diffstat:

build.bat | 29 +--- gajim.nsi | 275 ++----------------------------------------- launch.bat | 2 +- setup_win32.py | 129 ++++++++++++++++---- src/command_system/tools.py | 2 +- src/common/crypto.py | 4 +- src/common/resolver.py | 3 +- src/features_window.py | 2 - src/gajim-remote.py | 2 +- src/gajim.py | 52 ++----- src/plugins/plugin.py | 2 +- 11 files changed, 151 insertions(+), 351 deletions(-)

diffs (truncated from 788 to 300 lines):

diff -r 8f80f0e56f0d -r 49137edc585e build.bat --- a/build.bat Thu Jun 16 21:49:09 2016 +0200 +++ b/build.bat Thu Jul 07 22:41:35 2016 +0200 @@ -5,35 +5,20 @@ xcopy ..\gajim-plugins\plugin_installer gajim_built\plugins\plugin_installer /e /i

copy msgfmt.exe gajim_built -copy gettextsrc.dll gajim_built -copy gettextlib.dll gajim_built -copy msvcr90.dll gajim_built +copy msvcr100.dll gajim_built

cd gajim_built

-REM for libglade-2.0.0.dll -PATH=..\src\gtk\bin;%PATH% +for %%l in (po*.po) do mkdir po%%~nl & mkdir po%%~nl\LC_MESSAGES & msgfmt -o po%%~nl\LC_MESSAGES\gajim.mo %%l

-c:\python27\python.exe setup_win32.py build_exe +c:\python34\python.exe setup_win32.py build_exe

-move build\exe.win32-2.7 . -rename exe.win32-2.7 bin - -copy ..\LIBEAY32.dll bin -copy ..\SSLEAY32.dll bin +move build\exe.win32-3.4 . +rmdir build +rename exe.win32-3.4 build

REM for snarl plugin -xcopy ..\win32com bin\win32com /e /i - -mkdir bin\gtk -cd ../src/gtk -hg archive ....\gajim_built\bin\gtk -cd ../../gajim_built/ - -REM for msgfmt -PATH=bin\gtk\bin;%PATH% - -for %%l in (po*.po) do mkdir po%%~nl & mkdir po%%~nl\LC_MESSAGES & msgfmt -o po%%~nl\LC_MESSAGES\gajim.mo %%l +xcopy ..\win32com build\win32com /e /i

"C:\Program Files (x86)\NSIS\makensis" gajim.nsi

diff -r 8f80f0e56f0d -r 49137edc585e gajim.nsi --- a/gajim.nsi Thu Jun 16 21:49:09 2016 +0200 +++ b/gajim.nsi Thu Jul 07 22:41:35 2016 +0200 @@ -31,7 +31,7 @@ !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder !insertmacro MUI_PAGE_INSTFILES -!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\Gajim.exe" +!define MUI_FINISHPAGE_RUN "$INSTDIR\build\Gajim.exe" !insertmacro MUI_PAGE_FINISH

!insertmacro MUI_UNPAGE_WELCOME @@ -59,7 +59,6 @@ LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop" LangString NAME_SecAutostart ${LANG_ENGLISH} "Start Gajim when Windows starts" LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." -LangString DESC_SecGtk ${LANG_ENGLISH} "Installs Gtk+ 2 (necessary to run Gajim)." LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_ENGLISH} "If set, Gajim will be automatically started when Windows starts." LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" @@ -75,7 +74,6 @@ LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Créer une icône sur le bureau" LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au démarrage de Windows" LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." -LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (nécessaire à Gajim)." LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" @@ -91,7 +89,6 @@ LangString NAME_SecDesktopIcon ${LANG_GERMAN} "Desktop-Icon erstellen" LangString NAME_SecAutostart ${LANG_GERMAN} "Gajim mit Windows starten" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." -LangString DESC_SecGtk ${LANG_GERMAN} "Installert Gtk+ 2 (notwendig um Gajim zu benutzen)." LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt." LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." LangString STR_Installed ${LANG_GERMAN} "Gajim is apparently already installed. Uninstall it?" @@ -107,7 +104,6 @@ LangString NAME_SecDesktopIcon ${LANG_ITALIAN} "Crea un'icona sul desktop" LangString NAME_SecAutostart ${LANG_ITALIAN} "Lancia Gajim quando parte Windows" LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." -LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire Gajim)." LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" @@ -123,7 +119,6 @@ LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} "Ñîçäàòü ÿðëûê íà ðàáî÷åì ñòîëå" LangString NAME_SecAutostart ${LANG_RUSSIAN} "Çàïóñêàòü Gajim ïðè çàãðóçêå Windows" LangString DESC_SecGajim ${LANG_RUSSIAN} "Óñòàíîâêà îñíîâíûõ ôàéëîâ Gajim." -LangString DESC_SecGtk ${LANG_RUSSIAN} "Óñòàíîâêà Gtk+ 2 (íåîáõîäèìî äëÿ ðàáîòû Gajim)." LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, íà ðàáî÷åì ñòîëå áóäåò ñîçäàí ÿðëûê Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, Gajim áóäåò àâòîìàòè÷åñêè çàïóñêàòüñÿ ïðè çàãðóçêå Windows." LangString STR_Installed ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå óñòàíîâëåí. Äåèíñòàëëèðîâàòü óñòàíîâëåííóþ âåðñèþ?" @@ -138,7 +133,6 @@ LangString NAME_SecDesktopIcon ${LANG_HEBREW} "öåø ñîì áùåìçï òáåãä" LangString NAME_SecAutostart ${LANG_HEBREW} "äôòì àú Gajim ëàùø Windows îúçéì" LangString DESC_SecGajim ${LANG_HEBREW} "îú÷éï ÷áöé Gajim òé÷øééí." -LangString DESC_SecGtk ${LANG_HEBREW} "îú÷éï Gtk+ 2 (ðçåöä ìäøöú Gajim)." LangString DESC_SecDesktopIcon ${LANG_HEBREW} "áîéãä åð÷áòú, ÷éöåø ãøê òáåø Gajim éåùí òì ùåìçï äòáåãä." LangString DESC_SecAutostart ${LANG_HEBREW} "áîéãä åð÷áòú, Gajim éåôòì àåèåîèéú ëàùø Windows îúçéì." LangString STR_Installed ${LANG_HEBREW} "ëôé äðøàä, Gajim ëáø îåú÷ï. ìäñéø àåúå?" @@ -153,79 +147,25 @@ File "COPYING" File "THANKS" File "THANKS.artists" - - SetOutPath "$INSTDIR\bin" - File "bin_bsddb.pyd" - File "bin_cffi_backend.pyd" - File "bin_ctypes.pyd" - File "bin_hashlib.pyd" - File "bin_socket.pyd" - File "bin_sqlite3.pyd" - File "bin_ssl.pyd" - File "bin\atk.pyd" - File "bin\bz2.pyd" - File "bin\cairo._cairo.pyd" - File "bin\Crypto.Cipher._AES.pyd" - File "bin\Crypto.Cipher._DES.pyd" - File "bin\Crypto.Cipher._DES3.pyd" - File "bin\Crypto.Hash._SHA256.pyd" - File "bin\Crypto.Random.OSRNG.winrandom.pyd" - File "bin\Crypto.Util._counter.pyd" - File "bin\Crypto.Util.strxor.pyd" - File "bin\cryptography.hazmat.bindings._constant_time.pyd" - File "bin\cryptography.hazmat.bindings._openssl.pyd" - File "bin\cryptography.hazmat.bindings._padding.pyd" - File "bin\farstream.pyd" - File "bin\gajim.exe" - File "bin\gio._gio.pyd" - File "bin\glib._glib.pyd" - File "bin\gobject._gobject.pyd" - File "bin\goocanvas.pyd" - File "bin\gst._gst.pyd" - File "bin\gst.interfaces.pyd" - File "bin\gtk._gtk.pyd" - File "bin\history_manager.exe" - File "bin\libeay32.dll" - File "bin\libgoocanvas-3.dll" - File "bin\library.zip" - File "bin\libxml2mod.pyd" - File "bin\libxmlmods.libxml2mod.pyd" - File "bin\pangocairo.pyd" - File "bin\pango.pyd" - File "bin\pycurl.pyd" - File "bin\pyexpat.pyd" - File "bin\python27.dll" - File "bin\pythoncom27.dll" - File "bin\pywintypes27.dll" - File "bin\select.pyd" - File "bin\sqlite3.dll" - File "bin\ssleay32.dll" - File "bin\unicodedata.pyd" - File "bin\win32api.pyd" - File "bin\win32file.pyd" - File "bin\win32pipe.pyd" - File "bin\win32ui.pyd" - File "bin\winsound.pyd" - File "msvcr90.dll" - File /r "bin\win32com" + File /r "build" + SetOutPath "$INSTDIR\build" + File "msvcr100.dll"

WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.5" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\build\Gajim.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.4" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe"

!insertmacro MUI_STARTMENU_WRITE_BEGIN Application SetShellVarContext current CreateDirectory "$SMPROGRAMS$StartMenuFolder" - CreateShortCut "$SMPROGRAMS$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" - CreateShortCut "$SMPROGRAMS$StartMenuFolder\Change Theme.lnk" "$INSTDIR\bin\gtk\bin\gtkthemeselector.exe" + CreateShortCut "$SMPROGRAMS$StartMenuFolder\Gajim.lnk" "$INSTDIR\build\Gajim.exe" SetShellVarContext all CreateDirectory "$SMPROGRAMS$StartMenuFolder" - CreateShortCut "$SMPROGRAMS$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" - CreateShortCut "$SMPROGRAMS$StartMenuFolder\Change Theme.lnk" "$INSTDIR\bin\gtk\bin\gtkthemeselector.exe" + CreateShortCut "$SMPROGRAMS$StartMenuFolder\Gajim.lnk" "$INSTDIR\build\Gajim.exe" !insertmacro MUI_STARTMENU_WRITE_END

SetOutPath "$INSTDIR\data" @@ -240,15 +180,6 @@ File /r "icons\hicolor" SectionEnd

-Section "Gtk+ 2" SecGtk - SectionIn RO - SetOutPath "$INSTDIR\bin\gtk" - File /r "bin\gtk\bin" - File /r "bin\gtk\etc" - File /r "bin\gtk\lib" - File /r "bin\gtk\share" -SectionEnd - Section "Plugins" SecPlugins SetOutPath "$INSTDIR\plugins" File /r "plugins\plugin_installer" @@ -325,43 +256,31 @@ Section "English (UK)" SecLanguagesEnglishUK SetOutPath "$INSTDIR\po" File /r "po\en_GB" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\en_GB" SectionEnd

Section "French" SecLanguagesFrench SetOutPath "$INSTDIR\po" File /r "po\fr" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\fr" SectionEnd

Section "German" SecLanguagesGerman SetOutPath "$INSTDIR\po" File /r "po\de" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\de" SectionEnd

Section "Italian" SecLanguagesItalian SetOutPath "$INSTDIR\po" File /r "po\it" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\it" SectionEnd

Section "Spanish" SecLanguagesSpanish SetOutPath "$INSTDIR\po" File /r "po\es" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\es" SectionEnd

Section "Russian" SecLanguagesRussian SetOutPath "$INSTDIR\po" File /r "po\ru" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\ru" SectionEnd

Section $(NAME_SecLanguagesOther) SecLanguagesOther @@ -391,159 +310,25 @@ File /r "po\sv" File /r "po\uk" File /r "po\zh_CN" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\af" - File /r "bin\gtk\share\locale\am" - File /r "bin\gtk\share\locale\ang" - File /r "bin\gtk\share\locale\ar" - File /r "bin\gtk\share\locale\as" - File /r "bin\gtk\share\locale\az" - File /r "bin\gtk\share\locale\az_IR" - File /r "bin\gtk\share\locale\be" - File /r "bin\gtk\share\locale\be@latin" - File /r "bin\gtk\share\locale\bg" - File /r "bin\gtk\share\locale\bn" - File /r "bin\gtk\share\locale\bn_IN" - File /r "bin\gtk\share\locale\br" - File /r "bin\gtk\share\locale\bs" - File /r "bin\gtk\share\locale\ca" - File /r "bin\gtk\share\locale\ca@valencia" - File /r "bin\gtk\share\locale\cs" - File /r "bin\gtk\share\locale\cy" - File /r "bin\gtk\share\locale\da" - File /r "bin\gtk\share\locale\dz" - File /r "bin\gtk\share\locale\el" - File /r "bin\gtk\share\locale\en_CA" - File /r "bin\gtk\share\locale\eo" - File /r "bin\gtk\share\locale\et" - File /r "bin\gtk\share\locale\eu" - File /r "bin\gtk\share\locale\fa" - File /r "bin\gtk\share\locale\fi" - File /r "bin\gtk\share\locale\ga" - File /r "bin\gtk\share\locale\gl" - File /r "bin\gtk\share\locale\gu" - File /r "bin\gtk\share\locale\he" - File /r "bin\gtk\share\locale\hi" - File /r "bin\gtk\share\locale\hr" - File /r "bin\gtk\share\locale\hu" - File /r "bin\gtk\share\locale\hy" - File /r "bin\gtk\share\locale\ia" - File /r "bin\gtk\share\locale\id" - File /r "bin\gtk\share\locale\io" - File /r "bin\gtk\share\locale\is" - File /r "bin\gtk\share\locale\ja" - File /r "bin\gtk\share\locale\ka" - File /r "bin\gtk\share\locale\kn"