11 files changed, 255 insertions, 257 deletions
diff --git a/build/build-x64.bat b/build/build-x64.bat
index d72a8f2a..6d87c5d2 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -11,9 +11,6 @@ nmake -f makefile.mak
 cd ..\plugins\ewc
 nmake -f makefile.mak clean
 nmake -f makefile.mak
-::cd ..\dns
-::nmake -f makefile.mak clean
-::nmake -f makefile.mak
 cd ..\lua
 nmake -f makefile.mak clean
 nmake -f makefile.mak
@@ -29,16 +26,6 @@ nmake -f makefile.mak
 cd ..\xdcc
 nmake -f makefile.mak clean
 nmake -f makefile.mak
-::cd ..\xtray
-::nmake -f makefile.mak clean
-::nmake -f makefile.mak
 cd ..\..\build
-set PATH=%PATH%;c:\mozilla-build\build\xchat-dev32\bin
-call compile-po-files.bat
-cd ..\build
 set PATH=%OPATH%
 call release-x64.bat
-set PATH=c:\Program Files (x86)\Inno Setup 5
-compil32 /cc xchat-wdk-x64.iss
-set PATH=%OPATH%
-pause
diff --git a/build/build-x86.bat b/build/build-x86.bat
index c1c767c0..9e919d3b 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -10,9 +10,6 @@ nmake -f makefile.mak
 cd ..\plugins\ewc
 nmake -f makefile.mak clean
 nmake -f makefile.mak
-::cd ..\dns
-::nmake -f makefile.mak clean
-::nmake -f makefile.mak
 cd ..\lua
 nmake -f makefile.mak clean
 nmake -f makefile.mak
@@ -28,15 +25,8 @@ nmake -f makefile.mak
 cd ..\xdcc
 nmake -f makefile.mak clean
 nmake -f makefile.mak
-::cd ..\xtray
-::nmake -f makefile.mak clean
-::nmake -f makefile.mak
 cd ..\..\build
 call compile-po-files.bat
 cd ..\build
 set PATH=%OPATH%
 call release-x86.bat
-set PATH=c:\Program Files (x86)\Inno Setup 5
-compil32 /cc xchat-wdk-x86.iss
-set PATH=%OPATH%
-pause
diff --git a/build/build.bat b/build/build.bat
index 6c0982de..ff158539 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -1,6 +1,7 @@
 @echo off
 call build-x86.bat
 call build-x64.bat
+call release.bat
 set PATH=c:\Program Files (x86)\Inno Setup 5
 compil32 /cc xchat-wdk.iss
 pause
diff --git a/build/release-x64.bat b/build/release-x64.bat
index bad1d5e8..c9627ed5 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -28,22 +28,12 @@ xcopy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\libintl-8.dll %XCHAT_DEST%
 xcopy /S /I %GTK_BIN%\..\lib\gtk-2.0 %XCHAT_DEST%\lib\gtk-2.0
 rmdir /Q /S %XCHAT_DEST%\lib\gtk-2.0\include
-xcopy /S /I etc %XCHAT_DEST%\etc
-xcopy ..\COPYING %XCHAT_DEST%
-xcopy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
-xcopy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
 xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST%
 xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
-::xcopy /S /I ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\
-::xcopy /S /I ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\
 xcopy %LUA_BIN%\lua51.dll %XCHAT_DEST%
-xcopy /S /I /Q ..\po\locale %XCHAT_DEST%\locale
-xcopy /S /I /Q %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
-echo 2> portable-mode
-move portable-mode %XCHAT_DEST%
diff --git a/build/release-x86.bat b/build/release-x86.bat
index 337328be..b0e8a83a 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -2,7 +2,7 @@
 set GTK_BIN=c:\mozilla-build\build\xchat-dev32\bin
 set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x86\bin
 set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x86\bin
-set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x86
+set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
 rmdir /Q /S %XCHAT_DEST%
 mkdir %XCHAT_DEST%
 xcopy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
@@ -34,14 +34,12 @@ xcopy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
 xcopy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
 xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST%
 xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
-::xcopy /S /I ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\
-::xcopy /S /I ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\
 xcopy %LUA_BIN%\lua51.dll %XCHAT_DEST%
 xcopy /S /I /Q ..\po\locale %XCHAT_DEST%\locale
 xcopy /S /I /Q %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
diff --git a/build/release.bat b/build/release.bat
new file mode 100644
index 00000000..4caf97c7
--- /dev/null
+++ b/build/release.bat
@@ -0,0 +1,37 @@
+@echo off
+set XCHAT_X64=c:\mozilla-build\build\xchat-wdk-x64
+set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
+move %XCHAT_X64%\xchat.exe %XCHAT_DEST%\xchat.exe.x64
+move %XCHAT_X64%\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64
+move %XCHAT_X64%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%\libgdk_pixbuf-2.0-0.dll.x64
+move %XCHAT_X64%\libgio-2.0-0.dll %XCHAT_DEST%\libgio-2.0-0.dll.x64
+move %XCHAT_X64%\libglib-2.0-0.dll %XCHAT_DEST%\libglib-2.0-0.dll.x64
+move %XCHAT_X64%\libgmodule-2.0-0.dll %XCHAT_DEST%\libgmodule-2.0-0.dll.x64
+move %XCHAT_X64%\libgobject-2.0-0.dll %XCHAT_DEST%\libgobject-2.0-0.dll.x64
+move %XCHAT_X64%\libgthread-2.0-0.dll %XCHAT_DEST%\libgthread-2.0-0.dll.x64
+move %XCHAT_X64%\libpng14-14.dll %XCHAT_DEST%\libpng14-14.dll.x64
+move %XCHAT_X64%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
+move %XCHAT_X64%\libgdk-win32-2.0-0.dll %XCHAT_DEST%\libgdk-win32-2.0-0.dll.x64
+move %XCHAT_X64%\libcairo-2.dll %XCHAT_DEST%\libcairo-2.dll.x64
+move %XCHAT_X64%\libfontconfig-1.dll %XCHAT_DEST%\libfontconfig-1.dll.x64
+move %XCHAT_X64%\libexpat-1.dll %XCHAT_DEST%\libexpat-1.dll.x64
+move %XCHAT_X64%\libfreetype-6.dll %XCHAT_DEST%\libfreetype-6.dll.x64
+move %XCHAT_X64%\libpango-1.0-0.dll %XCHAT_DEST%\libpango-1.0-0.dll.x64
+move %XCHAT_X64%\libpangocairo-1.0-0.dll %XCHAT_DEST%\libpangocairo-1.0-0.dll.x64
+move %XCHAT_X64%\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64
+move %XCHAT_X64%\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64
+move %XCHAT_X64%\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64
+move %XCHAT_X64%\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64
+move %XCHAT_X64%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64
+move %XCHAT_X64%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64
+move %XCHAT_X64%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64
+move %XCHAT_X64%\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64
+move %XCHAT_X64%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64
+move %XCHAT_X64%\plugins\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64
+move %XCHAT_X64%\plugins\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64
+move %XCHAT_X64%\plugins\xcperl.dll %XCHAT_DEST%\plugins\xcperl.dll.x64
+move %XCHAT_X64%\plugins\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64
+move %XCHAT_X64%\plugins\xctcl.dll %XCHAT_DEST%\plugins\xctcl.dll.x64
+move %XCHAT_X64%\plugins\xcxdcc.dll %XCHAT_DEST%\plugins\xcxdcc.dll.x64
+move %XCHAT_X64%\lua51.dll %XCHAT_DEST%\lua51.dll.x64
+rmdir /Q /S %XCHAT_X64%
diff --git a/build/test-x64.bat b/build/test-x64.bat
deleted file mode 100644
index 95f46d37..00000000
--- a/build/test-x64.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-set PATH=c:\mozilla-build\build\xchat-dev64\bin;c:\mozilla-build\perl-5.10-x64\bin;c:\mozilla-build\python-2.6-x64
-..\src\fe-gtk\xchat.exe
diff --git a/build/test-x86.bat b/build/test-x86.bat
deleted file mode 100644
index d45ce8ff..00000000
--- a/build/test-x86.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-set PATH=c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\perl-5.10-x86\bin;c:\mozilla-build\python-2.6-x86
-..\src\fe-gtk\xchat.exe
diff --git a/build/xchat-wdk-x64.iss b/build/xchat-wdk-x64.iss
deleted file mode 100644
index c3ae4720..00000000
--- a/build/xchat-wdk-x64.iss
+++ /dev/null
@@ -1,98 +0,0 @@
-[Setup]
-AppName=XChat-WDK (x64)
-AppVerName=XChat-WDK (x64) r1459-2
-AppVersion=14.59.2
-VersionInfoVersion=14.59.2
-OutputBaseFilename=XChat-WDK r1459-2 x64
-AppPublisher=XChat-WDK
-AppPublisherURL=http://code.google.com/p/xchat-wdk/
-AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
-AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list
-AppUpdatesURL=http://code.google.com/p/xchat-wdk/wiki/InfoXChat
-WizardImageFile=c:\mozilla-build\build\xchat.bmp
-SetupIconFile=c:\mozilla-build\build\xchat-wdk\xchat.ico
-LicenseFile=COPYING
-UninstallDisplayIcon={app}\xchat.exe
-UninstallDisplayName=XChat-WDK (x64)
-DefaultDirName={pf}\XChat-WDK
-DefaultGroupName=XChat-WDK
-DisableProgramGroupPage=yes
-SolidCompression=yes
-SourceDir=..\..\xchat-wdk-x64
-OutputDir=..\xchat-wdk\build
-FlatComponentsList=no
-PrivilegesRequired=none
-CreateUninstallRegKey=not IsTaskSelected('portablemode')
-Uninstallable=not IsTaskSelected('portablemode')
-ArchitecturesAllowed=x64
-ArchitecturesInstallIn64BitMode=x64
-
-[Types]
-Name: "normal"; Description: "Normal Installation"
-Name: "full"; Description: "Full Installation"
-Name: "custom"; Description: "Custom Installation"; Flags: iscustom
-
-[Components]
-Name: "libs"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed
-Name: "translations"; Description: "Translations"; Types: normal full custom
-Name: "plugins"; Description: "Language Interfaces"; Types: full custom
-Name: "plugins\lua"; Description: "Lua (experimental)"; Types: full custom
-Name: "plugins\lua\luawdk"; Description: "Lua-WDK 5.1.4-2"; Types: full custom
-Name: "plugins\perl"; Description: "Perl (needs ActivePerl 5.12)"; Types: full custom
-Name: "plugins\python"; Description: "Python (needs ActivePython 2.6)"; Types: full custom
-Name: "plugins\tcl"; Description: "Tcl (needs ActiveTcl 8.5)"; Types: full custom
-
-[Tasks]
-Name: portablemode; Description: "Portable Mode (no Registry entries, no Start Menu icons, no uninstaller)"; Flags: unchecked
-
-[Files]
-Source: "COPYING"; DestDir: "{app}"; Components: libs
-Source: "libfreetype-6.dll"; DestDir: "{app}"; Components: libs
-Source: "libintl-8.dll"; DestDir: "{app}"; Components: libs
-Source: "libatk-1.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libcairo-2.dll"; DestDir: "{app}"; Components: libs
-Source: "libeay32.dll"; DestDir: "{app}"; Components: libs
-Source: "libexpat-1.dll"; DestDir: "{app}"; Components: libs
-Source: "libfontconfig-1.dll"; DestDir: "{app}"; Components: libs
-Source: "libgdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgdk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgio-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libglib-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgmodule-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgobject-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgthread-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgtk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libpango-1.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libpangocairo-1.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libpangoft2-1.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libpangowin32-1.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libpng14-14.dll"; DestDir: "{app}"; Components: libs
-Source: "LICENSE.OPENSSL"; DestDir: "{app}"; Components: libs
-Source: "LICENSE.ZLIB"; DestDir: "{app}"; Components: libs
-Source: "ssleay32.dll"; DestDir: "{app}"; Components: libs
-Source: "zlib1.dll"; DestDir: "{app}"; Components: libs
-
-Source: "plugins\xcewc.dll"; DestDir: "{app}\plugins"; Components: libs
-Source: "plugins\xcxdcc.dll"; DestDir: "{app}\plugins"; Components: libs
-
-Source: "xchat.exe"; DestDir: "{app}"; Components: libs
-Source: "portable-mode"; DestDir: "{app}"; Tasks: portablemode
-
-Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: plugins\lua
-Source: "lua51.dll"; DestDir: "{app}"; Components: plugins\lua\luawdk
-Source: "plugins\xcperl.dll"; DestDir: "{app}\plugins"; Components: plugins\perl
-Source: "plugins\xcpython.dll"; DestDir: "{app}\plugins"; Components: plugins\python
-Source: "plugins\xctcl.dll"; DestDir: "{app}\plugins"; Components: plugins\tcl
-
-Source: "etc\*"; DestDir: "{app}\etc"; Flags: createallsubdirs recursesubdirs; Components: libs
-Source: "lib\*"; DestDir: "{app}\lib"; Flags: createallsubdirs recursesubdirs; Components: libs
-
-Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubdirs; Components: translations
-Source: "share\*"; DestDir: "{app}\share"; Flags: createallsubdirs recursesubdirs; Components: translations
-
-[Icons]
-Name: "{group}\XChat-WDK (x64)"; Filename: "{app}\xchat.exe"; Tasks: not portablemode
-Name: "{group}\Uninstall XChat-WDK (x64)"; Filename: "{uninstallexe}"; Tasks: not portablemode
-
-[Messages]
-BeveledLabel= XChat-WDK (x64)
diff --git a/build/xchat-wdk-x86.iss b/build/xchat-wdk-x86.iss
deleted file mode 100644
index 82121e5b..00000000
--- a/build/xchat-wdk-x86.iss
+++ /dev/null
@@ -1,97 +0,0 @@
-[Setup]
-AppName=XChat-WDK (x86)
-AppVerName=XChat-WDK (x86) r1459-2
-AppVersion=14.59.2
-VersionInfoVersion=14.59.2
-OutputBaseFilename=XChat-WDK r1459-2 x86
-AppPublisher=XChat-WDK
-AppPublisherURL=http://code.google.com/p/xchat-wdk/
-AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
-AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list
-AppUpdatesURL=http://code.google.com/p/xchat-wdk/wiki/InfoXChat
-WizardImageFile=c:\mozilla-build\build\xchat.bmp
-SetupIconFile=c:\mozilla-build\build\xchat-wdk\xchat.ico
-LicenseFile=COPYING
-UninstallDisplayIcon={app}\xchat.exe
-UninstallDisplayName=XChat-WDK (x86)
-DefaultDirName={pf}\XChat-WDK
-DefaultGroupName=XChat-WDK
-DisableProgramGroupPage=yes
-SolidCompression=yes
-SourceDir=..\..\xchat-wdk-x86
-OutputDir=..\xchat-wdk\build
-FlatComponentsList=no
-PrivilegesRequired=none
-CreateUninstallRegKey=not IsTaskSelected('portablemode')
-Uninstallable=not IsTaskSelected('portablemode')
-ArchitecturesAllowed=x86 x64
-
-[Types]
-Name: "normal"; Description: "Normal Installation"
-Name: "full"; Description: "Full Installation"
-Name: "custom"; Description: "Custom Installation"; Flags: iscustom
-
-[Components]
-Name: "libs"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed
-Name: "translations"; Description: "Translations"; Types: normal full custom
-Name: "plugins"; Description: "Language Interfaces"; Types: full custom
-Name: "plugins\lua"; Description: "Lua (experimental)"; Types: full custom
-Name: "plugins\lua\luawdk"; Description: "Lua-WDK 5.1.4-2"; Types: full custom
-Name: "plugins\perl"; Description: "Perl (needs ActivePerl 5.12)"; Types: full custom
-Name: "plugins\python"; Description: "Python (needs ActivePython 2.6)"; Types: full custom
-Name: "plugins\tcl"; Description: "Tcl (needs ActiveTcl 8.5)"; Types: full custom
-
-[Tasks]
-Name: portablemode; Description: "Portable Mode (no Registry entries, no Start Menu icons, no uninstaller)"; Flags: unchecked
-
-[Files]
-Source: "COPYING"; DestDir: "{app}"; Components: libs
-Source: "freetype6.dll"; DestDir: "{app}"; Components: libs
-Source: "intl.dll"; DestDir: "{app}"; Components: libs
-Source: "libatk-1.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libcairo-2.dll"; DestDir: "{app}"; Components: libs
-Source: "libeay32.dll"; DestDir: "{app}"; Components: libs
-Source: "libexpat-1.dll"; DestDir: "{app}"; Components: libs
-Source: "libfontconfig-1.dll"; DestDir: "{app}"; Components: libs
-Source: "libgdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgdk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgio-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libglib-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgmodule-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgobject-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgthread-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libgtk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libpango-1.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libpangocairo-1.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libpangoft2-1.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libpangowin32-1.0-0.dll"; DestDir: "{app}"; Components: libs
-Source: "libpng14-14.dll"; DestDir: "{app}"; Components: libs
-Source: "LICENSE.OPENSSL"; DestDir: "{app}"; Components: libs
-Source: "LICENSE.ZLIB"; DestDir: "{app}"; Components: libs
-Source: "ssleay32.dll"; DestDir: "{app}"; Components: libs
-Source: "zlib1.dll"; DestDir: "{app}"; Components: libs
-
-Source: "plugins\xcewc.dll"; DestDir: "{app}\plugins"; Components: libs
-Source: "plugins\xcxdcc.dll"; DestDir: "{app}\plugins"; Components: libs
-
-Source: "xchat.exe"; DestDir: "{app}"; Components: libs
-Source: "portable-mode"; DestDir: "{app}"; Tasks: portablemode
-
-Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: plugins\lua
-Source: "lua51.dll"; DestDir: "{app}"; Components: plugins\lua\luawdk
-Source: "plugins\xcperl.dll"; DestDir: "{app}\plugins"; Components: plugins\perl
-Source: "plugins\xcpython.dll"; DestDir: "{app}\plugins"; Components: plugins\python
-Source: "plugins\xctcl.dll"; DestDir: "{app}\plugins"; Components: plugins\tcl
-
-Source: "etc\*"; DestDir: "{app}\etc"; Flags: createallsubdirs recursesubdirs; Components: libs
-Source: "lib\*"; DestDir: "{app}\lib"; Flags: createallsubdirs recursesubdirs; Components: libs
-
-Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubdirs; Components: translations
-Source: "share\*"; DestDir: "{app}\share"; Flags: createallsubdirs recursesubdirs; Components: translations
-
-[Icons]
-Name: "{group}\XChat-WDK (x86)"; Filename: "{app}\xchat.exe"; Tasks: not portablemode
-Name: "{group}\Uninstall XChat-WDK (x86)"; Filename: "{uninstallexe}"; Tasks: not portablemode
-
-[Messages]
-BeveledLabel= XChat-WDK (x86)
diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss
index d50b3b14..22f28b60 100644
--- a/build/xchat-wdk.iss
+++ b/build/xchat-wdk.iss
@@ -1,39 +1,235 @@
 [Setup]
 AppName=XChat-WDK
-AppVerName=XChat-WDK r1459-2
-AppVersion=14.59.2
-VersionInfoVersion=14.59.2
-OutputBaseFilename=XChat-WDK r1459-2
+AppVerName=XChat-WDK r1459-3
+AppVersion=14.59.3
+VersionInfoVersion=14.59.3
+OutputBaseFilename=XChat-WDK r1459-3
 AppPublisher=XChat-WDK
 AppPublisherURL=http://code.google.com/p/xchat-wdk/
 AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
 AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list
 AppUpdatesURL=http://code.google.com/p/xchat-wdk/wiki/InfoXChat
+WizardImageFile=c:\mozilla-build\build\xchat.bmp
 SetupIconFile=c:\mozilla-build\build\xchat-wdk\xchat.ico
-CreateAppDir=no
-DisableWelcomePage=yes
-DisableReadyPage=yes
-DisableFinishedPage=yes
+LicenseFile=COPYING
+UninstallDisplayIcon={app}\xchat.exe
+UninstallDisplayName=XChat-WDK
+DefaultDirName={pf}\XChat-WDK
+DefaultGroupName=XChat-WDK
+DisableProgramGroupPage=yes
 SolidCompression=yes
-SourceDir=.
-OutputDir=.
-PrivilegesRequired=lowest
-CreateUninstallRegKey=no
-Uninstallable=no
+SourceDir=..\..\xchat-wdk-uni
+OutputDir=..\xchat-wdk\build
+FlatComponentsList=no
+PrivilegesRequired=none
+CreateUninstallRegKey=not IsTaskSelected('portablemode')
+Uninstallable=not IsTaskSelected('portablemode')
 ArchitecturesAllowed=x86 x64
 ArchitecturesInstallIn64BitMode=x64
 
+[Types]
+Name: "normal"; Description: "Normal Installation"
+Name: "full"; Description: "Full Installation"
+Name: "custom"; Description: "Custom Installation"; Flags: iscustom
+
+[Components]
+Name: "libs"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed
+Name: "translations"; Description: "Translations"; Types: normal full custom
+Name: "plugins"; Description: "Language Interfaces"; Types: full custom
+Name: "plugins\lua"; Description: "Lua (experimental)"; Types: full custom
+Name: "plugins\lua\luawdk"; Description: "Lua-WDK 5.1.4-2"; Types: full custom
+Name: "plugins\perl"; Description: "Perl (needs ActivePerl 5.12)"; Types: full custom
+Name: "plugins\python"; Description: "Python (needs ActivePython 2.6)"; Types: full custom
+Name: "plugins\tcl"; Description: "Tcl (needs ActiveTcl 8.5)"; Types: full custom
+
 [Tasks]
-Name: x86; Description: "x86"; GroupDescription: "Please select which version of XChat-WDK you want to install:"; Flags: exclusive unchecked
-Name: x64; Description: "x64"; GroupDescription: "Please select which version of XChat-WDK you want to install:"; Flags: exclusive; Check: Is64BitInstallMode
+Name: portablemode; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked
+Name: x86; Description: "x86"; GroupDescription: "XChat-WDK version:"; Flags: exclusive unchecked
+Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: exclusive; Check: Is64BitInstallMode
 
 [Files]
-Source: "XChat-WDK r1459-2 x86.exe"; DestDir: "{tmp}"; Tasks: x86
-Source: "XChat-WDK r1459-2 x64.exe"; DestDir: "{tmp}"; Tasks: x64
+Source: "COPYING"; DestDir: "{app}"; Components: libs
+Source: "LICENSE.OPENSSL"; DestDir: "{app}"; Components: libs
+Source: "LICENSE.ZLIB"; DestDir: "{app}"; Components: libs
+Source: "portable-mode"; DestDir: "{app}"; Tasks: portablemode
+Source: "etc\*"; DestDir: "{app}\etc"; Flags: createallsubdirs recursesubdirs; Components: libs
+Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubdirs; Components: translations
+Source: "share\*"; DestDir: "{app}\share"; Flags: createallsubdirs recursesubdirs; Components: translations
+
+
+
+Source: "xchat.exe"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "xchat.exe.x64"; DestDir: "{app}"; DestName: "xchat.exe"; Components: libs; Tasks: x64
+
+
+
+Source: "freetype6.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libfreetype-6.dll.x64"; DestDir: "{app}"; DestName: "libfreetype-6.dll"; Components: libs; Tasks: x64
+
+Source: "intl.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libintl-8.dll.x64"; DestDir: "{app}"; DestName: "libintl-8.dll"; Components: libs; Tasks: x64
+
+
+
+Source: "libatk-1.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libatk-1.0-0.dll.x64"; DestDir: "{app}"; DestName: "libatk-1.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libcairo-2.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libcairo-2.dll.x64"; DestDir: "{app}"; DestName: "libcairo-2.dll"; Components: libs; Tasks: x64
+
+Source: "libeay32.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libeay32.dll.x64"; DestDir: "{app}"; DestName: "libeay32.dll"; Components: libs; Tasks: x64
+
+Source: "libexpat-1.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libexpat-1.dll.x64"; DestDir: "{app}"; DestName: "libexpat-1.dll"; Components: libs; Tasks: x64
+
+Source: "libfontconfig-1.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libfontconfig-1.dll.x64"; DestDir: "{app}"; DestName: "libfontconfig-1.dll"; Components: libs; Tasks: x64
+
+Source: "libgdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libgdk_pixbuf-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgdk_pixbuf-2.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libgdk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libgdk-win32-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgdk-win32-2.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libgio-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libgio-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgio-2.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libglib-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libglib-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libglib-2.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libgmodule-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libgmodule-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgmodule-2.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libgobject-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libgobject-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgobject-2.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libgthread-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libgthread-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgthread-2.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libgtk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libgtk-win32-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgtk-win32-2.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libpango-1.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libpango-1.0-0.dll.x64"; DestDir: "{app}"; DestName: "libpango-1.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libpangocairo-1.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libpangocairo-1.0-0.dll.x64"; DestDir: "{app}"; DestName: "libpangocairo-1.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libpangoft2-1.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libpangoft2-1.0-0.dll.x64"; DestDir: "{app}"; DestName: "libpangoft2-1.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libpangowin32-1.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libpangowin32-1.0-0.dll.x64"; DestDir: "{app}"; DestName: "libpangowin32-1.0-0.dll"; Components: libs; Tasks: x64
+
+Source: "libpng14-14.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libpng14-14.dll.x64"; DestDir: "{app}"; DestName: "libpng14-14.dll"; Components: libs; Tasks: x64
+
+Source: "lua51.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "lua51.dll.x64"; DestDir: "{app}"; DestName: "lua51.dll"; Components: libs; Tasks: x64
+
+Source: "ssleay32.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "ssleay32.dll.x64"; DestDir: "{app}"; DestName: "ssleay32.dll"; Components: libs; Tasks: x64
+
+Source: "zlib1.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "zlib1.dll.x64"; DestDir: "{app}"; DestName: "zlib1.dll"; Components: libs; Tasks: x64
+
+
+
+Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs; Tasks: x86
+Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; DestName: "libpixmap.dll"; Components: libs; Tasks: x64
+
+Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs; Tasks: x86
+Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; DestName: "libwimp.dll"; Components: libs; Tasks: x64
+
+Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; Components: libs; Tasks: x86
+Source: "lib\gtk-2.0\modules\libgail.dll.x64"; DestDir: "{app}\lib\gtk-2.0\modules"; DestName: "libgail.dll"; Components: libs; Tasks: x64
+
+
+
+Source: "plugins\xcewc.dll"; DestDir: "{app}\plugins"; Components: libs; Tasks: x86
+Source: "plugins\xcewc.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcewc.dll"; Components: libs; Tasks: x64
+
+Source: "plugins\xcxdcc.dll"; DestDir: "{app}\plugins"; Components: libs; Tasks: x86
+Source: "plugins\xcxdcc.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcxdcc.dll"; Components: libs; Tasks: x64
+
+
+
+Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: plugins\lua; Tasks: x86
+Source: "plugins\xclua.dll.x64"; DestDir: "{app}\plugins"; DestName: "xclua.dll"; Components: plugins\lua; Tasks: x64
+
+Source: "plugins\xcperl.dll"; DestDir: "{app}\plugins"; Components: plugins\perl; Tasks: x86
+Source: "plugins\xcperl.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: plugins\perl; Tasks: x64
+
+Source: "plugins\xcpython.dll"; DestDir: "{app}\plugins"; Components: plugins\python; Tasks: x86
+Source: "plugins\xcpython.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcpython.dll"; Components: plugins\python; Tasks: x64
+
+Source: "plugins\xctcl.dll"; DestDir: "{app}\plugins"; Components: plugins\tcl; Tasks: x86
+Source: "plugins\xctcl.dll.x64"; DestDir: "{app}\plugins"; DestName: "xctcl.dll"; Components: plugins\tcl; Tasks: x64
+
+[Icons]
+Name: "{group}\XChat-WDK"; Filename: "{app}\xchat.exe"; Tasks: not portablemode
+Name: "{group}\Uninstall XChat-WDK"; Filename: "{uninstallexe}"; Tasks: not portablemode
 
 [Messages]
 BeveledLabel= XChat-WDK
 
-[Run]
-Filename: "{tmp}\XChat-WDK r1459-2 x86.exe"; Flags: nowait; Tasks: x86
-Filename: "{tmp}\XChat-WDK r1459-2 x64.exe"; Flags: nowait; Tasks: x64
+[Code]
+/////////////////////////////////////////////////////////////////////
+function GetUninstallString(): String;
+var
+  sUnInstPath: String;
+  sUnInstallString: String;
+begin
+  sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\XChat-WDK_is1');
+  sUnInstallString := '';
+  if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then
+    RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString);
+  Result := sUnInstallString;
+end;
+
+
+/////////////////////////////////////////////////////////////////////
+function IsUpgrade(): Boolean;
+begin
+  Result := (GetUninstallString() <> '');
+end;
+
+
+/////////////////////////////////////////////////////////////////////
+function UnInstallOldVersion(): Integer;
+var
+  sUnInstallString: String;
+  iResultCode: Integer;
+begin
+// Return Values:
+// 1 - uninstall string is empty
+// 2 - error executing the UnInstallString
+// 3 - successfully executed the UnInstallString
+
+  // default return value
+  Result := 0;
+
+  // get the uninstall string of the old app
+  sUnInstallString := GetUninstallString();
+  if sUnInstallString <> '' then begin
+    sUnInstallString := RemoveQuotes(sUnInstallString);
+    if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
+      Result := 3
+    else
+      Result := 2;
+  end else
+    Result := 1;
+end;
+
+/////////////////////////////////////////////////////////////////////
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if (CurStep=ssInstall) then
+  begin
+    if (IsUpgrade()) then
+    begin
+      UnInstallOldVersion();
+    end;
+  end;
+end;