even more cleanup

This commit is contained in:
berkeviktor@aol.com 2010-08-24 20:46:59 +02:00
parent cbcf58aba6
commit b9ece5464e
9 changed files with 54 additions and 56 deletions

View File

@ -14,7 +14,7 @@ cd ..
nmake /nologo /f makefile.mak
cd ..\plugins
nmake /nologo /f makefile.mak clean
nmake /f makefile.mak
nmake /nologo /f makefile.mak
cd ..\build
set PATH=%OPATH%
call release-x64.bat

View File

@ -2,7 +2,7 @@
echo.Compiling translations . . .
cd ..\po
rmdir /Q /S locale
rmdir /q /s locale
mkdir locale
mkdir locale\am\LC_MESSAGES

View File

@ -12,7 +12,6 @@ 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
@ -24,9 +23,9 @@ 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\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 %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 %SSL_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64

View File

@ -5,44 +5,43 @@ 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%
mkdir %XCHAT_DEST%
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\
copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
copy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%
copy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%
copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%
copy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%
copy %GTK_BIN%\freetype6.dll %XCHAT_DEST%
copy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
copy %GTK_BIN%\intl.dll %XCHAT_DEST%
copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules
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%
copy ..\COPYING %XCHAT_DEST%
copy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%
copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%
copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins
copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
copy ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins
copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins
copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins
copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins
copy %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

View File

@ -136,14 +136,14 @@ Source: "zlib1.dll.x64"; DestDir: "{app}"; DestName: "zlib1.dll"; Components: li
;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\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: "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

View File

@ -9,5 +9,5 @@ xchatcommon.lib: $(COMMON_OBJECTS)
$(CC) $(CFLAGS) $(GLIB) $<
clean:
del *.obj
del xchatcommon.lib
@del *.obj
@del xchatcommon.lib

View File

@ -30,8 +30,8 @@ xchat-icon.obj: xchat.res
cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res
clean:
del *.obj
del fe-gtk\mmx_cmod.o
del $(PROG)
del xchat.rc
del xchat.RES
@del *.obj
@del mmx_cmod.o
@del $(PROG)
@del xchat.rc
@del xchat.res

View File

@ -1,7 +1,7 @@
all:
cd common
@cd common
@-$(MAKE) /nologo /s /f makefile.mak $@
cd ..\fe-gtk
@cd ..\fe-gtk
@-$(MAKE) /nologo /s /f makefile.mak $@
clean:

View File

@ -15,4 +15,4 @@ all:
@$(CONV) --build-list $(LIST) > inline_pngs.h
clean:
del *.h
@del *.h