From 103aadaf3fed1ed9693ac8276d4347b01a8bd0ce Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Tue, 5 Oct 2010 23:14:35 +0200 Subject: update xchat environment for new enchant --- build/release-x86.bat | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'build/release-x86.bat') diff --git a/build/release-x86.bat b/build/release-x86.bat index e7e92954..d0596228 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -2,8 +2,7 @@ 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 MINGW_BIN=c:\mozilla-build\mingw32\bin -set ENCHANT_BIN=c:\mozilla-build\build\enchant-1.5.0-x86\bin +set ENCHANT_BIN=c:\mozilla-build\build\enchant-wdk-1.6.0-x86\bin set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni rmdir /q /s %XCHAT_DEST% mkdir %XCHAT_DEST% @@ -29,7 +28,6 @@ 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 %MINGW_BIN%\libgcc_s_sjlj-1.dll %XCHAT_DEST% xcopy /q /s /i %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 xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\ @@ -40,7 +38,7 @@ 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 %ENCHANT_BIN%\libenchant-1.dll %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\ copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins -- cgit 1.4.1 From b4696b18db6d569462e90aceda9e15c1bdaeb5a6 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 6 Oct 2010 00:47:42 +0200 Subject: distribute *all* license files with the installer --- build/release-x86.bat | 4 ++++ build/xchat-wdk.iss | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'build/release-x86.bat') diff --git a/build/release-x86.bat b/build/release-x86.bat index d0596228..9c8267df 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -35,6 +35,10 @@ xcopy /q /s /i etc %XCHAT_DEST%\etc copy ..\COPYING %XCHAT_DEST% copy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST% copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST% +copy %GTK_BIN%\..\share\doc\gtk+-2.22.0\COPYING %XCHAT_DEST%\LICENSE.GTK +copy %GTK_BIN%\..\share\doc\cairo_1.10.0-1_win32\COPYING-LGPL-2.1 %XCHAT_DEST%\LICENSE.CAIRO +copy %LUA_BIN%\..\COPYRIGHT %XCHAT_DEST%\LICENSE.LUA +copy %ENCHANT_BIN%\..\COPYING %XCHAT_DEST%\LICENSE.ENCHANT copy %SSL_BIN%\libeay32.dll %XCHAT_DEST% copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% copy %SSL_BIN%\zlib1.dll %XCHAT_DEST% diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index a1927377..9c28907b 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -67,6 +67,10 @@ Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: ex Source: "COPYING"; DestDir: "{app}"; Components: libs Source: "LICENSE.OPENSSL"; DestDir: "{app}"; Components: libs Source: "LICENSE.ZLIB"; DestDir: "{app}"; Components: libs +Source: "LICENSE.GTK"; DestDir: "{app}"; Components: libs +Source: "LICENSE.CAIRO"; DestDir: "{app}"; Components: libs +Source: "LICENSE.LUA"; DestDir: "{app}"; Components: libs +Source: "LICENSE.ENCHANT"; DestDir: "{app}"; Components: libs Source: "portable-mode"; DestDir: "{app}"; Tasks: portable Source: "etc\*"; DestDir: "{app}\etc"; Flags: createallsubdirs recursesubdirs; Components: libs Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubdirs; Components: translations -- cgit 1.4.1 From de3270fad5e9e4bab84fa6216107c540b6411e75 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 6 Oct 2010 00:52:07 +0200 Subject: plus sign causes problems, use the glib one as it's the same --- build/release-x86.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build/release-x86.bat') diff --git a/build/release-x86.bat b/build/release-x86.bat index 9c8267df..969bde63 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -35,7 +35,7 @@ xcopy /q /s /i etc %XCHAT_DEST%\etc copy ..\COPYING %XCHAT_DEST% copy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST% copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST% -copy %GTK_BIN%\..\share\doc\gtk+-2.22.0\COPYING %XCHAT_DEST%\LICENSE.GTK +copy %GTK_BIN%\..\share\doc\glib-2.26.0\COPYING %XCHAT_DEST%\LICENSE.GTK copy %GTK_BIN%\..\share\doc\cairo_1.10.0-1_win32\COPYING-LGPL-2.1 %XCHAT_DEST%\LICENSE.CAIRO copy %LUA_BIN%\..\COPYRIGHT %XCHAT_DEST%\LICENSE.LUA copy %ENCHANT_BIN%\..\COPYING %XCHAT_DEST%\LICENSE.ENCHANT -- cgit 1.4.1 From b859949c37614259c9b58f801f15985cfd61c305 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Fri, 8 Oct 2010 01:50:16 +0200 Subject: install certs --- build/release-x86.bat | 1 + build/xchat-wdk.iss | 1 + 2 files changed, 2 insertions(+) (limited to 'build/release-x86.bat') diff --git a/build/release-x86.bat b/build/release-x86.bat index 969bde63..0e0b77ba 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -42,6 +42,7 @@ copy %ENCHANT_BIN%\..\COPYING %XCHAT_DEST%\LICENSE.ENCHANT copy %SSL_BIN%\libeay32.dll %XCHAT_DEST% copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% copy %SSL_BIN%\zlib1.dll %XCHAT_DEST% +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\ diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index 1e46f30e..1ff42aac 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -64,6 +64,7 @@ Name: perl510; Description: "5.10"; GroupDescription: "Perl version:"; Flags: ex Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl [Files] +Source: "cert.pem"; DestDir: "{app}"; Components: libs Source: "COPYING"; DestDir: "{app}"; Components: libs Source: "LICENSE.OPENSSL"; DestDir: "{app}"; Components: libs Source: "LICENSE.ZLIB"; DestDir: "{app}"; Components: libs -- cgit 1.4.1