From d03d6e606b40157d910ddf99ab018156abeb8ef0 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 28 Feb 2011 18:59:32 +0100 Subject: add wdk changes to named branch --- build/bitmaps/wizardimage.bmp | Bin 0 -> 52062 bytes build/bitmaps/wizardsmallimage.bmp | Bin 0 -> 9798 bytes build/build-small.bat | 68 +++++++++ build/build-spell.bat | 16 ++ build/build-x64.bat | 35 +++++ build/build-x86.bat | 37 +++++ build/build.bat | 7 + build/compile-po-files.bat | 7 + build/deb-extract.bat | 2 + build/dep-extract.bat | 9 ++ build/etc/download.png | Bin 0 -> 703 bytes build/etc/gtk-2.0/gtkrc | 71 +++++++++ build/etc/music.png | Bin 0 -> 3577 bytes build/release-src.bat | 14 ++ build/release-x64.bat | 45 ++++++ build/release-x86.bat | 59 ++++++++ build/xchat-wdk-spell.skel.iss | 39 +++++ build/xchat-wdk.skel.iss | 302 +++++++++++++++++++++++++++++++++++++ 18 files changed, 711 insertions(+) create mode 100644 build/bitmaps/wizardimage.bmp create mode 100644 build/bitmaps/wizardsmallimage.bmp create mode 100644 build/build-small.bat create mode 100644 build/build-spell.bat create mode 100644 build/build-x64.bat create mode 100644 build/build-x86.bat create mode 100644 build/build.bat create mode 100644 build/compile-po-files.bat create mode 100644 build/deb-extract.bat create mode 100644 build/dep-extract.bat create mode 100644 build/etc/download.png create mode 100644 build/etc/gtk-2.0/gtkrc create mode 100644 build/etc/music.png create mode 100644 build/release-src.bat create mode 100644 build/release-x64.bat create mode 100644 build/release-x86.bat create mode 100644 build/xchat-wdk-spell.skel.iss create mode 100644 build/xchat-wdk.skel.iss (limited to 'build') diff --git a/build/bitmaps/wizardimage.bmp b/build/bitmaps/wizardimage.bmp new file mode 100644 index 00000000..9f5a4c90 Binary files /dev/null and b/build/bitmaps/wizardimage.bmp differ diff --git a/build/bitmaps/wizardsmallimage.bmp b/build/bitmaps/wizardsmallimage.bmp new file mode 100644 index 00000000..1bb8b790 Binary files /dev/null and b/build/bitmaps/wizardsmallimage.bmp differ diff --git a/build/build-small.bat b/build/build-small.bat new file mode 100644 index 00000000..2ee202ac --- /dev/null +++ b/build/build-small.bat @@ -0,0 +1,68 @@ +@echo off +set WDK_ROOT=c:\WinDDK\7600.16385.1 +cd .. +set DEV_32=%cd%\dep-x86 +cd src +echo DEV = %DEV_32% > makeinc.mak +type makeinc.skel.mak >> makeinc.mak +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70 +set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386 +set OPATH=%PATH% +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin +nmake /nologo /f makefile.mak clean +cd pixmaps +nmake /nologo /f makefile.mak +cd .. +nmake /nologo /f makefile.mak +cd ..\plugins +nmake /nologo /f makefile.mak clean +nmake /nologo /f makefile.mak +cd ..\build +set PATH=%OPATH% +set DEPS_ROOT=..\dep-x86 +set XCHAT_DEST=..\tmp +rmdir /q /s %XCHAT_DEST% +mkdir %XCHAT_DEST% +echo 2> portable-mode +move portable-mode %XCHAT_DEST% +copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\freetype6.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\intl.dll %XCHAT_DEST% +xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\ +copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines +xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\ +xcopy /q /s /i etc %XCHAT_DEST%\etc +copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\cert.pem %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libenchant.dll %XCHAT_DEST% +xcopy /q /s /i %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\ +xcopy /q /s /i ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\ +copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins +copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins +copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins +copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins +copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins +::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins +copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins +copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins +copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST% +pause diff --git a/build/build-spell.bat b/build/build-spell.bat new file mode 100644 index 00000000..7300e41d --- /dev/null +++ b/build/build-spell.bat @@ -0,0 +1,16 @@ +@echo off +set DEPS_ROOT=..\dep-x86 +set XCHAT_DEST=..\tmp-spell +rmdir /q /s %XCHAT_DEST% +mkdir %XCHAT_DEST% +xcopy /q /s /i %DEPS_ROOT%\myspell %XCHAT_DEST%\share\myspell +copy ..\COPYING %XCHAT_DEST% +echo [Setup] > xchat-wdk-spell.iss +echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk-spell.iss +echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk-spell.iss +cd .. +echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk-spell.iss +type build\xchat-wdk-spell.skel.iss >> build\xchat-wdk-spell.iss +set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 +compil32 /cc build\xchat-wdk-spell.iss +pause diff --git a/build/build-x64.bat b/build/build-x64.bat new file mode 100644 index 00000000..6f49dae2 --- /dev/null +++ b/build/build-x64.bat @@ -0,0 +1,35 @@ +@echo off +set PERL_510=c:\mozilla-build\perl-5.10-x64 +set PERL_512=c:\mozilla-build\perl-5.12-x64 +cd .. +set DEV_64=%cd%\dep-x64 +cd src +echo X64 = YES > makeinc.mak +echo DEV = %DEV_64% >> makeinc.mak +type makeinc.skel.mak >> makeinc.mak +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70 +set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64 +set OPATH=%PATH% +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin +cd common +nmake /nologo /f makefile.mak clean +cd ..\fe-gtk +nmake /nologo /f makefile.mak clean +cd ..\fe-text +nmake /nologo /f makefile.mak clean +cd .. +nmake /nologo /f makefile.mak +cd ..\plugins +nmake /nologo /f makefile.mak clean +nmake /nologo /f makefile.mak +cd perl +set OOPATH=%PATH% +set PATH=%OOPATH%;%PERL_510%\bin +nmake /nologo /s /f makefile-510.mak clean +nmake /nologo /s /f makefile-510.mak +set PATH=%OOPATH%;%PERL_512%\bin +nmake /nologo /s /f makefile-512.mak clean +nmake /nologo /s /f makefile-512.mak +cd ..\..\build +set PATH=%OPATH% +call release-x64.bat diff --git a/build/build-x86.bat b/build/build-x86.bat new file mode 100644 index 00000000..7776ee4d --- /dev/null +++ b/build/build-x86.bat @@ -0,0 +1,37 @@ +@echo off +set PERL_510=c:\mozilla-build\perl-5.10-x86 +set PERL_512=c:\mozilla-build\perl-5.12-x86 +echo [Setup] > xchat-wdk.iss +echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk.iss +echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk.iss +cd .. +echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk.iss +type build\xchat-wdk.skel.iss >> build\xchat-wdk.iss +set DEV_32=%cd%\dep-x86 +cd src +echo DEV = %DEV_32% > makeinc.mak +type makeinc.skel.mak >> makeinc.mak +set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70 +set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386 +set OPATH=%PATH% +set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin +nmake /nologo /f makefile.mak clean +cd pixmaps +nmake /nologo /f makefile.mak +cd .. +nmake /nologo /f makefile.mak +cd ..\plugins +nmake /nologo /f makefile.mak clean +nmake /nologo /f makefile.mak +cd perl +set OOPATH=%PATH% +set PATH=%OOPATH%;%PERL_510%\bin +nmake /nologo /s /f makefile-510.mak clean +nmake /nologo /s /f makefile-510.mak +set PATH=%OOPATH%;%PERL_512%\bin +nmake /nologo /s /f makefile-512.mak clean +nmake /nologo /s /f makefile-512.mak +cd ..\..\build +call compile-po-files.bat +set PATH=%OPATH% +call release-x86.bat diff --git a/build/build.bat b/build/build.bat new file mode 100644 index 00000000..2190210a --- /dev/null +++ b/build/build.bat @@ -0,0 +1,7 @@ +@echo off +set WDK_ROOT=c:\WinDDK\7600.16385.1 +call build-x86.bat +call build-x64.bat +set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 +compil32 /cc xchat-wdk.iss +pause diff --git a/build/compile-po-files.bat b/build/compile-po-files.bat new file mode 100644 index 00000000..64f2c4d3 --- /dev/null +++ b/build/compile-po-files.bat @@ -0,0 +1,7 @@ +@echo off +echo.Compiling translations . . . +cd ..\po +rmdir /q /s locale +mkdir locale +for %%A in (am az be bg ca cs de el en_GB es et eu fi fr gl hi hu it ja kn ko lt lv mk ms nb nl no pa pl pt pt_BR ru sk sl sq sr sv th uk vi wa zh_CN zh_TW) do mkdir locale\%%A\LC_MESSAGES && msgfmt -co locale\%%A\LC_MESSAGES\xchat.mo %%A.po +cd ..\build diff --git a/build/deb-extract.bat b/build/deb-extract.bat new file mode 100644 index 00000000..913397b9 --- /dev/null +++ b/build/deb-extract.bat @@ -0,0 +1,2 @@ +@echo off +for %%A in (*.deb) do 7z x %%A && 7z x data.tar && del data.tar diff --git a/build/dep-extract.bat b/build/dep-extract.bat new file mode 100644 index 00000000..05e40e02 --- /dev/null +++ b/build/dep-extract.bat @@ -0,0 +1,9 @@ +@echo off +set PATH=%PROGRAMW6432%\7-Zip +cd ..\dep-x64 +7z x *.zip +7z x *.7z +cd ..\dep-x86 +7z x *.zip +7z x *.7z +pause diff --git a/build/etc/download.png b/build/etc/download.png new file mode 100644 index 00000000..43253432 Binary files /dev/null and b/build/etc/download.png differ diff --git a/build/etc/gtk-2.0/gtkrc b/build/etc/gtk-2.0/gtkrc new file mode 100644 index 00000000..bd7acd28 --- /dev/null +++ b/build/etc/gtk-2.0/gtkrc @@ -0,0 +1,71 @@ +gtk-font-name = "sans 8" + +gtk-icon-sizes = "gtk-menu=13,13:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32" +gtk-toolbar-icon-size = small-toolbar + +# disable images in buttons. i've only seen ugly delphi apps use this feature. +gtk-button-images = 0 + +# enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly. +# the office apps use them heavily, though. +gtk-menu-images = 1 + +# use the win32 button ordering instead of the GNOME HIG one, where applicable +gtk-alternative-button-order = 1 + +# use the win32 sort indicators direction, as in Explorer +gtk-alternative-sort-arrows = 1 + +# Windows users don't expect the PC Speaker beeping at them when they backspace in an empty textview and stuff like that +gtk-error-bell = 0 + +# hide mnemonic underlines until the Alt key is pressed +gtk-auto-mnemonics = 1 + +style "msw-default" +{ + GtkWidget::interior-focus = 1 + GtkOptionMenu::indicator-size = { 9, 5 } + GtkOptionMenu::indicator-spacing = { 7, 5, 2, 2 } + GtkSpinButton::shadow-type = in + + # Owen and I disagree that these should be themable + #GtkUIManager::add-tearoffs = 0 + #GtkComboBox::add-tearoffs = 0 + + GtkComboBox::appears-as-list = 1 + GtkComboBox::focus-on-click = 0 + + GOComboBox::add_tearoffs = 0 + + GtkTreeView::allow-rules = 0 + GtkTreeView::expander-size = 12 + + GtkExpander::expander-size = 12 + + GtkScrolledWindow::scrollbar_spacing = 1 + + GtkSeparatorMenuItem::horizontal-padding = 2 + + engine "wimp" + { + } +} +class "*" style "msw-default" + +binding "ms-windows-tree-view" +{ + bind "Right" { "expand-collapse-cursor-row" (1,1,0) } + bind "Left" { "expand-collapse-cursor-row" (1,0,0) } +} + +class "GtkTreeView" binding "ms-windows-tree-view" + +style "msw-combobox-thickness" = "msw-default" +{ + xthickness = 0 + ythickness = 0 +} + +widget_class "*TreeView*ComboBox*" style "msw-combobox-thickness" +widget_class "*ComboBox*GtkFrame*" style "msw-combobox-thickness" diff --git a/build/etc/music.png b/build/etc/music.png new file mode 100644 index 00000000..3a72f118 Binary files /dev/null and b/build/etc/music.png differ diff --git a/build/release-src.bat b/build/release-src.bat new file mode 100644 index 00000000..f3833cf1 --- /dev/null +++ b/build/release-src.bat @@ -0,0 +1,14 @@ +@echo off +set PATH=%PATH%;%PROGRAMW6432%\7-Zip;%PROGRAMW6432%\TortoiseSVN\bin;%PROGRAMFILES(X86)%\TortoiseHg +hg clone https://xchat-wdk.googlecode.com/hg/ xchat-wdk +rmdir /q /s xchat-wdk\.hg +TortoiseProc /closeonend:1 /notempfile /command:export /url:https://xchat.svn.sourceforge.net/svnroot/xchat /path:xchat-wdk-svn +rm xchat-wdk-svn\COPYING +xcopy /E xchat-wdk-svn xchat-wdk +rmdir /q /s xchat-wdk-svn +cd xchat-wdk +patch -i xchat-wdk.patch -p1 +cd .. +7z a xchat-wdk-tip.7z xchat-wdk +rmdir /q /s xchat-wdk +pause diff --git a/build/release-x64.bat b/build/release-x64.bat new file mode 100644 index 00000000..ddb070b6 --- /dev/null +++ b/build/release-x64.bat @@ -0,0 +1,45 @@ +@echo off +set DEPS_ROOT=..\dep-x64 +set XCHAT_DEST=..\tmp +copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%\xchat.exe.x64 +copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%\xchat-text.exe.x64 +copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%\libgdk_pixbuf-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST%\libgio-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST%\libglib-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST%\libgmodule-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST%\libgobject-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST%\libgthread-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST%\libpng14-14.dll.x64 +copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST%\libgdk-win32-2.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%\libcairo-2.dll.x64 +copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%\libfontconfig-1.dll.x64 +copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%\libexpat-1.dll.x64 +copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%\libfreetype-6.dll.x64 +copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST%\libpango-1.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST%\libpangocairo-1.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64 +copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64 +copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64 +copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64 +copy %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64 +copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64 +copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64 +copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64 +copy %DEPS_ROOT%\bin\libenchant.dll %XCHAT_DEST%\libenchant.dll.x64 +copy %DEPS_ROOT%\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\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\xcchecksum.dll.x64 +copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64 +copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins\xcmpcinfo.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 +copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64 +copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\xctcl.dll.x64 +copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins\xcupd.dll.x64 +::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\xcxdcc.dll.x64 +copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\xtray.dll.x64 +copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins\xcwinamp.dll.x64 +copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST%\lua51.dll.x64 diff --git a/build/release-x86.bat b/build/release-x86.bat new file mode 100644 index 00000000..c33e981c --- /dev/null +++ b/build/release-x86.bat @@ -0,0 +1,59 @@ +@echo off +set DEPS_ROOT=..\dep-x86 +set XCHAT_DEST=..\tmp +rmdir /q /s %XCHAT_DEST% +mkdir %XCHAT_DEST% +echo 2> portable-mode +move portable-mode %XCHAT_DEST% +copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST% +copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\freetype6.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\intl.dll %XCHAT_DEST% +xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\ +copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines +xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\ +xcopy /q /s /i etc %XCHAT_DEST%\etc +copy ..\COPYING %XCHAT_DEST% +copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST% +copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST% +copy %DEPS_ROOT%\share\doc\glib-2.26.1\COPYING %XCHAT_DEST%\LICENSE.GTK +copy %DEPS_ROOT%\share\doc\cairo_1.10.2-1_win32\COPYING-LGPL-2.1 %XCHAT_DEST%\LICENSE.CAIRO +copy %DEPS_ROOT%\LICENSE.LUA %XCHAT_DEST% +copy %DEPS_ROOT%\LICENSE.ENCHANT %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST% +copy %DEPS_ROOT%\bin\cert.pem %XCHAT_DEST% +copy %DEPS_ROOT%\bin\libenchant.dll %XCHAT_DEST% +xcopy /q /s /i %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\ +xcopy /q /s /i ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\ +copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins +copy ..\plugins\mpcinfo\xcmpcinfo.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 +copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins +copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins +::copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins +copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins +copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins +copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST% +xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale +xcopy /q /s /i %DEPS_ROOT%\share\locale %XCHAT_DEST%\share\locale diff --git a/build/xchat-wdk-spell.skel.iss b/build/xchat-wdk-spell.skel.iss new file mode 100644 index 00000000..055c5a6a --- /dev/null +++ b/build/xchat-wdk-spell.skel.iss @@ -0,0 +1,39 @@ +AppName=XChat-WDK Spelling Dictionaries +AppVerName=XChat-WDK Spelling Dictionaries 1.0 +AppVersion=1.0 +VersionInfoVersion=1.0 +OutputBaseFilename=XChat-WDK Spelling Dictionaries +AppPublisher=XChat-WDK +AppPublisherURL=http://code.google.com/p/xchat-wdk/ +AppCopyright=Copyright (C) 1998-2010 Peter Zelezny +AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list +AppUpdatesURL=http://code.google.com/p/xchat-wdk/wiki/InfoXChat +LicenseFile=COPYING +UninstallDisplayIcon={app}\xchat.exe +UninstallDisplayName=XChat-WDK Spelling Dictionaries +DefaultDirName={pf}\XChat-WDK +DefaultGroupName=XChat-WDK +DisableProgramGroupPage=yes +SolidCompression=yes +SourceDir=..\tmp-spell +OutputDir=..\build +FlatComponentsList=no +PrivilegesRequired=none +ShowComponentSizes=no +CreateUninstallRegKey=not IsTaskSelected('portable') +Uninstallable=not IsTaskSelected('portable') +DirExistsWarning=no +ArchitecturesAllowed=x86 x64 +ArchitecturesInstallIn64BitMode=x64 + +[Tasks] +Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked + +[Files] +Source: "share\myspell\*"; DestDir: "{app}\share\myspell"; Flags: createallsubdirs recursesubdirs + +[Icons] +Name: "{group}\Uninstall Spelling Dictionaries"; Filename: "{uninstallexe}"; Tasks: not portable + +[Messages] +BeveledLabel= XChat-WDK diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss new file mode 100644 index 00000000..0c331815 --- /dev/null +++ b/build/xchat-wdk.skel.iss @@ -0,0 +1,302 @@ +AppName=XChat-WDK +AppVerName=XChat-WDK 1489 +AppVersion=14.89 +VersionInfoVersion=14.89 +OutputBaseFilename=XChat-WDK 1489 +AppPublisher=XChat-WDK +AppPublisherURL=http://code.google.com/p/xchat-wdk/ +AppCopyright=Copyright (C) 1998-2010 Peter Zelezny +AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list +AppUpdatesURL=http://code.google.com/p/xchat-wdk/wiki/InfoXChat +LicenseFile=COPYING +UninstallDisplayIcon={app}\xchat.exe +UninstallDisplayName=XChat-WDK +DefaultDirName={pf}\XChat-WDK +DefaultGroupName=XChat-WDK +DisableProgramGroupPage=yes +SolidCompression=yes +SourceDir=..\tmp +OutputDir=..\build +FlatComponentsList=no +PrivilegesRequired=none +ShowComponentSizes=no +CreateUninstallRegKey=not IsTaskSelected('portable') +Uninstallable=not IsTaskSelected('portable') +ArchitecturesAllowed=x86 x64 +ArchitecturesInstallIn64BitMode=x64 + +[Types] +Name: "normal"; Description: "Normal Installation" +Name: "full"; Description: "Full Installation" +Name: "minimal"; Description: "Minimal Installation" +Name: "custom"; Description: "Custom Installation"; Flags: iscustom + +[Components] +Name: "libs"; Description: "XChat-WDK"; Types: normal full minimal custom; Flags: fixed +Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenouninstallwarning +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\checksum"; Description: "Checksum"; Types: full custom; Flags: disablenouninstallwarning +Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: 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 +Name: "plugins\xtray"; Description: "X-Tray"; 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 +Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: exclusive; Check: Is64BitInstallMode + +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 + +Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked + +[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 + +[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 +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 +Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: createallsubdirs recursesubdirs; Components: translations +;Source: "share\myspell\*"; DestDir: "{app}\share\myspell"; Flags: createallsubdirs recursesubdirs; Components: spelling + + + +Source: "xchat.exe"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "xchat.exe.x64"; DestDir: "{app}"; DestName: "xchat.exe"; Components: libs; Tasks: x64 + + + +Source: "freetype6.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libfreetype-6.dll.x64"; DestDir: "{app}"; DestName: "libfreetype-6.dll"; Components: libs; Tasks: x64 + +Source: "intl.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libintl-8.dll.x64"; DestDir: "{app}"; DestName: "libintl-8.dll"; Components: libs; Tasks: x64 + + + +Source: "libatk-1.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libatk-1.0-0.dll.x64"; DestDir: "{app}"; DestName: "libatk-1.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libcairo-2.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libcairo-2.dll.x64"; DestDir: "{app}"; DestName: "libcairo-2.dll"; Components: libs; Tasks: x64 + +Source: "libeay32.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libeay32.dll.x64"; DestDir: "{app}"; DestName: "libeay32.dll"; Components: libs; Tasks: x64 + +Source: "libexpat-1.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libexpat-1.dll.x64"; DestDir: "{app}"; DestName: "libexpat-1.dll"; Components: libs; Tasks: x64 + +Source: "libfontconfig-1.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libfontconfig-1.dll.x64"; DestDir: "{app}"; DestName: "libfontconfig-1.dll"; Components: libs; Tasks: x64 + +Source: "libgdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libgdk_pixbuf-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgdk_pixbuf-2.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libgdk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libgdk-win32-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgdk-win32-2.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libgio-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libgio-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgio-2.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libglib-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libglib-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libglib-2.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libgmodule-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libgmodule-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgmodule-2.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libgobject-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libgobject-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgobject-2.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libgthread-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libgthread-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgthread-2.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libgtk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libgtk-win32-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgtk-win32-2.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libpango-1.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libpango-1.0-0.dll.x64"; DestDir: "{app}"; DestName: "libpango-1.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libpangocairo-1.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libpangocairo-1.0-0.dll.x64"; DestDir: "{app}"; DestName: "libpangocairo-1.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libpangoft2-1.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libpangoft2-1.0-0.dll.x64"; DestDir: "{app}"; DestName: "libpangoft2-1.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libpangowin32-1.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libpangowin32-1.0-0.dll.x64"; DestDir: "{app}"; DestName: "libpangowin32-1.0-0.dll"; Components: libs; Tasks: x64 + +Source: "libpng14-14.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "libpng14-14.dll.x64"; DestDir: "{app}"; DestName: "libpng14-14.dll"; Components: libs; Tasks: x64 + +Source: "lua51.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "lua51.dll.x64"; DestDir: "{app}"; DestName: "lua51.dll"; Components: libs; Tasks: x64 + +Source: "ssleay32.dll"; DestDir: "{app}"; Components: libs; Tasks: x86 +Source: "ssleay32.dll.x64"; DestDir: "{app}"; DestName: "ssleay32.dll"; Components: libs; Tasks: x64 + +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: "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 + + + +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: "xchat-text.exe"; DestDir: "{app}"; Components: xctext; Tasks: x86 +Source: "xchat-text.exe.x64"; DestDir: "{app}"; DestName: "xchat-text.exe"; Components: xctext; Tasks: x64 + + + +;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\xcmpcinfo.dll"; DestDir: "{app}\plugins"; Components: plugins\mpcinfo; Tasks: x86 +Source: "plugins\xcmpcinfo.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcmpcinfo.dll"; Components: plugins\mpcinfo; 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 + +Source: "plugins\xcwinamp.dll"; DestDir: "{app}\plugins"; Components: plugins\winamp; Tasks: x86 +Source: "plugins\xcwinamp.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcwinamp.dll"; Components: plugins\winamp; Tasks: x64 + +;Source: "plugins\xcxdcc.dll"; DestDir: "{app}\plugins"; Components: plugins\xdcc; Tasks: x86 +;Source: "plugins\xcxdcc.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcxdcc.dll"; Components: plugins\xdcc; Tasks: x64 + +Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: plugins\xtray; Tasks: x86 +Source: "plugins\xtray.dll.x64"; DestDir: "{app}\plugins"; DestName: "xtray.dll"; Components: plugins\xtray; Tasks: x64 + + + +Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: langs\lua; Tasks: x86 +Source: "plugins\xclua.dll.x64"; DestDir: "{app}\plugins"; DestName: "xclua.dll"; Components: langs\lua; Tasks: x64 + +Source: "plugins\xcpython.dll"; DestDir: "{app}\plugins"; Components: langs\python; Tasks: x86 +Source: "plugins\xcpython.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcpython.dll"; Components: langs\python; Tasks: x64 + +Source: "plugins\xctcl.dll"; DestDir: "{app}\plugins"; Components: langs\tcl; Tasks: x86 +Source: "plugins\xctcl.dll.x64"; DestDir: "{app}\plugins"; DestName: "xctcl.dll"; Components: langs\tcl; Tasks: x64 + + + +Source: "plugins\xcperl-510.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x86 and perl510 +Source: "plugins\xcperl-510.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x64 and perl510 + +Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x86 and perl512 +Source: "plugins\xcperl-512.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x64 and perl512 + +[Icons] +Name: "{group}\XChat-WDK"; Filename: "{app}\xchat.exe"; Tasks: not portable +Name: "{group}\XChat-Text"; Filename: "{app}\xchat-text.exe"; Components: xctext; Tasks: not portable +Name: "{group}\Uninstall XChat-WDK"; Filename: "{uninstallexe}"; Tasks: not portable + +[Messages] +BeveledLabel= XChat-WDK + +[Code] +///////////////////////////////////////////////////////////////////// +// these are required for x86->x64 or reverse upgrades +///////////////////////////////////////////////////////////////////// +function GetUninstallString(): String; +var + sUnInstPath: String; + sUnInstallString: String; +begin + sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\XChat-WDK_is1'); + sUnInstallString := ''; + if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then + RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString); + Result := sUnInstallString; +end; + + +///////////////////////////////////////////////////////////////////// +function IsUpgrade(): Boolean; +begin + Result := (GetUninstallString() <> ''); +end; + + +///////////////////////////////////////////////////////////////////// +function UnInstallOldVersion(): Integer; +var + sUnInstallString: String; + iResultCode: Integer; +begin +// Return Values: +// 1 - uninstall string is empty +// 2 - error executing the UnInstallString +// 3 - successfully executed the UnInstallString + + // default return value + Result := 0; + + // get the uninstall string of the old app + sUnInstallString := GetUninstallString(); + if sUnInstallString <> '' then begin + sUnInstallString := RemoveQuotes(sUnInstallString); + if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then + Result := 3 + else + Result := 2; + end else + Result := 1; +end; + +///////////////////////////////////////////////////////////////////// +procedure CurStepChanged(CurStep: TSetupStep); +begin + if not (IsTaskSelected('portable')) then + begin + if (CurStep=ssInstall) then + begin + if (IsUpgrade()) then + begin + UnInstallOldVersion(); + end; + end; + end; +end; -- cgit 1.4.1 From 32ea8bdb84912bcd5f7072e19e6d0693d4287eaf Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 2 Mar 2011 08:50:58 +0100 Subject: spelling installer cosmetics --- build/xchat-wdk-spell.skel.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build') diff --git a/build/xchat-wdk-spell.skel.iss b/build/xchat-wdk-spell.skel.iss index 055c5a6a..6d1b26b6 100644 --- a/build/xchat-wdk-spell.skel.iss +++ b/build/xchat-wdk-spell.skel.iss @@ -1,8 +1,8 @@ AppName=XChat-WDK Spelling Dictionaries -AppVerName=XChat-WDK Spelling Dictionaries 1.0 +AppVerName=XChat-WDK Spelling Dictionaries r1 AppVersion=1.0 VersionInfoVersion=1.0 -OutputBaseFilename=XChat-WDK Spelling Dictionaries +OutputBaseFilename=XChat-WDK Spelling Dictionaries r1 AppPublisher=XChat-WDK AppPublisherURL=http://code.google.com/p/xchat-wdk/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny -- cgit 1.4.1 From 2676acaa8c7f1c387989abb4f05ab10e2bc166ad Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Sat, 16 Apr 2011 19:52:13 +0200 Subject: bump version number part 2 --- build/xchat-wdk.skel.iss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build') diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss index 0c331815..86b9904a 100644 --- a/build/xchat-wdk.skel.iss +++ b/build/xchat-wdk.skel.iss @@ -1,8 +1,8 @@ AppName=XChat-WDK -AppVerName=XChat-WDK 1489 -AppVersion=14.89 -VersionInfoVersion=14.89 -OutputBaseFilename=XChat-WDK 1489 +AppVerName=XChat-WDK 1494 +AppVersion=14.94 +VersionInfoVersion=14.94 +OutputBaseFilename=XChat-WDK 1494 AppPublisher=XChat-WDK AppPublisherURL=http://code.google.com/p/xchat-wdk/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny -- cgit 1.4.1 From 8c7d6502b99cfcfa034be2a9295eb7657f38dea1 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Sat, 7 May 2011 22:32:08 +0200 Subject: source release is much simpler now thanks to the restructured source repo --- build/release-src.bat | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'build') diff --git a/build/release-src.bat b/build/release-src.bat index f3833cf1..93c78352 100644 --- a/build/release-src.bat +++ b/build/release-src.bat @@ -1,14 +1,7 @@ @echo off -set PATH=%PATH%;%PROGRAMW6432%\7-Zip;%PROGRAMW6432%\TortoiseSVN\bin;%PROGRAMFILES(X86)%\TortoiseHg -hg clone https://xchat-wdk.googlecode.com/hg/ xchat-wdk +set PATH=%PATH%;%PROGRAMW6432%\7-Zip;%PROGRAMFILES(X86)%\TortoiseHg +hg clone --branch wdk https://xchat-wdk.googlecode.com/hg/ xchat-wdk rmdir /q /s xchat-wdk\.hg -TortoiseProc /closeonend:1 /notempfile /command:export /url:https://xchat.svn.sourceforge.net/svnroot/xchat /path:xchat-wdk-svn -rm xchat-wdk-svn\COPYING -xcopy /E xchat-wdk-svn xchat-wdk -rmdir /q /s xchat-wdk-svn -cd xchat-wdk -patch -i xchat-wdk.patch -p1 -cd .. 7z a xchat-wdk-tip.7z xchat-wdk rmdir /q /s xchat-wdk pause -- cgit 1.4.1 From 24ac838543bc99ea8d289925b4c5418107d5ae1f Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 30 May 2011 22:52:02 +0200 Subject: add support for Perl 5.14 --- build/build-x64.bat | 4 ++++ build/build-x86.bat | 4 ++++ build/release-x64.bat | 1 + build/release-x86.bat | 1 + build/xchat-wdk.skel.iss | 4 ++++ plugins/perl/makefile-514.mak | 30 ++++++++++++++++++++++++++++++ src/makeinc.skel.mak | 4 ++++ 7 files changed, 48 insertions(+) create mode 100644 plugins/perl/makefile-514.mak (limited to 'build') diff --git a/build/build-x64.bat b/build/build-x64.bat index 6f49dae2..5375809e 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -1,6 +1,7 @@ @echo off set PERL_510=c:\mozilla-build\perl-5.10-x64 set PERL_512=c:\mozilla-build\perl-5.12-x64 +set PERL_514=c:\mozilla-build\perl-5.14-x64 cd .. set DEV_64=%cd%\dep-x64 cd src @@ -30,6 +31,9 @@ nmake /nologo /s /f makefile-510.mak set PATH=%OOPATH%;%PERL_512%\bin nmake /nologo /s /f makefile-512.mak clean nmake /nologo /s /f makefile-512.mak +set PATH=%OOPATH%;%PERL_514%\bin +nmake /nologo /s /f makefile-514.mak clean +nmake /nologo /s /f makefile-514.mak cd ..\..\build set PATH=%OPATH% call release-x64.bat diff --git a/build/build-x86.bat b/build/build-x86.bat index 7776ee4d..b8ee8052 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -1,6 +1,7 @@ @echo off set PERL_510=c:\mozilla-build\perl-5.10-x86 set PERL_512=c:\mozilla-build\perl-5.12-x86 +set PERL_514=c:\mozilla-build\perl-5.14-x86 echo [Setup] > xchat-wdk.iss echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk.iss echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk.iss @@ -31,6 +32,9 @@ nmake /nologo /s /f makefile-510.mak set PATH=%OOPATH%;%PERL_512%\bin nmake /nologo /s /f makefile-512.mak clean nmake /nologo /s /f makefile-512.mak +set PATH=%OOPATH%;%PERL_514%\bin +nmake /nologo /s /f makefile-514.mak clean +nmake /nologo /s /f makefile-514.mak cd ..\..\build call compile-po-files.bat set PATH=%OPATH% diff --git a/build/release-x64.bat b/build/release-x64.bat index ddb070b6..50ae1e64 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -36,6 +36,7 @@ copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64 copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins\xcmpcinfo.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 +copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins\xcperl-514.dll.x64 copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64 copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\xctcl.dll.x64 copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins\xcupd.dll.x64 diff --git a/build/release-x86.bat b/build/release-x86.bat index c33e981c..05ad7df5 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -48,6 +48,7 @@ copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins copy ..\plugins\perl\xcperl-510.dll %XCHAT_DEST%\plugins copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins +copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss index 86b9904a..dccd58ff 100644 --- a/build/xchat-wdk.skel.iss +++ b/build/xchat-wdk.skel.iss @@ -57,6 +57,7 @@ Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: ex 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 +Name: perl514; Description: "5.14"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked @@ -228,6 +229,9 @@ Source: "plugins\xcperl-510.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcper Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x86 and perl512 Source: "plugins\xcperl-512.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x64 and perl512 +Source: "plugins\xcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x86 and perl514 +Source: "plugins\xcperl-514.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x64 and perl514 + [Icons] Name: "{group}\XChat-WDK"; Filename: "{app}\xchat.exe"; Tasks: not portable Name: "{group}\XChat-Text"; Filename: "{app}\xchat-text.exe"; Components: xctext; Tasks: not portable diff --git a/plugins/perl/makefile-514.mak b/plugins/perl/makefile-514.mak new file mode 100644 index 00000000..94ee456f --- /dev/null +++ b/plugins/perl/makefile-514.mak @@ -0,0 +1,30 @@ +include "..\..\src\makeinc.mak" + +DIRENTLIB = ..\..\src\common\dirent.lib +TARGET = $(PERL514OUTPUT) + +all: $(TARGET) + +perl.def: + echo EXPORTS > perl.def + echo xchat_plugin_init >> perl.def + echo xchat_plugin_deinit >> perl.def + echo xchat_plugin_get_info >> perl.def + +perl.obj: perl.c + $(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL514PATH) /I.. /DPERL_DLL=\"$(PERL514LIB).dll\" + +perl.c: xchat.pm.h + +xchat.pm.h: lib/Xchat.pm lib/IRC.pm + perl.exe generate_header + +$(TARGET): perl.obj perl.def + $(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL514LIB).lib /libpath:$(PERL514PATH) /DELAYLOAD:$(PERL514LIB).dll $(DIRENTLIB) DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def + +clean: + @del $(TARGET) + @del *.obj + @del perl.def + @del *.lib + @del *.exp diff --git a/src/makeinc.skel.mak b/src/makeinc.skel.mak index c9027992..f7bbeeb7 100644 --- a/src/makeinc.skel.mak +++ b/src/makeinc.skel.mak @@ -18,6 +18,8 @@ PERL510LIB = perl510 PERL510OUTPUT = xcperl-510.dll PERL512LIB = perl512 PERL512OUTPUT = xcperl-512.dll +PERL514LIB = perl514 +PERL514OUTPUT = xcperl-514.dll PYTHONLIB = python27 PYTHONOUTPUT = xcpython.dll @@ -32,6 +34,7 @@ LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj PERL510PATH = c:\mozilla-build\perl-5.10-x64\lib\CORE PERL512PATH = c:\mozilla-build\perl-5.12-x64\lib\CORE +PERL514PATH = c:\mozilla-build\perl-5.14-x64\lib\CORE PYTHONPATH = c:\mozilla-build\python-2.7-x64 TCLPATH = c:\mozilla-build\tcl-8.5-x64 !else @@ -39,6 +42,7 @@ LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj PERL510PATH = c:\mozilla-build\perl-5.10-x86\lib\CORE PERL512PATH = c:\mozilla-build\perl-5.12-x86\lib\CORE +PERL514PATH = c:\mozilla-build\perl-5.14-x86\lib\CORE PYTHONPATH = c:\mozilla-build\python-2.7-x86 TCLPATH = c:\mozilla-build\tcl-8.5-x86 !endif -- cgit 1.4.1 From d4d72cf7b1b3c07c18d43062129a0ce49dc57674 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 30 May 2011 22:54:52 +0200 Subject: bump version number part 2 --- build/xchat-wdk.skel.iss | 8 ++++---- config.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'build') diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss index dccd58ff..0139b7fc 100644 --- a/build/xchat-wdk.skel.iss +++ b/build/xchat-wdk.skel.iss @@ -1,8 +1,8 @@ AppName=XChat-WDK -AppVerName=XChat-WDK 1494 -AppVersion=14.94 -VersionInfoVersion=14.94 -OutputBaseFilename=XChat-WDK 1494 +AppVerName=XChat-WDK 1496 +AppVersion=14.96 +VersionInfoVersion=14.96 +OutputBaseFilename=XChat-WDK 1496 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 186669ee..3e0302e0 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ #define USE_PLUGIN #define USE_LIBSEXY #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "1494" +#define PACKAGE_VERSION "1496" #define XCHAT_RELEASE "2.8.8" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." -- cgit 1.4.1 From 36eb489794fba5b456c895b0324eaca6f4b62ff9 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 30 May 2011 23:09:04 +0200 Subject: make perl 5.12 the default choice --- build/xchat-wdk.skel.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss index 0139b7fc..80aa66a4 100644 --- a/build/xchat-wdk.skel.iss +++ b/build/xchat-wdk.skel.iss @@ -57,7 +57,7 @@ Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: ex 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 -Name: perl514; Description: "5.14"; GroupDescription: "Perl version:"; Flags: exclusive; Components: langs\perl +Name: perl514; Description: "5.14"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked -- cgit 1.4.1 From 233a5ed35e8d64c0c119fafb1664eaa9f34e5363 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Sun, 5 Jun 2011 03:26:46 +0200 Subject: bump version number --- build/xchat-wdk.skel.iss | 8 ++++---- config.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'build') diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss index 80aa66a4..8914e628 100644 --- a/build/xchat-wdk.skel.iss +++ b/build/xchat-wdk.skel.iss @@ -1,8 +1,8 @@ AppName=XChat-WDK -AppVerName=XChat-WDK 1496 -AppVersion=14.96 -VersionInfoVersion=14.96 -OutputBaseFilename=XChat-WDK 1496 +AppVerName=XChat-WDK 1496-2 +AppVersion=14.96.2 +VersionInfoVersion=14.96.2 +OutputBaseFilename=XChat-WDK 1496-2 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 3e0302e0..63b5ccfd 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ #define USE_PLUGIN #define USE_LIBSEXY #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "1496" +#define PACKAGE_VERSION "1496-2" #define XCHAT_RELEASE "2.8.8" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." -- cgit 1.4.1 From 2e5752863f425118934675ede36396ad7d6be915 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Sun, 5 Jun 2011 06:20:27 +0200 Subject: bump version number part 2 --- build/xchat-wdk.skel.iss | 8 ++++---- config.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'build') diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss index 8914e628..31617542 100644 --- a/build/xchat-wdk.skel.iss +++ b/build/xchat-wdk.skel.iss @@ -1,8 +1,8 @@ AppName=XChat-WDK -AppVerName=XChat-WDK 1496-2 -AppVersion=14.96.2 -VersionInfoVersion=14.96.2 -OutputBaseFilename=XChat-WDK 1496-2 +AppVerName=XChat-WDK 1496-3 +AppVersion=14.96.3 +VersionInfoVersion=14.96.3 +OutputBaseFilename=XChat-WDK 1496-3 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 63b5ccfd..dd667777 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ #define USE_PLUGIN #define USE_LIBSEXY #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "1496-2" +#define PACKAGE_VERSION "1496-3" #define XCHAT_RELEASE "2.8.8" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." -- cgit 1.4.1 From 70f870fc961e9594ac41707e944b5bf364164c43 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 27 Jul 2011 04:51:28 +0200 Subject: remove perl 5.10, migrate 5.12 to strawberry --- build/build-x64.bat | 6 +----- build/build-x86.bat | 6 +----- build/release-x64.bat | 1 - build/release-x86.bat | 1 - build/xchat-wdk.skel.iss | 4 ---- plugins/perl/makefile-510.mak | 30 ------------------------------ src/makeinc.skel.mak | 8 ++------ 7 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 plugins/perl/makefile-510.mak (limited to 'build') diff --git a/build/build-x64.bat b/build/build-x64.bat index 5375809e..29db6400 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -1,6 +1,5 @@ @echo off -set PERL_510=c:\mozilla-build\perl-5.10-x64 -set PERL_512=c:\mozilla-build\perl-5.12-x64 +set PERL_512=c:\mozilla-build\perl-5.12-x64\perl set PERL_514=c:\mozilla-build\perl-5.14-x64 cd .. set DEV_64=%cd%\dep-x64 @@ -25,9 +24,6 @@ nmake /nologo /f makefile.mak clean nmake /nologo /f makefile.mak cd perl set OOPATH=%PATH% -set PATH=%OOPATH%;%PERL_510%\bin -nmake /nologo /s /f makefile-510.mak clean -nmake /nologo /s /f makefile-510.mak set PATH=%OOPATH%;%PERL_512%\bin nmake /nologo /s /f makefile-512.mak clean nmake /nologo /s /f makefile-512.mak diff --git a/build/build-x86.bat b/build/build-x86.bat index b8ee8052..c2df1c25 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -1,6 +1,5 @@ @echo off -set PERL_510=c:\mozilla-build\perl-5.10-x86 -set PERL_512=c:\mozilla-build\perl-5.12-x86 +set PERL_512=c:\mozilla-build\perl-5.12-x86\perl set PERL_514=c:\mozilla-build\perl-5.14-x86 echo [Setup] > xchat-wdk.iss echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk.iss @@ -26,9 +25,6 @@ nmake /nologo /f makefile.mak clean nmake /nologo /f makefile.mak cd perl set OOPATH=%PATH% -set PATH=%OOPATH%;%PERL_510%\bin -nmake /nologo /s /f makefile-510.mak clean -nmake /nologo /s /f makefile-510.mak set PATH=%OOPATH%;%PERL_512%\bin nmake /nologo /s /f makefile-512.mak clean nmake /nologo /s /f makefile-512.mak diff --git a/build/release-x64.bat b/build/release-x64.bat index 50ae1e64..e22043e9 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -34,7 +34,6 @@ copy %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\lib copy ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\xcchecksum.dll.x64 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64 copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins\xcmpcinfo.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 copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins\xcperl-514.dll.x64 copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\xcpython.dll.x64 diff --git a/build/release-x86.bat b/build/release-x86.bat index 05ad7df5..b61bdbea 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -46,7 +46,6 @@ xcopy /q /s /i %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\e xcopy /q /s /i ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\ copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins -copy ..\plugins\perl\xcperl-510.dll %XCHAT_DEST%\plugins copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins diff --git a/build/xchat-wdk.skel.iss b/build/xchat-wdk.skel.iss index 31617542..f0c0c8ad 100644 --- a/build/xchat-wdk.skel.iss +++ b/build/xchat-wdk.skel.iss @@ -55,7 +55,6 @@ Name: "langs\tcl"; Description: "Tcl"; Types: full custom; Flags: disablenounins Name: x86; Description: "x86"; GroupDescription: "XChat-WDK version:"; Flags: exclusive unchecked Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: exclusive; Check: Is64BitInstallMode -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 Name: perl514; Description: "5.14"; GroupDescription: "Perl version:"; Flags: exclusive unchecked; Components: langs\perl @@ -223,9 +222,6 @@ Source: "plugins\xctcl.dll.x64"; DestDir: "{app}\plugins"; DestName: "xctcl.dll" -Source: "plugins\xcperl-510.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x86 and perl510 -Source: "plugins\xcperl-510.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x64 and perl510 - Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x86 and perl512 Source: "plugins\xcperl-512.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: langs\perl; Tasks: x64 and perl512 diff --git a/plugins/perl/makefile-510.mak b/plugins/perl/makefile-510.mak deleted file mode 100644 index 60f6b2dc..00000000 --- a/plugins/perl/makefile-510.mak +++ /dev/null @@ -1,30 +0,0 @@ -include "..\..\src\makeinc.mak" - -DIRENTLIB = ..\..\src\common\dirent.lib -TARGET = $(PERL510OUTPUT) - -all: $(TARGET) - -perl.def: - echo EXPORTS > perl.def - echo xchat_plugin_init >> perl.def - echo xchat_plugin_deinit >> perl.def - echo xchat_plugin_get_info >> perl.def - -perl.obj: perl.c - $(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL510PATH) /I.. /DPERL_DLL=\"$(PERL510LIB).dll\" - -perl.c: xchat.pm.h - -xchat.pm.h: lib/Xchat.pm lib/IRC.pm - perl.exe generate_header - -$(TARGET): perl.obj perl.def - $(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERL510LIB).lib /libpath:$(PERL510PATH) /DELAYLOAD:$(PERL510LIB).dll $(DIRENTLIB) DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def - -clean: - @del $(TARGET) - @del *.obj - @del perl.def - @del *.lib - @del *.exp diff --git a/src/makeinc.skel.mak b/src/makeinc.skel.mak index f7bbeeb7..5c6beb6f 100644 --- a/src/makeinc.skel.mak +++ b/src/makeinc.skel.mak @@ -14,8 +14,6 @@ LIBS = $(LIBS) /libpath:$(DEV)\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.l LUALIB = lua51 LUAOUTPUT = xclua.dll -PERL510LIB = perl510 -PERL510OUTPUT = xcperl-510.dll PERL512LIB = perl512 PERL512OUTPUT = xcperl-512.dll PERL514LIB = perl514 @@ -32,16 +30,14 @@ CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64 CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj -PERL510PATH = c:\mozilla-build\perl-5.10-x64\lib\CORE -PERL512PATH = c:\mozilla-build\perl-5.12-x64\lib\CORE +PERL512PATH = c:\mozilla-build\perl-5.12-x64\perl\lib\CORE PERL514PATH = c:\mozilla-build\perl-5.14-x64\lib\CORE PYTHONPATH = c:\mozilla-build\python-2.7-x64 TCLPATH = c:\mozilla-build\tcl-8.5-x64 !else LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj -PERL510PATH = c:\mozilla-build\perl-5.10-x86\lib\CORE -PERL512PATH = c:\mozilla-build\perl-5.12-x86\lib\CORE +PERL512PATH = c:\mozilla-build\perl-5.12-x86\perl\lib\CORE PERL514PATH = c:\mozilla-build\perl-5.14-x86\lib\CORE PYTHONPATH = c:\mozilla-build\python-2.7-x86 TCLPATH = c:\mozilla-build\tcl-8.5-x86 -- cgit 1.4.1 From f9c88e2df0c34de85208c00af170f502f1d63be3 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 27 Jul 2011 07:14:34 +0200 Subject: add script for compressing binaries --- build/build.bat | 1 + build/compress.bat | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 build/compress.bat (limited to 'build') diff --git a/build/build.bat b/build/build.bat index 2190210a..a087c364 100644 --- a/build/build.bat +++ b/build/build.bat @@ -2,6 +2,7 @@ set WDK_ROOT=c:\WinDDK\7600.16385.1 call build-x86.bat call build-x64.bat +call compress.bat set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 compil32 /cc xchat-wdk.iss pause diff --git a/build/compress.bat b/build/compress.bat new file mode 100644 index 00000000..37df1292 --- /dev/null +++ b/build/compress.bat @@ -0,0 +1,19 @@ +@echo off +set OPATH=%PATH% +set PATH=c:\mozilla-build\mpress;c:\mozilla-build\upx +cd ..\tmp +for %%A in (*.dll) do upx -9 -q %%A +for %%A in (*.x64) do mpress -q %%A +upx xchat.exe +cd lib\enchant +for %%A in (*.dll) do upx -9 -q %%A +for %%A in (*.x64) do mpress -q %%A +:: gtk-2.0\2.10.0\engines is already packed, skip it +cd ..\gtk-2.0\modules +for %%A in (*.dll) do upx -9 -q %%A +for %%A in (*.x64) do mpress -q %%A +cd ..\..\..\plugins +for %%A in (*.dll) do upx -9 -q %%A +for %%A in (*.x64) do mpress -q %%A +cd ..\..\build +set PATH=%OPATH% -- cgit 1.4.1 From 8cbdb0b58d6c6cdf9771939121bab060e75adf9e Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 27 Jul 2011 07:22:17 +0200 Subject: binary compression won't reduce installer size, so save this for other purposes --- build/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') diff --git a/build/build.bat b/build/build.bat index a087c364..363205c0 100644 --- a/build/build.bat +++ b/build/build.bat @@ -2,7 +2,7 @@ set WDK_ROOT=c:\WinDDK\7600.16385.1 call build-x86.bat call build-x64.bat -call compress.bat +::call compress.bat set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 compil32 /cc xchat-wdk.iss pause -- cgit 1.4.1