From c2f462f6ae2e12a449183290fdf0e36ab25f08a5 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Thu, 12 Aug 2010 14:53:45 +0200 Subject: [PATCH] add lua-wdk to the installer --- build/release-x64.bat | 2 ++ build/release-x86.bat | 2 ++ build/xchat-wdk-x64.iss | 16 ++++++++++------ build/xchat-wdk-x86.iss | 16 ++++++++++------ config.h | 2 +- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/build/release-x64.bat b/build/release-x64.bat index ef8d53e2..5ae5645e 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -1,6 +1,7 @@ @echo off set GTK_BIN=c:\mozilla-build\build\xchat-dev64\bin set SSL_BIN=c:\mozilla-build\build\openssl-1.0.0a-wdk-x64\bin +set LUA_BIN=c:\mozilla-build\build\lua-5.1.4-2-wdk-x64 set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x64 rmdir /Q /S %XCHAT_DEST% mkdir %XCHAT_DEST% @@ -43,3 +44,4 @@ xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\ ::xcopy /S /I ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\po\locale %XCHAT_DEST%\locale xcopy /S /I %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale +xcopy %LUA_BIN%\lua51.dll %XCHAT_DEST% diff --git a/build/release-x86.bat b/build/release-x86.bat index 6d4383eb..e54e7b38 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -1,6 +1,7 @@ @echo off set GTK_BIN=c:\mozilla-build\build\xchat-dev32\bin set SSL_BIN=c:\mozilla-build\build\openssl-1.0.0a-wdk-x86\bin +set LUA_BIN=c:\mozilla-build\build\lua-5.1.4-2-wdk-x86 set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x86 rmdir /Q /S %XCHAT_DEST% mkdir %XCHAT_DEST% @@ -43,3 +44,4 @@ xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\ ::xcopy /S /I ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\po\locale %XCHAT_DEST%\locale xcopy /S /I %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale +xcopy %LUA_BIN%\lua51.dll %XCHAT_DEST% diff --git a/build/xchat-wdk-x64.iss b/build/xchat-wdk-x64.iss index 79cf7e66..f57c721c 100644 --- a/build/xchat-wdk-x64.iss +++ b/build/xchat-wdk-x64.iss @@ -1,8 +1,8 @@ [Setup] AppName=XChat-WDK (x64) -AppVerName=XChat WDK (x64) r1451-5 -AppVersion=14.51.5 -VersionInfoVersion=14.51.5 +AppVerName=XChat WDK (x64) r1451-6 +AppVersion=14.51.6 +VersionInfoVersion=14.51.6 AppPublisher=XChat-WDK AppPublisherURL=http://code.google.com/p/xchat-wdk/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny @@ -18,11 +18,10 @@ DefaultGroupName=XChat-WDK SolidCompression=yes SourceDir=..\..\xchat-wdk-x64 OutputDir=. -OutputBaseFilename=XChat-WDK r1451-5 x64 +OutputBaseFilename=XChat-WDK r1451-6 x64 FlatComponentsList=no ArchitecturesAllowed=x64 ArchitecturesInstallIn64BitMode=x64 -;msiexec /quiet /uninstall {06DADCF2-6A1D-482D-94D7-6253300D1328} [Types] Name: "normal"; Description: "Normal Installation" @@ -33,7 +32,8 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom Name: "xchat"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed Name: "translations"; Description: "Translations"; Types: normal full custom Name: "plugins"; Description: "Language Interfaces"; Types: full custom -Name: "plugins\lua"; Description: "Lua (experimental; needs Lua-WDK 5.1.4)"; Types: full custom +Name: "plugins\lua"; Description: "Lua (experimental)"; Types: full custom +Name: "plugins\lua\luawdk"; Description: "Lua-WDK 5.1.4-2"; Types: full custom Name: "plugins\perl"; Description: "Perl (needs ActivePerl 5.10)"; Types: full custom Name: "plugins\python"; Description: "Python (needs ActivePython 2.6)"; Types: full custom Name: "plugins\tcl"; Description: "Tcl (needs ActiveTcl 8.5)"; Types: full custom @@ -41,6 +41,9 @@ Name: "plugins\tcl"; Description: "Tcl (needs ActiveTcl 8.5)"; Types: full custo [Tasks] Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; Components: xchat; Flags: unchecked +[Registry] +Root: HKCU; Subkey: "Environment"; ValueType: string; ValueName: "XCHAT_WARNING_IGNORE"; ValueData: "true"; Flags: uninsdeletevalue + [Files] Source: "COPYING"; DestDir: "{app}"; Components: xchat Source: "libfreetype-6.dll"; DestDir: "{app}"; Components: xchat @@ -73,6 +76,7 @@ Source: "plugins\xcewc.dll"; DestDir: "{app}\plugins"; Components: xchat Source: "plugins\xcxdcc.dll"; DestDir: "{app}\plugins"; Components: xchat Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: plugins\lua +Source: "lua51.dll"; DestDir: "{app}"; Components: plugins\lua\luawdk Source: "plugins\xcperl.dll"; DestDir: "{app}\plugins"; Components: plugins\perl Source: "plugins\xcpython.dll"; DestDir: "{app}\plugins"; Components: plugins\python Source: "plugins\xctcl.dll"; DestDir: "{app}\plugins"; Components: plugins\tcl diff --git a/build/xchat-wdk-x86.iss b/build/xchat-wdk-x86.iss index 94b6a027..241e8cee 100644 --- a/build/xchat-wdk-x86.iss +++ b/build/xchat-wdk-x86.iss @@ -1,8 +1,8 @@ [Setup] AppName=XChat-WDK (x86) -AppVerName=XChat WDK (x86) r1451-5 -AppVersion=14.51.5 -VersionInfoVersion=14.51.5 +AppVerName=XChat WDK (x86) r1451-6 +AppVersion=14.51.6 +VersionInfoVersion=14.51.6 AppPublisher=XChat-WDK AppPublisherURL=http://code.google.com/p/xchat-wdk/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny @@ -18,10 +18,9 @@ DefaultGroupName=XChat-WDK SolidCompression=yes SourceDir=..\..\xchat-wdk-x86 OutputDir=. -OutputBaseFilename=XChat-WDK r1451-5 x86 +OutputBaseFilename=XChat-WDK r1451-6 x86 FlatComponentsList=no ArchitecturesAllowed=x86 x64 -;msiexec /quiet /uninstall {F61055AA-AED4-4AB9-8026-9D70B12ABA10} [Types] Name: "normal"; Description: "Normal Installation" @@ -32,7 +31,8 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom Name: "xchat"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed Name: "translations"; Description: "Translations"; Types: normal full custom Name: "plugins"; Description: "Language Interfaces"; Types: full custom -Name: "plugins\lua"; Description: "Lua (experimental; needs Lua-WDK 5.1.4)"; Types: full custom +Name: "plugins\lua"; Description: "Lua (experimental)"; Types: full custom +Name: "plugins\lua\luawdk"; Description: "Lua-WDK 5.1.4-2"; Types: full custom Name: "plugins\perl"; Description: "Perl (needs ActivePerl 5.10)"; Types: full custom Name: "plugins\python"; Description: "Python (needs ActivePython 2.6)"; Types: full custom Name: "plugins\tcl"; Description: "Tcl (needs ActiveTcl 8.5)"; Types: full custom @@ -40,6 +40,9 @@ Name: "plugins\tcl"; Description: "Tcl (needs ActiveTcl 8.5)"; Types: full custo [Tasks] Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; Components: xchat; Flags: unchecked +[Registry] +Root: HKCU; Subkey: "Environment"; ValueType: string; ValueName: "XCHAT_WARNING_IGNORE"; ValueData: "true"; Flags: uninsdeletevalue + [Files] Source: "COPYING"; DestDir: "{app}"; Components: xchat Source: "freetype6.dll"; DestDir: "{app}"; Components: xchat @@ -72,6 +75,7 @@ Source: "plugins\xcewc.dll"; DestDir: "{app}\plugins"; Components: xchat Source: "plugins\xcxdcc.dll"; DestDir: "{app}\plugins"; Components: xchat Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: plugins\lua +Source: "lua51.dll"; DestDir: "{app}"; Components: plugins\lua\luawdk Source: "plugins\xcperl.dll"; DestDir: "{app}\plugins"; Components: plugins\perl Source: "plugins\xcpython.dll"; DestDir: "{app}\plugins"; Components: plugins\python Source: "plugins\xctcl.dll"; DestDir: "{app}\plugins"; Components: plugins\tcl diff --git a/config.h b/config.h index 1016b891..ada5a1ed 100644 --- a/config.h +++ b/config.h @@ -3,7 +3,7 @@ #define USE_GMODULE #define USE_PLUGIN #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "r1451-5" +#define PACKAGE_VERSION "r1451-6" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." #define OLD_PERL