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-x64.bat | 6 ++---- build/release-x86.bat | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'build') diff --git a/build/release-x64.bat b/build/release-x64.bat index ca29fb4c..7ffaa69e 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -2,8 +2,7 @@ set GTK_BIN=c:\mozilla-build\build\xchat-dev64\bin set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x64\bin set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x64\bin -set MINGW_BIN=c:\mozilla-build\mingw64\bin -set ENCHANT_BIN=c:\mozilla-build\build\enchant-1.5.0-x64\bin +set ENCHANT_BIN=c:\mozilla-build\build\enchant-wdk-1.6.0-x64\bin set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%\xchat.exe.x64 copy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64 @@ -25,14 +24,13 @@ 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 %MINGW_BIN%\libgcc_s_sjlj-1.dll %XCHAT_DEST%\libgcc_s_sjlj-1.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 %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 -copy %ENCHANT_BIN%\libenchant-1.dll %XCHAT_DEST%\libenchant-1.dll.x64 +copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%\libenchant-1.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\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64 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 81013b7ea5aeb664dbae13f31e655c7aed22be2f Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 6 Oct 2010 00:05:41 +0200 Subject: no need for pkg-config anymore --- build/deps-x64.txt | 1 - build/deps-x86.txt | 1 - 2 files changed, 2 deletions(-) (limited to 'build') diff --git a/build/deps-x64.txt b/build/deps-x64.txt index 4945804d..1b07ef8c 100644 --- a/build/deps-x64.txt +++ b/build/deps-x64.txt @@ -8,7 +8,6 @@ http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/freetype_2.4.2-1_win6 http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime_0.18.1.1-2_win64.zip http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime-dev_0.18.1.1-2_win64.zip http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/libpng_1.4.3-1_win64.zip -http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/pkg-config_0.23-2_win64.zip http://ftp.gnome.org/pub/gnome/binaries/win64/gdk-pixbuf/2.22/gdk-pixbuf_2.22.0-1_win64.zip http://ftp.gnome.org/pub/gnome/binaries/win64/gdk-pixbuf/2.22/gdk-pixbuf-dev_2.22.0-1_win64.zip http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.26/glib_2.26.0-1_win64.zip diff --git a/build/deps-x86.txt b/build/deps-x86.txt index 6caac664..e11917b5 100644 --- a/build/deps-x86.txt +++ b/build/deps-x86.txt @@ -8,7 +8,6 @@ http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/freetype_2.4.2-1_win3 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime_0.18.1.1-2_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime-dev_0.18.1.1-2_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.3-1_win32.zip -http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config_0.23-3_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.5-2_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf_2.22.0-1_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf-dev_2.22.0-1_win32.zip -- cgit 1.4.1 From d945f0b8b32e88a5e567088d69d661b56356d3c6 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 6 Oct 2010 00:21:43 +0200 Subject: update installer as well --- build/xchat-wdk.iss | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'build') diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index 6c2716ef..a1927377 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -153,15 +153,12 @@ Source: "zlib1.dll.x64"; DestDir: "{app}"; DestName: "zlib1.dll"; Components: li -Source: "libenchant-1.dll"; DestDir: "{app}"; Components: spelling; Tasks: x86 -Source: "libenchant-1.dll.x64"; DestDir: "{app}"; DestName: "libenchant-1.dll"; Components: spelling; Tasks: x64 +Source: "libenchant.dll"; DestDir: "{app}"; Components: spelling; Tasks: x86 +Source: "libenchant.dll.x64"; DestDir: "{app}"; DestName: "libenchant.dll"; Components: spelling; Tasks: x64 Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Components: spelling; Tasks: x86 Source: "lib\enchant\libenchant_myspell.dll.x64"; DestDir: "{app}\lib\enchant"; DestName: "libenchant_myspell.dll"; Components: spelling; Tasks: x64 -Source: "libgcc_s_sjlj-1.dll"; DestDir: "{app}"; Components: spelling; Tasks: x86 -Source: "libgcc_s_sjlj-1.dll.x64"; DestDir: "{app}"; DestName: "libgcc_s_sjlj-1.dll"; Components: spelling; 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 -- cgit 1.4.1 From 727e9907f8c49ce5d853d5427e634b657e4ec5fe Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 6 Oct 2010 00:24:34 +0200 Subject: fix x64 enchant lib copy --- build/release-x64.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') diff --git a/build/release-x64.bat b/build/release-x64.bat index 7ffaa69e..4770082d 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -30,7 +30,7 @@ copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modul 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 -copy %ENCHANT_BIN%\libenchant.dll %XCHAT_DEST%\libenchant-1.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\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64 -- 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') 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') 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 83a80dab2f1636dd0dd3d1eaa14824b1173448af Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 6 Oct 2010 21:17:09 +0200 Subject: shorten plugin name part 2 --- build/xchat-wdk.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index 9c28907b..1e46f30e 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -41,7 +41,7 @@ Name: "spelling"; Description: "Spelling Library"; Types: full custom Name: "spelling\dict"; Description: "Dictionaries"; Types: full custom Name: "plugins"; Description: "Plugins"; Types: full custom Name: "plugins\ewc"; Description: "EasyWinampControl"; Types: full custom -Name: "plugins\upd"; Description: "XChat-WDK Update Checker"; Types: normal full custom +Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom Name: "plugins\xdcc"; Description: "XDCC"; Types: full custom Name: "langs"; Description: "Language Interfaces"; Types: full custom Name: "langs\lua"; Description: "Lua"; Types: full custom -- 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') 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 From 0f423a7189ae751e097523b29b85fbd361df127b Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Fri, 8 Oct 2010 02:41:23 +0200 Subject: version bump --- build/xchat-wdk.iss | 8 ++++---- config.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'build') diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index 1ff42aac..e43eab9f 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -1,9 +1,9 @@ [Setup] AppName=XChat-WDK -AppVerName=XChat-WDK 1468-2 -AppVersion=14.68.2 -VersionInfoVersion=14.68.2 -OutputBaseFilename=XChat-WDK 1468-2 +AppVerName=XChat-WDK 1469 +AppVersion=14.69 +VersionInfoVersion=14.69 +OutputBaseFilename=XChat-WDK 1469 AppPublisher=XChat-WDK AppPublisherURL=http://code.google.com/p/xchat-wdk/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny diff --git a/config.h b/config.h index d91232f7..fd5bc421 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ #define USE_PLUGIN #define USE_LIBSEXY #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "1468-2" +#define PACKAGE_VERSION "1469" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." #define OLD_PERL -- cgit 1.4.1 From d68e312723e4fcdd0a088955f5f4dbbd1d5f2ff8 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Fri, 8 Oct 2010 02:47:13 +0200 Subject: build xchat-wdk with vc10 as well --- build/build-x64.bat | 2 +- build/build-x86.bat | 2 +- src/fe-gtk/makefile.mak | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'build') diff --git a/build/build-x64.bat b/build/build-x64.bat index 7fe91b2a..a6c10002 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -5,7 +5,7 @@ type makeinc.skel >> makeinc.mak set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64 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 +set PATH=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 cd common nmake /nologo /f makefile.mak clean cd ..\fe-gtk diff --git a/build/build-x86.bat b/build/build-x86.bat index 8299aced..3dbd169e 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -4,7 +4,7 @@ type makeinc.skel > makeinc.mak set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70 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 +set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\build\xchat-dev32\bin nmake /nologo /f makefile.mak clean cd pixmaps nmake /nologo /f makefile.mak diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak index d83d49d8..02bd8479 100644 --- a/src/fe-gtk/makefile.mak +++ b/src/fe-gtk/makefile.mak @@ -21,7 +21,7 @@ xchat.rc: echo XC_ICON ICON "../../xchat.ico" > xchat.rc xchat.res: xchat.rc ../../xchat.ico - rc /r xchat.rc + rc /nologo /r xchat.rc xchat-icon.obj: xchat.res cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res -- cgit 1.4.1 From eb17775ec797c54f493bdb3682ff14b33a82aa8a Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Fri, 8 Oct 2010 04:28:54 +0200 Subject: always copy enchant libs, it won't hurt --- build/xchat-wdk.iss | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'build') diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index e43eab9f..1cdd4c4a 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -37,15 +37,14 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom [Components] Name: "libs"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed Name: "translations"; Description: "Translations"; Types: normal full custom -Name: "spelling"; Description: "Spelling Library"; Types: full custom -Name: "spelling\dict"; Description: "Dictionaries"; Types: full custom +Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom Name: "plugins"; Description: "Plugins"; Types: full custom Name: "plugins\ewc"; Description: "EasyWinampControl"; Types: full custom Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom Name: "plugins\xdcc"; Description: "XDCC"; Types: full custom Name: "langs"; Description: "Language Interfaces"; Types: full custom Name: "langs\lua"; Description: "Lua"; Types: full custom -Name: "langs\lua\luawdk"; Description: "Lua-WDK 5.1.4-2"; Types: full custom +Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: full custom Name: "langs\perl"; Description: "Perl"; Types: full custom Name: "langs\python"; Description: "Python"; Types: full custom Name: "langs\tcl"; Description: "Tcl"; Types: full custom @@ -76,7 +75,7 @@ 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 Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: createallsubdirs recursesubdirs; Components: translations -Source: "share\myspell\*"; DestDir: "{app}\share\myspell"; Flags: createallsubdirs recursesubdirs; Components: spelling\dict +Source: "share\myspell\*"; DestDir: "{app}\share\myspell"; Flags: createallsubdirs recursesubdirs; Components: spelling @@ -156,13 +155,11 @@ Source: "ssleay32.dll.x64"; DestDir: "{app}"; DestName: "ssleay32.dll"; Componen Source: "zlib1.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 Source: "zlib1.dll.x64"; DestDir: "{app}"; DestName: "zlib1.dll"; Components: libs; Tasks: x64 +Source: "libenchant.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libenchant.dll.x64"; DestDir: "{app}"; DestName: "libenchant.dll"; Components: libs; Tasks: x64 - -Source: "libenchant.dll"; DestDir: "{app}"; Components: spelling; Tasks: x86 -Source: "libenchant.dll.x64"; DestDir: "{app}"; DestName: "libenchant.dll"; Components: spelling; Tasks: x64 - -Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Components: spelling; Tasks: x86 -Source: "lib\enchant\libenchant_myspell.dll.x64"; DestDir: "{app}\lib\enchant"; DestName: "libenchant_myspell.dll"; Components: spelling; Tasks: x64 +Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Components: libs; Tasks: x86 +Source: "lib\enchant\libenchant_myspell.dll.x64"; DestDir: "{app}\lib\enchant"; DestName: "libenchant_myspell.dll"; Components: libs; Tasks: x64 -- cgit 1.4.1 From 42229db7baa8f3a6f2643f451209fb75783e4e64 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Sat, 9 Oct 2010 09:36:06 +0200 Subject: register xchat-wdk as the irc protocol handler --- build/xchat-wdk.iss | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'build') diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index 1cdd4c4a..9721fa93 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -62,6 +62,14 @@ Name: perl58; Description: "5.8"; GroupDescription: "Perl version:"; Flags: excl Name: perl510; Description: "5.10"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl Name: perl512; Description: "5.12"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl +[Registry] +Root: HKCR; Subkey: "irc"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Tasks: not portable +Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: ""; ValueData: "URL:IRC Protocol"; Flags: uninsdeletevalue; Tasks: not portable +Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletevalue; Tasks: not portable +Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe,0"; Flags: uninsdeletevalue; Tasks: not portable +Root: HKCR; Subkey: "irc\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Tasks: not portable +Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable + [Files] Source: "cert.pem"; DestDir: "{app}"; Components: libs Source: "COPYING"; DestDir: "{app}"; Components: libs -- cgit 1.4.1 From b76e56c44a68ef0394126c7a061ffd4c1ae4139b Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Sat, 9 Oct 2010 12:01:35 +0200 Subject: add option to run xchat-wdk after installation finishes --- build/xchat-wdk.iss | 3 +++ 1 file changed, 3 insertions(+) (limited to 'build') diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index 9721fa93..05d18bc9 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -70,6 +70,9 @@ Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueDa Root: HKCR; Subkey: "irc\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Tasks: not portable Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable +[Run] +Filename: "{app}\xchat.exe"; Description: "Run XChat-WDK after closing the Wizard"; Flags: nowait postinstall skipifsilent + [Files] Source: "cert.pem"; DestDir: "{app}"; Components: libs Source: "COPYING"; DestDir: "{app}"; Components: libs -- cgit 1.4.1 From 8aec84afd980677284dbb86ed872a2d0d8d9ae59 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Sat, 9 Oct 2010 12:20:59 +0200 Subject: disable uninstall warnings as they are nonsense, uninstaller is ran before install --- build/xchat-wdk.iss | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'build') diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss index 05d18bc9..5e4b10e1 100644 --- a/build/xchat-wdk.iss +++ b/build/xchat-wdk.iss @@ -36,18 +36,18 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom [Components] Name: "libs"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed -Name: "translations"; Description: "Translations"; Types: normal full custom -Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom -Name: "plugins"; Description: "Plugins"; Types: full custom -Name: "plugins\ewc"; Description: "EasyWinampControl"; Types: full custom -Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom -Name: "plugins\xdcc"; Description: "XDCC"; Types: full custom -Name: "langs"; Description: "Language Interfaces"; Types: full custom -Name: "langs\lua"; Description: "Lua"; Types: full custom -Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: full custom -Name: "langs\perl"; Description: "Perl"; Types: full custom -Name: "langs\python"; Description: "Python"; Types: full custom -Name: "langs\tcl"; Description: "Tcl"; Types: full custom +Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning +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\upd"; Description: "Update Checker"; Types: normal full custom; Flags: disablenouninstallwarning +Name: "plugins\xdcc"; Description: "XDCC"; Types: full custom; Flags: disablenouninstallwarning +Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning +Name: "langs\lua"; Description: "Lua"; Types: full custom; Flags: disablenouninstallwarning +Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: full custom; Flags: disablenouninstallwarning +Name: "langs\perl"; Description: "Perl"; Types: full custom; Flags: disablenouninstallwarning +Name: "langs\python"; Description: "Python"; Types: full custom; Flags: disablenouninstallwarning +Name: "langs\tcl"; Description: "Tcl"; Types: full custom; Flags: disablenouninstallwarning [Tasks] Name: x86; Description: "x86"; GroupDescription: "XChat-WDK version:"; Flags: exclusive unchecked -- cgit 1.4.1