huge cleanup on build system

4 files changed, 99 insertions, 129 deletions

diff --git a/build/build-x64.bat b/build/build-x64.bat
index 44e13af4..d4378121 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -7,29 +7,14 @@ set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd
 set OPATH=%PATH%
 set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\build\xchat-dev64\bin;c:\mozilla-build\perl-5.12-x64\bin
 cd common
-nmake -f makefile.mak clean
+nmake /nologo /f makefile.mak clean
 cd ..\fe-gtk
-nmake -f makefile.mak clean
+nmake /nologo /f makefile.mak clean
 cd ..
-nmake -f makefile.mak
-cd ..\plugins\ewc
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\lua
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\perl
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\python
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\tcl
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\xdcc
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\..\build
+nmake /nologo /f makefile.mak
+cd ..\plugins
+nmake /nologo /f makefile.mak clean
+nmake /f makefile.mak
+cd ..\build
 set PATH=%OPATH%
 call release-x64.bat
diff --git a/build/build-x86.bat b/build/build-x86.bat
index 6eddb451..72814e0a 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -5,30 +5,15 @@ set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\Win
 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
 set OPATH=%PATH%
 set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw32\bin;c:\mozilla-build\perl-5.12-x86\bin
-nmake -f makefile.mak clean
+nmake /nologo /f makefile.mak clean
 cd pixmaps
-nmake -f makefile.mak
+nmake /nologo /f makefile.mak
 cd ..
-nmake -f makefile.mak
-cd ..\plugins\ewc
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\lua
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\perl
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\python
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\tcl
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\xdcc
-nmake -f makefile.mak clean
-nmake -f makefile.mak
-cd ..\..\build
+nmake /nologo /f makefile.mak
+cd ..\plugins
+nmake /nologo /f makefile.mak clean
+nmake /nologo /f makefile.mak
+cd ..\build
 call compile-po-files.bat
 cd ..\build
 set PATH=%OPATH%
diff --git a/build/compile-po-files.bat b/build/compile-po-files.bat
index 9c82dd16..68e9b729 100644
--- a/build/compile-po-files.bat
+++ b/build/compile-po-files.bat
@@ -6,133 +6,133 @@ rmdir /Q /S locale
 mkdir locale
 
 mkdir locale\am\LC_MESSAGES
-msgfmt -cvo locale\am\LC_MESSAGES\xchat.mo am.po
+msgfmt -co locale\am\LC_MESSAGES\xchat.mo am.po
 
 mkdir locale\az\LC_MESSAGES
-msgfmt -cvo locale\az\LC_MESSAGES\xchat.mo az.po
+msgfmt -co locale\az\LC_MESSAGES\xchat.mo az.po
 
 mkdir locale\be\LC_MESSAGES
-msgfmt -cvo locale\be\LC_MESSAGES\xchat.mo be.po
+msgfmt -co locale\be\LC_MESSAGES\xchat.mo be.po
 
 mkdir locale\bg\LC_MESSAGES
-msgfmt -cvo locale\bg\LC_MESSAGES\xchat.mo bg.po
+msgfmt -co locale\bg\LC_MESSAGES\xchat.mo bg.po
 
 mkdir locale\ca\LC_MESSAGES
-msgfmt -cvo locale\ca\LC_MESSAGES\xchat.mo ca.po
+msgfmt -co locale\ca\LC_MESSAGES\xchat.mo ca.po
 
 mkdir locale\cs\LC_MESSAGES
-msgfmt -cvo locale\cs\LC_MESSAGES\xchat.mo cs.po
+msgfmt -co locale\cs\LC_MESSAGES\xchat.mo cs.po
 
 mkdir locale\de\LC_MESSAGES
-msgfmt -cvo locale\de\LC_MESSAGES\xchat.mo de.po
+msgfmt -co locale\de\LC_MESSAGES\xchat.mo de.po
 
 mkdir locale\el\LC_MESSAGES
-msgfmt -cvo locale\el\LC_MESSAGES\xchat.mo el.po
+msgfmt -co locale\el\LC_MESSAGES\xchat.mo el.po
 
 mkdir locale\en_GB\LC_MESSAGES
-msgfmt -cvo locale\en_GB\LC_MESSAGES\xchat.mo en_GB.po
+msgfmt -co locale\en_GB\LC_MESSAGES\xchat.mo en_GB.po
 
 mkdir locale\es\LC_MESSAGES
-msgfmt -cvo locale\es\LC_MESSAGES\xchat.mo es.po
+msgfmt -co locale\es\LC_MESSAGES\xchat.mo es.po
 
 mkdir locale\et\LC_MESSAGES
-msgfmt -cvo locale\et\LC_MESSAGES\xchat.mo et.po
+msgfmt -co locale\et\LC_MESSAGES\xchat.mo et.po
 
 mkdir locale\eu\LC_MESSAGES
-msgfmt -cvo locale\eu\LC_MESSAGES\xchat.mo eu.po
+msgfmt -co locale\eu\LC_MESSAGES\xchat.mo eu.po
 
 mkdir locale\fi\LC_MESSAGES
-msgfmt -cvo locale\fi\LC_MESSAGES\xchat.mo fi.po
+msgfmt -co locale\fi\LC_MESSAGES\xchat.mo fi.po
 
 mkdir locale\fr\LC_MESSAGES
-msgfmt -cvo locale\fr\LC_MESSAGES\xchat.mo fr.po
+msgfmt -co locale\fr\LC_MESSAGES\xchat.mo fr.po
 
 mkdir locale\gl\LC_MESSAGES
-msgfmt -cvo locale\gl\LC_MESSAGES\xchat.mo gl.po
+msgfmt -co locale\gl\LC_MESSAGES\xchat.mo gl.po
 
 mkdir locale\hi\LC_MESSAGES
-msgfmt -cvo locale\hi\LC_MESSAGES\xchat.mo hi.po
+msgfmt -co locale\hi\LC_MESSAGES\xchat.mo hi.po
 
 mkdir locale\hu\LC_MESSAGES
-msgfmt -cvo locale\hu\LC_MESSAGES\xchat.mo hu.po
+msgfmt -co locale\hu\LC_MESSAGES\xchat.mo hu.po
 
 mkdir locale\it\LC_MESSAGES
-msgfmt -cvo locale\it\LC_MESSAGES\xchat.mo it.po
+msgfmt -co locale\it\LC_MESSAGES\xchat.mo it.po
 
 mkdir locale\ja\LC_MESSAGES
-msgfmt -cvo locale\ja\LC_MESSAGES\xchat.mo ja.po
+msgfmt -co locale\ja\LC_MESSAGES\xchat.mo ja.po
 
 mkdir locale\kn\LC_MESSAGES
-msgfmt -cvo locale\kn\LC_MESSAGES\xchat.mo kn.po
+msgfmt -co locale\kn\LC_MESSAGES\xchat.mo kn.po
 
 mkdir locale\ko\LC_MESSAGES
-msgfmt -cvo locale\ko\LC_MESSAGES\xchat.mo ko.po
+msgfmt -co locale\ko\LC_MESSAGES\xchat.mo ko.po
 
 mkdir locale\lt\LC_MESSAGES
-msgfmt -cvo locale\lt\LC_MESSAGES\xchat.mo lt.po
+msgfmt -co locale\lt\LC_MESSAGES\xchat.mo lt.po
 
 mkdir locale\lv\LC_MESSAGES
-msgfmt -cvo locale\lv\LC_MESSAGES\xchat.mo lv.po
+msgfmt -co locale\lv\LC_MESSAGES\xchat.mo lv.po
 
 mkdir locale\mk\LC_MESSAGES
-msgfmt -cvo locale\mk\LC_MESSAGES\xchat.mo mk.po
+msgfmt -co locale\mk\LC_MESSAGES\xchat.mo mk.po
 
 mkdir locale\ms\LC_MESSAGES
-msgfmt -cvo locale\ms\LC_MESSAGES\xchat.mo ms.po
+msgfmt -co locale\ms\LC_MESSAGES\xchat.mo ms.po
 
 mkdir locale\nb\LC_MESSAGES
-msgfmt -cvo locale\nb\LC_MESSAGES\xchat.mo nb.po
+msgfmt -co locale\nb\LC_MESSAGES\xchat.mo nb.po
 
 mkdir locale\nl\LC_MESSAGES
-msgfmt -cvo locale\nl\LC_MESSAGES\xchat.mo nl.po
+msgfmt -co locale\nl\LC_MESSAGES\xchat.mo nl.po
 
 mkdir locale\no\LC_MESSAGES
-msgfmt -cvo locale\no\LC_MESSAGES\xchat.mo no.po
+msgfmt -co locale\no\LC_MESSAGES\xchat.mo no.po
 
 mkdir locale\pa\LC_MESSAGES
-msgfmt -cvo locale\pa\LC_MESSAGES\xchat.mo pa.po
+msgfmt -co locale\pa\LC_MESSAGES\xchat.mo pa.po
 
 mkdir locale\pl\LC_MESSAGES
-msgfmt -cvo locale\pl\LC_MESSAGES\xchat.mo pl.po
+msgfmt -co locale\pl\LC_MESSAGES\xchat.mo pl.po
 
 mkdir locale\pt\LC_MESSAGES
-msgfmt -cvo locale\pt\LC_MESSAGES\xchat.mo pt.po
+msgfmt -co locale\pt\LC_MESSAGES\xchat.mo pt.po
 
 mkdir locale\pt_BR\LC_MESSAGES
-msgfmt -cvo locale\pt_BR\LC_MESSAGES\xchat.mo pt_BR.po
+msgfmt -co locale\pt_BR\LC_MESSAGES\xchat.mo pt_BR.po
 
 mkdir locale\ru\LC_MESSAGES
-msgfmt -cvo locale\ru\LC_MESSAGES\xchat.mo ru.po
+msgfmt -co locale\ru\LC_MESSAGES\xchat.mo ru.po
 
 mkdir locale\sk\LC_MESSAGES
-msgfmt -cvo locale\sk\LC_MESSAGES\xchat.mo sk.po
+msgfmt -co locale\sk\LC_MESSAGES\xchat.mo sk.po
 
 mkdir locale\sl\LC_MESSAGES
-msgfmt -cvo locale\sl\LC_MESSAGES\xchat.mo sl.po
+msgfmt -co locale\sl\LC_MESSAGES\xchat.mo sl.po
 
 mkdir locale\sq\LC_MESSAGES
-msgfmt -cvo locale\sq\LC_MESSAGES\xchat.mo sq.po
+msgfmt -co locale\sq\LC_MESSAGES\xchat.mo sq.po
 
 mkdir locale\sr\LC_MESSAGES
-msgfmt -cvo locale\sr\LC_MESSAGES\xchat.mo sr.po
+msgfmt -co locale\sr\LC_MESSAGES\xchat.mo sr.po
 
 mkdir locale\sv\LC_MESSAGES
-msgfmt -cvo locale\sv\LC_MESSAGES\xchat.mo sv.po
+msgfmt -co locale\sv\LC_MESSAGES\xchat.mo sv.po
 
 mkdir locale\th\LC_MESSAGES
-msgfmt -cvo locale\th\LC_MESSAGES\xchat.mo th.po
+msgfmt -co locale\th\LC_MESSAGES\xchat.mo th.po
 
 mkdir locale\uk\LC_MESSAGES
-msgfmt -cvo locale\uk\LC_MESSAGES\xchat.mo uk.po
+msgfmt -co locale\uk\LC_MESSAGES\xchat.mo uk.po
 
 mkdir locale\vi\LC_MESSAGES
-msgfmt -cvo locale\vi\LC_MESSAGES\xchat.mo vi.po
+msgfmt -co locale\vi\LC_MESSAGES\xchat.mo vi.po
 
 mkdir locale\wa\LC_MESSAGES
-msgfmt -cvo locale\wa\LC_MESSAGES\xchat.mo wa.po
+msgfmt -co locale\wa\LC_MESSAGES\xchat.mo wa.po
 
 mkdir locale\zh_CN\LC_MESSAGES
-msgfmt -cvo locale\zh_CN\LC_MESSAGES\xchat.mo zh_CN.po
+msgfmt -co locale\zh_CN\LC_MESSAGES\xchat.mo zh_CN.po
 
 mkdir locale\zh_TW\LC_MESSAGES
-msgfmt -cvo locale\zh_TW\LC_MESSAGES\xchat.mo zh_TW.po
+msgfmt -co locale\zh_TW\LC_MESSAGES\xchat.mo zh_TW.po
diff --git a/build/release-x86.bat b/build/release-x86.bat
index f31097ee..da32d3dc 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -3,47 +3,47 @@ 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-uni
-rmdir /Q /S %XCHAT_DEST%
+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%\freetype6.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%\intl.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 %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
-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 %SSL_BIN%\zlib1.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%
-xcopy /S /I /Q ..\po\locale %XCHAT_DEST%\locale
-xcopy /S /I /Q %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
+xcopy /q ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%
+::xcopy /q %GTK_BIN%\zlib1.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\freetype6.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
+xcopy /q %GTK_BIN%\intl.dll %XCHAT_DEST%
+::xcopy /q /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 /q /s /i %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
+xcopy /q /s /i etc %XCHAT_DEST%\etc
+xcopy /q ..\COPYING %XCHAT_DEST%
+xcopy /q %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
+xcopy /q %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
+xcopy /q %SSL_BIN%\libeay32.dll %XCHAT_DEST%
+xcopy /q %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
+xcopy /q %SSL_BIN%\zlib1.dll %XCHAT_DEST%
+xcopy /q /s /i ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
+xcopy /q /s /i ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\
+xcopy /q /s /i ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\
+xcopy /q /s /i ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\
+xcopy /q /s /i ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\
+xcopy /q /s /i ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\
+xcopy /q %LUA_BIN%\lua51.dll %XCHAT_DEST%
+xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale
+xcopy /q /s /i %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
 echo 2> portable-mode
 move portable-mode %XCHAT_DEST%