prepare windows installer for 0.15-alpha1gajim-0.15-alpha1

2 files changed, 22 insertions, 2 deletions

diff --git a/gajim.nsi b/gajim.nsi
index 842d5f881..e2be01acb 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -146,6 +146,7 @@ Section "Gajim" SecGajim
 	File "THANKS.artists"

 

 	SetOutPath "$INSTDIR\bin"

+	File "bin\_bsddb.pyd"

 	File "bin\_ctypes.pyd"

 	File "bin\_hashlib.pyd"

 	File "bin\_socket.pyd"

@@ -234,6 +235,16 @@ Section "Gtk+ 2" SecGtk
 	File /r "bin\gtk\share\xml"

 SectionEnd

 

+Section "Plugins" SecPlugins

+	SetOutPath "$INSTDIR\plugins"

+	File /r "plugins\acronyms_expander"

+	File /r "plugins\banner_tweaks"

+	File /r "plugins\length_notifier"

+	File /r "plugins\plugin_installer"

+	File /r "plugins\triggers"

+	File /r "plugins\whiteboard"

+SectionEnd

+

 SectionGroup $(NAME_Emoticons)

 

 Section "animated" SecEmoticonsAnimated

@@ -641,6 +652,7 @@ Section "Uninstall"
 	RMDir /r "$INSTDIR\bin\gtk\share\xml"

 	RMDir "$INSTDIR\bin\gtk\share"

 	RMDir "$INSTDIR\bin\gtk"

+	Delete "$INSTDIR\bin\_bsddb.pyd"

 	Delete "$INSTDIR\bin\_ctypes.pyd"

 	Delete "$INSTDIR\bin\_hashlib.pyd"

 	Delete "$INSTDIR\bin\_socket.pyd"

@@ -677,7 +689,8 @@ Section "Uninstall"
 	Delete "$INSTDIR\bin\win32file.pyd"

 	Delete "$INSTDIR\bin\win32pipe.pyd"

 	Delete "$INSTDIR\bin\winsound.pyd"

-	RMDir "$INSTDIR\bin"

+	Delete "$INSTDIR\bin\msvcr90.dll"

+	RMDir /r "$INSTDIR\bin"

 	RMDir /r "$INSTDIR\data\gui"

 	RMDir /r "$INSTDIR\data\moods"

 	RMDir /r "$INSTDIR\data\activities"

@@ -698,6 +711,13 @@ Section "Uninstall"
 	RMDir /r "$INSTDIR\data\iconsets\transports"

 	RMDir "$INSTDIR\data\iconsets"

 	RMDir "$INSTDIR\data"

+	RMDir /r "$INSTDIR\plugins\acronyms_expander"

+	RMDir /r "$INSTDIR\plugins\banner_tweaks"

+	RMDir /r "$INSTDIR\plugins\length_notifier"

+	RMDir /r "$INSTDIR\plugins\plugin_installer"

+	RMDir /r "$INSTDIR\plugins\triggers"

+	RMDir /r "$INSTDIR\plugins\whiteboard"

+	RMDir "$INSTDIR\plugins"

 	RMDir /r "$INSTDIR\icons\hicolor"

 	RMDir "$INSTDIR\icons"

 	RMDir /r "$INSTDIR\po\be"

diff --git a/setup_win32.py b/setup_win32.py
index 7a94bb724..b577a51eb 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -31,7 +31,7 @@ if 'gtk' in os.listdir('.'):
 
 options = {
    'build_exe': {
-       'includes': ['gtk.keysyms'],
+       'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new'],
        'base': 'Win32GUI',
 	   'bin_excludes': [
             'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',