fixes for windows build

This commit is contained in:
Yann Leboulanger 2010-10-26 17:28:08 +02:00
parent edccb053a8
commit 538fec1571
5 changed files with 354 additions and 352 deletions

628
gajim.nsi
View File

@ -146,48 +146,48 @@ Section "Gajim" SecGajim
File "THANKS.artists"
SetOutPath "$INSTDIR\bin"
File "bin\cairo._cairo.pyd"
File "bin\_ctypes.pyd"
File "bin\gobject._gobject.pyd"
File "bin\gtk._gtk.pyd"
File "bin\_hashlib.pyd"
File "bin\_socket.pyd"
File "bin\_sqlite3.pyd"
File "bin\_ssl.pyd"
File "bin\_win32sysloader.pyd"
File "bin\Crypto.Cipher.AES.pyd"
File "bin\atk.pyd"
File "bin\bz2.pyd"
File "bin\OpenSSL.crypto.pyd"
File "bin\cairo._cairo.pyd"
File "bin\Crypto.Cipher.AES.pyd"
File "bin\Crypto.Hash.SHA256.pyd"
File "bin\Crypto.Random.OSRNG.winrandom.pyd"
File "bin\Crypto.Util._counter.pyd"
File "bin\gajim.exe"
File "bin\gio._gio.pyd"
File "bin\glib._glib.pyd"
File "bin\gobject._gobject.pyd"
File "bin\gtk._gtk.pyd"
File "bin\history_manager.exe"
File "bin\OpenSSL.crypto.pyd"
File "bin\libeay32.dll"
File "bin\library.zip"
File "bin\libxml2.dll"
File "bin\msvcr71.dll"
File "bin\pangocairo.pyd"
File "bin\pango.pyd"
File "bin\pyexpat.pyd"
File "bin\python25.dll"
File "bin\pywintypes25.dll"
File "bin\python26.dll"
File "bin\pywintypes26.dll"
File "bin\OpenSSL.rand.pyd"
File "bin\select.pyd"
File "bin\sqlite3.dll"
File "bin\ssleay32.dll"
File "bin\OpenSSL.SSL.pyd"
File "bin\unicodedata.pyd"
File "bin\w9xpopen.exe"
File "bin\win32api.pyd"
File "bin\win32file.pyd"
File "bin\win32pipe.pyd"
File "bin\winsound.pyd"
File "bin\zlib1.dll"
File /r "bin\docutils"
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.12.1"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.14.1"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"
WriteUninstaller "$INSTDIR\Uninstall.exe"
@ -209,6 +209,9 @@ Section "Gajim" SecGajim
File /r "data\other"
File /r "data\pixmaps"
File /r "data\sounds"
SetOutPath "$INSTDIR\icons"
File /r "icons\hicolor"
SectionEnd
Section "Gtk+ 2" SecGtk
@ -305,165 +308,165 @@ Section "English (UK)" SecLanguagesEnglishUK
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 "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 "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 "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 "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 "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
SetOutPath "$INSTDIR\po"
File /r "po\be"
File /r "po\be@latin"
File /r "po\bg"
File /r "po\br"
File /r "po\cs"
File /r "po\da"
File /r "po\el"
File /r "po\eo"
File /r "po\eu"
File /r "po\gl"
File /r "po\hr"
File /r "po\lt"
File /r "po\nb"
File /r "po\nl"
File /r "po\no"
File /r "po\pl"
File /r "po\pt"
File /r "po\pt_BR"
File /r "po\sk"
File /r "po\sr"
File /r "po\sr@Latn"
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"
File /r "bin\gtk\share\locale\ko"
File /r "bin\gtk\share\locale\ku"
File /r "bin\gtk\share\locale\li"
File /r "bin\gtk\share\locale\lt"
File /r "bin\gtk\share\locale\lv"
File /r "bin\gtk\share\locale\mai"
File /r "bin\gtk\share\locale\mg"
File /r "bin\gtk\share\locale\mi"
File /r "bin\gtk\share\locale\mk"
File /r "bin\gtk\share\locale\ml"
File /r "bin\gtk\share\locale\mn"
File /r "bin\gtk\share\locale\mr"
File /r "bin\gtk\share\locale\ms"
File /r "bin\gtk\share\locale\nb"
File /r "bin\gtk\share\locale\ne"
File /r "bin\gtk\share\locale\nl"
File /r "bin\gtk\share\locale\nn"
File /r "bin\gtk\share\locale\nso"
File /r "bin\gtk\share\locale\oc"
File /r "bin\gtk\share\locale\or"
File /r "bin\gtk\share\locale\pa"
File /r "bin\gtk\share\locale\pl"
File /r "bin\gtk\share\locale\ps"
File /r "bin\gtk\share\locale\pt"
File /r "bin\gtk\share\locale\pt_BR"
File /r "bin\gtk\share\locale\ro"
File /r "bin\gtk\share\locale\rw"
File /r "bin\gtk\share\locale\si"
File /r "bin\gtk\share\locale\sk"
File /r "bin\gtk\share\locale\sl"
File /r "bin\gtk\share\locale\sq"
File /r "bin\gtk\share\locale\sr"
File /r "bin\gtk\share\locale\sr@ije"
File /r "bin\gtk\share\locale\sr@latin"
File /r "bin\gtk\share\locale\sv"
File /r "bin\gtk\share\locale\ta"
File /r "bin\gtk\share\locale\te"
File /r "bin\gtk\share\locale\th"
File /r "bin\gtk\share\locale\tk"
File /r "bin\gtk\share\locale\tl"
File /r "bin\gtk\share\locale\tr"
File /r "bin\gtk\share\locale\tt"
File /r "bin\gtk\share\locale\ug"
File /r "bin\gtk\share\locale\uk"
File /r "bin\gtk\share\locale\ur"
File /r "bin\gtk\share\locale\uz"
File /r "bin\gtk\share\locale\uz@cyrillic"
File /r "bin\gtk\share\locale\vi"
File /r "bin\gtk\share\locale\wa"
File /r "bin\gtk\share\locale\xh"
File /r "bin\gtk\share\locale\yi"
File /r "bin\gtk\share\locale\zh_CN"
File /r "bin\gtk\share\locale\zh_HK"
File /r "bin\gtk\share\locale\zh_TW"
SectionEnd
; Section $(NAME_SecLanguagesOther) SecLanguagesOther
; SetOutPath "$INSTDIR\po"
; File /r "po\be"
; File /r "po\be@latin"
; File /r "po\bg"
; File /r "po\br"
; File /r "po\cs"
; File /r "po\da"
; File /r "po\el"
; File /r "po\eo"
; File /r "po\eu"
; File /r "po\gl"
; File /r "po\hr"
; File /r "po\lt"
; File /r "po\nb"
; File /r "po\nl"
; File /r "po\no"
; File /r "po\pl"
; File /r "po\pt"
; File /r "po\pt_BR"
; File /r "po\sk"
; File /r "po\sr"
; File /r "po\sr@Latn"
; 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"
; File /r "bin\gtk\share\locale\ko"
; File /r "bin\gtk\share\locale\ku"
; File /r "bin\gtk\share\locale\li"
; File /r "bin\gtk\share\locale\lt"
; File /r "bin\gtk\share\locale\lv"
; File /r "bin\gtk\share\locale\mai"
; File /r "bin\gtk\share\locale\mg"
; File /r "bin\gtk\share\locale\mi"
; File /r "bin\gtk\share\locale\mk"
; File /r "bin\gtk\share\locale\ml"
; File /r "bin\gtk\share\locale\mn"
; File /r "bin\gtk\share\locale\mr"
; File /r "bin\gtk\share\locale\ms"
; File /r "bin\gtk\share\locale\nb"
; File /r "bin\gtk\share\locale\ne"
; File /r "bin\gtk\share\locale\nl"
; File /r "bin\gtk\share\locale\nn"
; File /r "bin\gtk\share\locale\nso"
; File /r "bin\gtk\share\locale\oc"
; File /r "bin\gtk\share\locale\or"
; File /r "bin\gtk\share\locale\pa"
; File /r "bin\gtk\share\locale\pl"
; File /r "bin\gtk\share\locale\ps"
; File /r "bin\gtk\share\locale\pt"
; File /r "bin\gtk\share\locale\pt_BR"
; File /r "bin\gtk\share\locale\ro"
; File /r "bin\gtk\share\locale\rw"
; File /r "bin\gtk\share\locale\si"
; File /r "bin\gtk\share\locale\sk"
; File /r "bin\gtk\share\locale\sl"
; File /r "bin\gtk\share\locale\sq"
; File /r "bin\gtk\share\locale\sr"
; File /r "bin\gtk\share\locale\sr@ije"
; File /r "bin\gtk\share\locale\sr@latin"
; File /r "bin\gtk\share\locale\sv"
; File /r "bin\gtk\share\locale\ta"
; File /r "bin\gtk\share\locale\te"
; File /r "bin\gtk\share\locale\th"
; File /r "bin\gtk\share\locale\tk"
; File /r "bin\gtk\share\locale\tl"
; File /r "bin\gtk\share\locale\tr"
; File /r "bin\gtk\share\locale\tt"
; File /r "bin\gtk\share\locale\ug"
; File /r "bin\gtk\share\locale\uk"
; File /r "bin\gtk\share\locale\ur"
; File /r "bin\gtk\share\locale\uz"
; File /r "bin\gtk\share\locale\uz@cyrillic"
; File /r "bin\gtk\share\locale\vi"
; File /r "bin\gtk\share\locale\wa"
; File /r "bin\gtk\share\locale\xh"
; File /r "bin\gtk\share\locale\yi"
; File /r "bin\gtk\share\locale\zh_CN"
; File /r "bin\gtk\share\locale\zh_HK"
; File /r "bin\gtk\share\locale\zh_TW"
; SectionEnd
SectionGroupEnd
@ -524,109 +527,109 @@ Section "Uninstall"
RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0"
Delete "$INSTDIR\bin\gtk\lib\charset.alias"
RMDir "$INSTDIR\bin\gtk\lib"
RMDir /r "$INSTDIR\bin\gtk\share\locale\de"
RMDir /r "$INSTDIR\bin\gtk\share\locale\en_GB"
RMDir /r "$INSTDIR\bin\gtk\share\locale\es"
RMDir /r "$INSTDIR\bin\gtk\share\locale\fr"
RMDir /r "$INSTDIR\bin\gtk\share\locale\it"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ru"
RMDir /r "$INSTDIR\bin\gtk\share\locale\af"
RMDir /r "$INSTDIR\bin\gtk\share\locale\am"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ang"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ar"
RMDir /r "$INSTDIR\bin\gtk\share\locale\as"
RMDir /r "$INSTDIR\bin\gtk\share\locale\az"
RMDir /r "$INSTDIR\bin\gtk\share\locale\az_IR"
RMDir /r "$INSTDIR\bin\gtk\share\locale\be"
RMDir /r "$INSTDIR\bin\gtk\share\locale\be@latin"
RMDir /r "$INSTDIR\bin\gtk\share\locale\bg"
RMDir /r "$INSTDIR\bin\gtk\share\locale\bn"
RMDir /r "$INSTDIR\bin\gtk\share\locale\bn_IN"
RMDir /r "$INSTDIR\bin\gtk\share\locale\br"
RMDir /r "$INSTDIR\bin\gtk\share\locale\bs"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ca"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ca@valencia"
RMDir /r "$INSTDIR\bin\gtk\share\locale\cs"
RMDir /r "$INSTDIR\bin\gtk\share\locale\cy"
RMDir /r "$INSTDIR\bin\gtk\share\locale\da"
RMDir /r "$INSTDIR\bin\gtk\share\locale\dz"
RMDir /r "$INSTDIR\bin\gtk\share\locale\el"
RMDir /r "$INSTDIR\bin\gtk\share\locale\en_CA"
RMDir /r "$INSTDIR\bin\gtk\share\locale\eo"
RMDir /r "$INSTDIR\bin\gtk\share\locale\et"
RMDir /r "$INSTDIR\bin\gtk\share\locale\eu"
RMDir /r "$INSTDIR\bin\gtk\share\locale\fa"
RMDir /r "$INSTDIR\bin\gtk\share\locale\fi"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ga"
RMDir /r "$INSTDIR\bin\gtk\share\locale\gl"
RMDir /r "$INSTDIR\bin\gtk\share\locale\gu"
RMDir /r "$INSTDIR\bin\gtk\share\locale\he"
RMDir /r "$INSTDIR\bin\gtk\share\locale\hi"
RMDir /r "$INSTDIR\bin\gtk\share\locale\hr"
RMDir /r "$INSTDIR\bin\gtk\share\locale\hu"
RMDir /r "$INSTDIR\bin\gtk\share\locale\hy"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ia"
RMDir /r "$INSTDIR\bin\gtk\share\locale\id"
RMDir /r "$INSTDIR\bin\gtk\share\locale\io"
RMDir /r "$INSTDIR\bin\gtk\share\locale\is"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ja"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ka"
RMDir /r "$INSTDIR\bin\gtk\share\locale\kn"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ko"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ku"
RMDir /r "$INSTDIR\bin\gtk\share\locale\li"
RMDir /r "$INSTDIR\bin\gtk\share\locale\lt"
RMDir /r "$INSTDIR\bin\gtk\share\locale\lv"
RMDir /r "$INSTDIR\bin\gtk\share\locale\mai"
RMDir /r "$INSTDIR\bin\gtk\share\locale\mg"
RMDir /r "$INSTDIR\bin\gtk\share\locale\mi"
RMDir /r "$INSTDIR\bin\gtk\share\locale\mk"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ml"
RMDir /r "$INSTDIR\bin\gtk\share\locale\mn"
RMDir /r "$INSTDIR\bin\gtk\share\locale\mr"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ms"
RMDir /r "$INSTDIR\bin\gtk\share\locale\nb"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ne"
RMDir /r "$INSTDIR\bin\gtk\share\locale\nl"
RMDir /r "$INSTDIR\bin\gtk\share\locale\nn"
RMDir /r "$INSTDIR\bin\gtk\share\locale\nso"
RMDir /r "$INSTDIR\bin\gtk\share\locale\oc"
RMDir /r "$INSTDIR\bin\gtk\share\locale\or"
RMDir /r "$INSTDIR\bin\gtk\share\locale\pa"
RMDir /r "$INSTDIR\bin\gtk\share\locale\pl"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ps"
RMDir /r "$INSTDIR\bin\gtk\share\locale\pt"
RMDir /r "$INSTDIR\bin\gtk\share\locale\pt_BR"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ro"
RMDir /r "$INSTDIR\bin\gtk\share\locale\rw"
RMDir /r "$INSTDIR\bin\gtk\share\locale\si"
RMDir /r "$INSTDIR\bin\gtk\share\locale\sk"
RMDir /r "$INSTDIR\bin\gtk\share\locale\sl"
RMDir /r "$INSTDIR\bin\gtk\share\locale\sq"
RMDir /r "$INSTDIR\bin\gtk\share\locale\sr"
RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@ije"
RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@latin"
RMDir /r "$INSTDIR\bin\gtk\share\locale\sv"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ta"
RMDir /r "$INSTDIR\bin\gtk\share\locale\te"
RMDir /r "$INSTDIR\bin\gtk\share\locale\th"
RMDir /r "$INSTDIR\bin\gtk\share\locale\tk"
RMDir /r "$INSTDIR\bin\gtk\share\locale\tl"
RMDir /r "$INSTDIR\bin\gtk\share\locale\tr"
RMDir /r "$INSTDIR\bin\gtk\share\locale\tt"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ug"
RMDir /r "$INSTDIR\bin\gtk\share\locale\uk"
RMDir /r "$INSTDIR\bin\gtk\share\locale\ur"
RMDir /r "$INSTDIR\bin\gtk\share\locale\uz"
RMDir /r "$INSTDIR\bin\gtk\share\locale\uz@cyrillic"
RMDir /r "$INSTDIR\bin\gtk\share\locale\vi"
RMDir /r "$INSTDIR\bin\gtk\share\locale\wa"
RMDir /r "$INSTDIR\bin\gtk\share\locale\xh"
RMDir /r "$INSTDIR\bin\gtk\share\locale\yi"
RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_CN"
RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_HK"
RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_TW"
RMDir "$INSTDIR\bin\gtk\share\locale"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\de"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\en_GB"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\es"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\fr"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\it"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ru"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\af"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\am"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ang"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ar"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\as"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\az"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\az_IR"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\be"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\be@latin"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\bg"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\bn"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\bn_IN"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\br"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\bs"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ca"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ca@valencia"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\cs"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\cy"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\da"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\dz"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\el"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\en_CA"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\eo"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\et"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\eu"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\fa"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\fi"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ga"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\gl"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\gu"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\he"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\hi"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\hr"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\hu"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\hy"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ia"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\id"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\io"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\is"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ja"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ka"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\kn"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ko"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ku"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\li"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\lt"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\lv"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\mai"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\mg"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\mi"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\mk"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ml"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\mn"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\mr"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ms"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\nb"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ne"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\nl"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\nn"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\nso"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\oc"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\or"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\pa"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\pl"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ps"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\pt"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\pt_BR"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ro"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\rw"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\si"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\sk"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\sl"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\sq"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\sr"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@ije"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@latin"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\sv"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ta"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\te"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\th"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\tk"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\tl"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\tr"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\tt"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ug"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\uk"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\ur"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\uz"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\uz@cyrillic"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\vi"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\wa"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\xh"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\yi"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_CN"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_HK"
; RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_TW"
; RMDir "$INSTDIR\bin\gtk\share\locale"
RMDir /r "$INSTDIR\bin\gtk\share\themes\Clearlooks"
RMDir /r "$INSTDIR\bin\gtk\share\themes\Default"
RMDir /r "$INSTDIR\bin\gtk\share\themes\Glossy"
@ -641,39 +644,38 @@ Section "Uninstall"
Delete "$INSTDIR\bin\_hashlib.pyd"
Delete "$INSTDIR\bin\_socket.pyd"
Delete "$INSTDIR\bin\_sqlite3.pyd"
Delete "$INSTDIR\bin\_sqlite.pyd"
Delete "$INSTDIR\bin\_ssl.pyd"
Delete "$INSTDIR\bin\_win32sysloader.pyd"
Delete "$INSTDIR\bin\atk.pyd"
Delete "$INSTDIR\bin\bz2.pyd"
Delete "$INSTDIR\bin\cairo._cairo.pyd"
Delete "$INSTDIR\bin\Crypto.Cipher.AES.pyd"
Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd"
Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd"
Delete "$INSTDIR\bin\Crypto.Util._counter.pyd"
Delete "$INSTDIR\bin\gajim.exe"
Delete "$INSTDIR\bin\gio._gio.pyd"
Delete "$INSTDIR\bin\glib._glib.pyd"
Delete "$INSTDIR\bin\gobject._gobject.pyd"
Delete "$INSTDIR\bin\gtk._gtk.pyd"
Delete "$INSTDIR\bin\history_manager.exe"
Delete "$INSTDIR\bin\libeay32.dll"
Delete "$INSTDIR\bin\library.zip"
Delete "$INSTDIR\bin\libxml2.dll"
Delete "$INSTDIR\bin\msvcr71.dll"
Delete "$INSTDIR\bin\OpenSSL.crypto.pyd"
Delete "$INSTDIR\bin\OpenSSL.rand.pyd"
Delete "$INSTDIR\bin\OpenSSL.SSL.pyd"
Delete "$INSTDIR\bin\pangocairo.pyd"
Delete "$INSTDIR\bin\pango.pyd"
Delete "$INSTDIR\bin\pangocairo.pyd"
Delete "$INSTDIR\bin\pyexpat.pyd"
Delete "$INSTDIR\bin\python25.dll"
Delete "$INSTDIR\bin\pywintypes25.dll"
Delete "$INSTDIR\bin\python26.dll"
Delete "$INSTDIR\bin\pywintypes26.dll"
Delete "$INSTDIR\bin\select.pyd"
Delete "$INSTDIR\bin\sqlite3.dll"
Delete "$INSTDIR\bin\ssleay32.dll"
Delete "$INSTDIR\bin\unicodedata.pyd"
Delete "$INSTDIR\bin\w9xpopen.exe"
Delete "$INSTDIR\bin\win32api.pyd"
Delete "$INSTDIR\bin\win32file.pyd"
Delete "$INSTDIR\bin\win32pipe.pyd"
Delete "$INSTDIR\bin\winsound.pyd"
Delete "$INSTDIR\bin\zlib1.dll"
RMDir /r "$INSTDIR\bin\docutils"
RMDir "$INSTDIR\bin"
RMDir /r "$INSTDIR\data\gui"
RMDir /r "$INSTDIR\data\moods"
@ -695,37 +697,39 @@ Section "Uninstall"
RMDir /r "$INSTDIR\data\iconsets\transports"
RMDir "$INSTDIR\data\iconsets"
RMDir "$INSTDIR\data"
RMDir /r "$INSTDIR\po\be"
RMDir /r "$INSTDIR\po\be@latin"
RMDir /r "$INSTDIR\po\bg"
RMDir /r "$INSTDIR\po\br"
RMDir /r "$INSTDIR\po\cs"
RMDir /r "$INSTDIR\po\da"
RMDir /r "$INSTDIR\po\de"
RMDir /r "$INSTDIR\po\el"
RMDir /r "$INSTDIR\po\en_GB"
RMDir /r "$INSTDIR\po\eo"
RMDir /r "$INSTDIR\po\es"
RMDir /r "$INSTDIR\po\eu"
RMDir /r "$INSTDIR\po\fr"
RMDir /r "$INSTDIR\po\gl"
RMDir /r "$INSTDIR\po\hr"
RMDir /r "$INSTDIR\po\it"
RMDir /r "$INSTDIR\po\lt"
RMDir /r "$INSTDIR\po\nb"
RMDir /r "$INSTDIR\po\nl"
RMDir /r "$INSTDIR\po\no"
RMDir /r "$INSTDIR\po\pl"
RMDir /r "$INSTDIR\po\pt"
RMDir /r "$INSTDIR\po\pt_BR"
RMDir /r "$INSTDIR\po\ru"
RMDir /r "$INSTDIR\po\sk"
RMDir /r "$INSTDIR\po\sr"
RMDir /r "$INSTDIR\po\sr@Latn"
RMDir /r "$INSTDIR\po\sv"
RMDir /r "$INSTDIR\po\uk"
RMDir /r "$INSTDIR\po\zh_CN"
RMDir "$INSTDIR\po"
RMDir /r "$INSTDIR\icons\hicolor"
RMDir "$INSTDIR\icons"
; RMDir /r "$INSTDIR\po\be"
; RMDir /r "$INSTDIR\po\be@latin"
; RMDir /r "$INSTDIR\po\bg"
; RMDir /r "$INSTDIR\po\br"
; RMDir /r "$INSTDIR\po\cs"
; RMDir /r "$INSTDIR\po\da"
; RMDir /r "$INSTDIR\po\de"
; RMDir /r "$INSTDIR\po\el"
; RMDir /r "$INSTDIR\po\en_GB"
; RMDir /r "$INSTDIR\po\eo"
; RMDir /r "$INSTDIR\po\es"
; RMDir /r "$INSTDIR\po\eu"
; RMDir /r "$INSTDIR\po\fr"
; RMDir /r "$INSTDIR\po\gl"
; RMDir /r "$INSTDIR\po\hr"
; RMDir /r "$INSTDIR\po\it"
; RMDir /r "$INSTDIR\po\lt"
; RMDir /r "$INSTDIR\po\nb"
; RMDir /r "$INSTDIR\po\nl"
; RMDir /r "$INSTDIR\po\no"
; RMDir /r "$INSTDIR\po\pl"
; RMDir /r "$INSTDIR\po\pt"
; RMDir /r "$INSTDIR\po\pt_BR"
; RMDir /r "$INSTDIR\po\ru"
; RMDir /r "$INSTDIR\po\sk"
; RMDir /r "$INSTDIR\po\sr"
; RMDir /r "$INSTDIR\po\sr@Latn"
; RMDir /r "$INSTDIR\po\sv"
; RMDir /r "$INSTDIR\po\uk"
; RMDir /r "$INSTDIR\po\zh_CN"
; RMDir "$INSTDIR\po"
Delete "$INSTDIR\AUTHORS"
Delete "$INSTDIR\COPYING"
Delete "$INSTDIR\THANKS"

View File

@ -19,70 +19,43 @@
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
##
from distutils.core import setup
import py2exe
from cx_Freeze import setup, Executable
import glob
import sys
import os
docutils_files = []
def fill_docutils_files(folder, base=u'docutils'):
docutils_files.append((base, glob.glob(os.path.join(folder, base, '*.pyc'))))
for path in os.listdir(os.path.join(folder, base)):
if os.path.isdir(os.path.join(folder, base, path)):
fill_docutils_files(folder, base=os.path.join(base, path))
try:
import docutils.readers
import docutils.writers.html4css1
import docutils.languages
except ImportError:
pass
else:
fill_docutils_files(os.path.join(sys.prefix, 'Lib', 'site-packages'))
docutils_files.append((os.path.join('docutils', 'writers', 'html4css1'),
glob.glob(os.path.join(sys.prefix, 'Lib', 'site-packages', 'docutils',
'writers', 'html4css1', '*.css'))))
sys.path.append('src')
# Use local gtk folder instead of the one in PATH that is not latest gtk
if 'gtk' in os.listdir('.'):
sys.path.append('gtk/bin')
opts = {
'py2exe': {
# ConfigParser,UserString,roman are needed for docutils
'includes': ('pango,atk,gobject,cairo,pangocairo,gtk.keysyms,'
'encodings,encodings.*,ConfigParser,UserString'),
'dll_excludes': [
options = {
'build_exe': {
'includes': ['gtk.keysyms'],
'base': 'Win32GUI',
'bin_excludes': [
'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',
'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll',
'libgio-2.0-0.dll',
'libglib-2.0-0.dll', 'libgmodule-2.0-0.dll',
'libgobject-2.0-0.dll', 'libgthread-2.0-0.dll',
'libgtk-win32-2.0-0.dll', 'libpango-1.0-0.dll',
'libpangowin32-1.0-0.dll', 'libcairo-2.dll',
'libpangocairo-1.0-0.dll', 'libpangoft2-1.0-0.dll',
],
'excludes': [
'docutils'
],
'optimize': 2,
}
}
}
setup(
name='Gajim',
version='0.12.1',
version='0.14.1',
description='A full featured Jabber client',
author='Gajim Development Team',
url='http://www.gajim.org/',
download_url='http://www.gajim.org/downloads.php',
license='GPL',
windows=[{'script': 'src/gajim.py',
'icon_resources': [(1, 'data/pixmaps/gajim.ico')]},
{'script': 'src/history_manager.py',
'icon_resources': [(1, 'data/pixmaps/gajim.ico')]}],
options=opts,
data_files=docutils_files,
options=options,
executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'),
Executable('src/history_manager.py', icon='data/pixmaps/gajim.ico')],
)

View File

@ -28,6 +28,7 @@ if __name__ == '__main__':
from common import i18n
import common.configpaths
common.configpaths.gajimpaths.init(None)
common.configpaths.gajimpaths.init_profile()
from common import helpers
from common.xmpp.idlequeue import IdleCommand

View File

@ -212,6 +212,8 @@ class FeaturesWindow:
return True
def srv_available(self):
if os.name == 'nt':
return True
return helpers.is_in_path('nslookup')
def speller_available(self):

View File

@ -37,9 +37,31 @@
import os
import sys
if os.name == 'nt':
import locale
import gettext
APP = 'gajim'
DIR = '../po'
lang, enc = locale.getdefaultlocale()
os.environ['LANG'] = lang
gettext.bindtextdomain(APP, DIR)
gettext.textdomain(APP)
gettext.install(APP, DIR, unicode=True)
locale.setlocale(locale.LC_ALL, '')
import ctypes
libintl = ctypes.cdll.LoadLibrary('gtk\\bin\\intl.dll')
libintl.bindtextdomain(APP, DIR)
import warnings
if os.name == 'nt':
log_file = os.path.join(os.environ['APPDATA'], 'Gajim', 'gajim.log')
fout = open(log_file, 'a')
sys.stdout = fout
sys.stderr = fout
warnings.filterwarnings(action='ignore')
if os.path.isdir('gtk'):
@ -349,7 +371,7 @@ def on_exit():
if os.path.exists(pid_filename):
os.remove(pid_filename)
# Shutdown GUI and save config
if hasattr(gajim.interface, 'roster'):
if hasattr(gajim.interface, 'roster') and gajim.interface.roster:
gajim.interface.roster.prepare_quit()
import atexit