From 65d10de012f0107c2d4233da91e6563f94d58000 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 16 Dec 2013 13:18:39 +0100 Subject: [PATCH] include needed files for snarl plugin in windows installer. --- build.bat | 3 +++ gajim.nsi | 8 ++++++++ setup_win32.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build.bat b/build.bat index f3e8c7113..e427d8ab3 100644 --- a/build.bat +++ b/build.bat @@ -22,6 +22,9 @@ rename exe.win32-2.7 bin copy ..\LIBEAY32.dll bin copy ..\SSLEAY32.dll bin +REM for snarl plugin +xcopy ..\win32com bin\win32com /e /i + mkdir bin\gtk cd ../src/gtk hg archive ..\..\gajim_built\bin\gtk diff --git a/gajim.nsi b/gajim.nsi index 8bef329f9..fa050c518 100644 --- a/gajim.nsi +++ b/gajim.nsi @@ -182,8 +182,10 @@ Section "Gajim" SecGajim File "bin\library.zip" 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\OpenSSL.rand.pyd" File "bin\select.pyd" @@ -194,8 +196,10 @@ Section "Gajim" SecGajim 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" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" @@ -530,6 +534,7 @@ Section "Uninstall" RMDir /r "$INSTDIR\bin\gtk\lib" RMDir /r "$INSTDIR\bin\gtk\share" RMDir "$INSTDIR\bin\gtk" + RMDir "$INSTDIR\bin\win32com" Delete "$INSTDIR\bin\_bsddb.pyd" Delete "$INSTDIR\bin\_ctypes.pyd" Delete "$INSTDIR\bin\_hashlib.pyd" @@ -558,8 +563,10 @@ Section "Uninstall" Delete "$INSTDIR\bin\OpenSSL.SSL.pyd" Delete "$INSTDIR\bin\pango.pyd" Delete "$INSTDIR\bin\pangocairo.pyd" + Delete "$INSTDIR\bin\pycurl.pyd" Delete "$INSTDIR\bin\pyexpat.pyd" Delete "$INSTDIR\bin\python27.dll" + Delete "$INSTDIR\bin\pythoncom27.dll" Delete "$INSTDIR\bin\pywintypes27.dll" Delete "$INSTDIR\bin\select.pyd" Delete "$INSTDIR\bin\sqlite3.dll" @@ -568,6 +575,7 @@ Section "Uninstall" Delete "$INSTDIR\bin\win32api.pyd" Delete "$INSTDIR\bin\win32file.pyd" Delete "$INSTDIR\bin\win32pipe.pyd" + Delete "$INSTDIR\bin\win32ui.pyd" Delete "$INSTDIR\bin\winsound.pyd" Delete "$INSTDIR\bin\msvcr90.dll" RMDir /r "$INSTDIR\bin" diff --git a/setup_win32.py b/setup_win32.py index 136016f68..b257a53e8 100644 --- a/setup_win32.py +++ b/setup_win32.py @@ -33,7 +33,7 @@ options = { 'build_exe': { 'includes': ['Gdk.KEY_, 'dumbdbm', 'dbhash', 'bsddb', 'new', 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', - 'numbers'], + 'numbers', 'win32com.client', 'win32com.server'], 'base': 'Win32GUI', 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',