From e7bfe440eb62b1e701f0e638e1d0d4802295a223 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 20 Oct 2010 21:04:37 +0200 Subject: [PATCH] build environment support for checksum plugin --- build/release-x64.bat | 3 ++- build/release-x86.bat | 3 ++- build/xchat-wdk.iss | 4 ++++ plugins/makefile.mak | 9 ++++++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/build/release-x64.bat b/build/release-x64.bat index a8450a36..959dab95 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -32,7 +32,8 @@ copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64 copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64 copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%\libenchant.dll.x64 copy %ENCHANT_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\libenchant_myspell.dll.x64 -copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64 +::copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64 +copy ..\plugins\ewc\xcchecksum.dll %XCHAT_DEST%\plugins\xcchecksum.dll.x64 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64 copy ..\plugins\perl\xcperl-510.dll %XCHAT_DEST%\plugins\xcperl-510.dll.x64 copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins\xcperl-512.dll.x64 diff --git a/build/release-x86.bat b/build/release-x86.bat index f236d6bd..95c21ff5 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -46,7 +46,8 @@ copy %SSL_BIN%\cert.pem %XCHAT_DEST% copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST% xcopy /q /s /i %ENCHANT_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\ ::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\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\ +copy ..\plugins\upd\xclua.dll %XCHAT_DEST%\plugins copy ..\plugins\perl\xcperl-510.dll %XCHAT_DEST%\plugins copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index 59a63085..cba6ff06 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -40,6 +40,7 @@ Name: "translations"; Description: "Translations"; Types: normal full custom; Fl Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins"; Description: "Plugins"; Types: full custom; Flags: disablenouninstallwarning ;Name: "plugins\ewc"; Description: "EasyWinampControl"; Types: full custom; Flags: disablenouninstallwarning +Name: "plugins\checksum"; Description: "Checksum"; Types: normal full custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; Flags: disablenouninstallwarning Name: "plugins\winamp"; Description: "Winamp"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\xdcc"; Description: "XDCC"; Types: full custom; Flags: disablenouninstallwarning @@ -188,6 +189,9 @@ Source: "lib\gtk-2.0\modules\libgail.dll.x64"; DestDir: "{app}\lib\gtk-2.0\modul ;Source: "plugins\xcewc.dll"; DestDir: "{app}\plugins"; Components: plugins\ewc; Tasks: x86 ;Source: "plugins\xcewc.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcewc.dll"; Components: plugins\ewc; Tasks: x64 +Source: "plugins\xcchecksum.dll"; DestDir: "{app}\plugins"; Components: plugins\checksum; Tasks: x86 +Source: "plugins\xcchecksum.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcchecksum.dll"; Components: plugins\checksum; Tasks: x64 + Source: "plugins\xcupd.dll"; DestDir: "{app}\plugins"; Components: plugins\upd; Tasks: x86 Source: "plugins\xcupd.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcupd.dll"; Components: plugins\upd; Tasks: x64 diff --git a/plugins/makefile.mak b/plugins/makefile.mak index 03bb1427..788a0fb8 100644 --- a/plugins/makefile.mak +++ b/plugins/makefile.mak @@ -1,7 +1,9 @@ all: # @cd ewc # @-$(MAKE) /nologo /s /f makefile.mak $@ - @cd lua + @cd checksum + @-$(MAKE) /nologo /s /f makefile.mak $@ + @cd ..\lua @-$(MAKE) /nologo /s /f makefile.mak $@ @cd ..\python @-$(MAKE) /nologo /s /f makefile.mak $@ @@ -22,6 +24,11 @@ clean: # @del ewc\*.exp # @del ewc\*.lib # @del ewc\*.obj + @del checksum\*.def + @del checksum\*.dll + @del checksum\*.exp + @del checksum\*.lib + @del checksum\*.obj @del lua\*.def @del lua\*.dll @del lua\*.exp