some more work on merger

3 files changed, 34 insertions, 73 deletions

diff --git a/build/build.bat b/build/build.bat
index ff158539..6c0982de 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -1,7 +1,6 @@
 @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 c9627ed5..9b4fea71 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -2,38 +2,37 @@
 set GTK_BIN=c:\mozilla-build\build\xchat-dev64\bin
 set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x64\bin
 set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x64\bin
-set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x64
-rmdir /Q /S %XCHAT_DEST%
-mkdir %XCHAT_DEST%
-xcopy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
-xcopy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\zlib1.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libfreetype-6.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
-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 %SSL_BIN%\libeay32.dll %XCHAT_DEST%
-xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
-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 %LUA_BIN%\lua51.dll %XCHAT_DEST%
+set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
+copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%\xchat.exe.x64
+copy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64
+copy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%\libgdk_pixbuf-2.0-0.dll.x64
+copy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%\libgio-2.0-0.dll.x64
+copy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%\libglib-2.0-0.dll.x64
+copy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%\libgmodule-2.0-0.dll.x64
+copy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%\libgobject-2.0-0.dll.x64
+copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%\libgthread-2.0-0.dll.x64
+copy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%\libpng14-14.dll.x64
+copy %GTK_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
+copy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%\libgdk-win32-2.0-0.dll.x64
+copy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%\libcairo-2.dll.x64
+copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%\libfontconfig-1.dll.x64
+copy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%\libexpat-1.dll.x64
+copy %GTK_BIN%\libfreetype-6.dll %XCHAT_DEST%\libfreetype-6.dll.x64
+copy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%\libpango-1.0-0.dll.x64
+copy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%\libpangocairo-1.0-0.dll.x64
+copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64
+copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64
+copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64
+copy %GTK_BIN%\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64
+copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64
+copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64
+copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64
+copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64
+copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64
+copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64
+copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64
+copy ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\xcperl.dll.x64
+copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64
+copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\xctcl.dll.x64
+copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\xcxdcc.dll.x64
+copy %LUA_BIN%\lua51.dll %XCHAT_DEST%\lua51.dll.x64
diff --git a/build/release.bat b/build/release.bat
deleted file mode 100644
index 4caf97c7..00000000
--- a/build/release.bat
+++ /dev/null
@@ -1,37 +0,0 @@
-@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%