even more cleanup
This commit is contained in:
parent
cbcf58aba6
commit
b9ece5464e
|
@ -14,7 +14,7 @@ cd ..
|
||||||
nmake /nologo /f makefile.mak
|
nmake /nologo /f makefile.mak
|
||||||
cd ..\plugins
|
cd ..\plugins
|
||||||
nmake /nologo /f makefile.mak clean
|
nmake /nologo /f makefile.mak clean
|
||||||
nmake /f makefile.mak
|
nmake /nologo /f makefile.mak
|
||||||
cd ..\build
|
cd ..\build
|
||||||
set PATH=%OPATH%
|
set PATH=%OPATH%
|
||||||
call release-x64.bat
|
call release-x64.bat
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
echo.Compiling translations . . .
|
echo.Compiling translations . . .
|
||||||
cd ..\po
|
cd ..\po
|
||||||
rmdir /Q /S locale
|
rmdir /q /s locale
|
||||||
mkdir locale
|
mkdir locale
|
||||||
|
|
||||||
mkdir locale\am\LC_MESSAGES
|
mkdir locale\am\LC_MESSAGES
|
||||||
|
|
|
@ -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%\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%\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%\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%\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%\libcairo-2.dll %XCHAT_DEST%\libcairo-2.dll.x64
|
||||||
copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%\libfontconfig-1.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%\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%\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%\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\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%\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64
|
||||||
copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64
|
copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64
|
||||||
copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
|
copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
|
||||||
|
|
|
@ -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
|
set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
|
||||||
rmdir /q /s %XCHAT_DEST%
|
rmdir /q /s %XCHAT_DEST%
|
||||||
mkdir %XCHAT_DEST%
|
mkdir %XCHAT_DEST%
|
||||||
xcopy /q ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
|
copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%
|
||||||
::xcopy /q %GTK_BIN%\zlib1.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%
|
copy %GTK_BIN%\freetype6.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\freetype6.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
|
||||||
xcopy /q %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
|
copy %GTK_BIN%\intl.dll %XCHAT_DEST%
|
||||||
xcopy /q %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
|
||||||
::xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0 %XCHAT_DEST%\lib\gtk-2.0
|
copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
|
||||||
::rmdir /q /s %XCHAT_DEST%\lib\gtk-2.0\include
|
copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules
|
||||||
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 /s /i etc %XCHAT_DEST%\etc
|
||||||
xcopy /q ..\COPYING %XCHAT_DEST%
|
copy ..\COPYING %XCHAT_DEST%
|
||||||
xcopy /q %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
|
copy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
|
||||||
xcopy /q %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
|
copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
|
||||||
xcopy /q %SSL_BIN%\libeay32.dll %XCHAT_DEST%
|
copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%
|
||||||
xcopy /q %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
|
copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
|
||||||
xcopy /q %SSL_BIN%\zlib1.dll %XCHAT_DEST%
|
copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%
|
||||||
xcopy /q /s /i ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
|
copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins
|
||||||
xcopy /q /s /i ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\
|
copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
|
||||||
xcopy /q /s /i ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\
|
copy ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins
|
||||||
xcopy /q /s /i ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\
|
copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins
|
||||||
xcopy /q /s /i ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\
|
copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins
|
||||||
xcopy /q /s /i ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\
|
copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins
|
||||||
xcopy /q %LUA_BIN%\lua51.dll %XCHAT_DEST%
|
copy %LUA_BIN%\lua51.dll %XCHAT_DEST%
|
||||||
xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale
|
xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale
|
||||||
xcopy /q /s /i %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
|
xcopy /q /s /i %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
|
||||||
echo 2> portable-mode
|
echo 2> portable-mode
|
||||||
|
|
|
@ -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"; 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.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"; 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\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"; 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.x64"; DestDir: "{app}\lib\gtk-2.0\modules"; DestName: "libgail.dll"; Components: libs; Tasks: x64
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -9,5 +9,5 @@ xchatcommon.lib: $(COMMON_OBJECTS)
|
||||||
$(CC) $(CFLAGS) $(GLIB) $<
|
$(CC) $(CFLAGS) $(GLIB) $<
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
del *.obj
|
@del *.obj
|
||||||
del xchatcommon.lib
|
@del xchatcommon.lib
|
||||||
|
|
|
@ -30,8 +30,8 @@ xchat-icon.obj: xchat.res
|
||||||
cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res
|
cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
del *.obj
|
@del *.obj
|
||||||
del fe-gtk\mmx_cmod.o
|
@del mmx_cmod.o
|
||||||
del $(PROG)
|
@del $(PROG)
|
||||||
del xchat.rc
|
@del xchat.rc
|
||||||
del xchat.RES
|
@del xchat.res
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
all:
|
all:
|
||||||
cd common
|
@cd common
|
||||||
@-$(MAKE) /nologo /s /f makefile.mak $@
|
@-$(MAKE) /nologo /s /f makefile.mak $@
|
||||||
cd ..\fe-gtk
|
@cd ..\fe-gtk
|
||||||
@-$(MAKE) /nologo /s /f makefile.mak $@
|
@-$(MAKE) /nologo /s /f makefile.mak $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -15,4 +15,4 @@ all:
|
||||||
@$(CONV) --build-list $(LIST) > inline_pngs.h
|
@$(CONV) --build-list $(LIST) > inline_pngs.h
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
del *.h
|
@del *.h
|
||||||
|
|
Loading…
Reference in New Issue