diff pidgin/win32/nsis/pidgin-installer.nsi @ 16248:ff2cd3f29f9b

Fix win32 build for Jabber/XMPP split.
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 18 Apr 2007 22:00:41 +0000
parents 502b69976fe1
children e96a4756734a
line wrap: on
line diff
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Wed Apr 18 21:14:39 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed Apr 18 22:00:41 2007 +0000
@@ -442,6 +442,11 @@
     SetOutPath "$INSTDIR"
     ; Pidgin files
     SetOverwrite on
+
+    ;Delete old liboscar and libjabber since they tend to be problematic
+    Delete "$INSTDIR\plugins\liboscar.dll"
+    Delete "$INSTDIR\plugins\libjabber.dll"
+
     File /r ..\..\..\${PIDGIN_INSTALL_DIR}\*.*
     !ifdef DEBUG
     File "${PIDGIN_INSTALLER_DEPS}\exchndl.dll"
@@ -676,7 +681,6 @@
     Delete "$INSTDIR\plugins\libgg.dll"
     Delete "$INSTDIR\plugins\libicq.dll"
     Delete "$INSTDIR\plugins\libirc.dll"
-    Delete "$INSTDIR\plugins\libjabber.dll"
     Delete "$INSTDIR\plugins\libmsn.dll"
     Delete "$INSTDIR\plugins\libnapster.dll"
     Delete "$INSTDIR\plugins\libnovell.dll"
@@ -686,6 +690,7 @@
     Delete "$INSTDIR\plugins\libsimple.dll"
     Delete "$INSTDIR\plugins\libtoc.dll"
     Delete "$INSTDIR\plugins\libyahoo.dll"
+    Delete "$INSTDIR\plugins\libxmpp.dll"
     Delete "$INSTDIR\plugins\log_reader.dll"
     Delete "$INSTDIR\plugins\markerline.dll"
     Delete "$INSTDIR\plugins\newline.dll"
@@ -715,6 +720,7 @@
     Delete "$INSTDIR\freebl3.dll"
     Delete "$INSTDIR\idletrack.dll"
     Delete "$INSTDIR\libgtkspell.dll"
+    Delete "$INSTDIR\libjabber.dll"
     Delete "$INSTDIR\liboscar.dll"
     Delete "$INSTDIR\libpurple.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"