From 8e8f77d8700a171a59f88e0fd996e5be4401d065 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Thu, 19 Aug 2010 00:25:00 +0200 Subject: [PATCH] installer support for portable mode --- build/release-x64.bat | 4 ++-- build/release-x86.bat | 4 ++-- build/xchat-wdk-x64.iss | 16 +++++++--------- build/xchat-wdk-x86.iss | 16 +++++++--------- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/build/release-x64.bat b/build/release-x64.bat index 333c761f..bad1d5e8 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -45,5 +45,5 @@ xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\ xcopy %LUA_BIN%\lua51.dll %XCHAT_DEST% xcopy /S /I /Q ..\po\locale %XCHAT_DEST%\locale xcopy /S /I /Q %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale -echo 2> portable-build -move portable-build %XCHAT_DEST% +echo 2> portable-mode +move portable-mode %XCHAT_DEST% diff --git a/build/release-x86.bat b/build/release-x86.bat index a8c19d1f..337328be 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -45,5 +45,5 @@ xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\ xcopy %LUA_BIN%\lua51.dll %XCHAT_DEST% xcopy /S /I /Q ..\po\locale %XCHAT_DEST%\locale xcopy /S /I /Q %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale -echo 2> portable-build -move portable-build %XCHAT_DEST% +echo 2> portable-mode +move portable-mode %XCHAT_DEST% diff --git a/build/xchat-wdk-x64.iss b/build/xchat-wdk-x64.iss index b72a954e..51f5eed8 100644 --- a/build/xchat-wdk-x64.iss +++ b/build/xchat-wdk-x64.iss @@ -1,9 +1,9 @@ [Setup] AppName=XChat-WDK (x64) -AppVerName=XChat WDK (x64) r1457 -AppVersion=14.57 -VersionInfoVersion=14.57 -OutputBaseFilename=XChat-WDK r1457 x64 +AppVerName=XChat WDK (x64) r1459 +AppVersion=14.59 +VersionInfoVersion=14.59 +OutputBaseFilename=XChat-WDK r1459 x64 AppPublisher=XChat-WDK AppPublisherURL=http://code.google.com/p/xchat-wdk/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny @@ -16,10 +16,10 @@ UninstallDisplayIcon={app}\xchat.exe UninstallDisplayName=XChat-WDK (x64) DefaultDirName={pf}\XChat-WDK DefaultGroupName=XChat-WDK +DisableProgramGroupPage=yes SolidCompression=yes SourceDir=..\..\xchat-wdk-x64 OutputDir=. -AllowNoIcons=yes FlatComponentsList=no PrivilegesRequired=none CreateUninstallRegKey=not IsTaskSelected('portablemode') @@ -34,8 +34,6 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom [Components] Name: "libs"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed -;Name: "xchatstandard"; Description: "XChat Standard"; Types: normal full custom -;Name: "xchatportable"; Description: "XChat Portable"; Types: full custom Name: "translations"; Description: "Translations"; Types: normal full custom Name: "plugins"; Description: "Language Interfaces"; Types: full custom Name: "plugins\lua"; Description: "Lua (experimental)"; Types: full custom @@ -93,8 +91,8 @@ Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubd Source: "share\*"; DestDir: "{app}\share"; Flags: createallsubdirs recursesubdirs; Components: translations [Icons] -Name: "{group}\XChat-WDK (x64)"; Filename: "{app}\xchat.exe" -Name: "{group}\Uninstall XChat-WDK (x64)"; Filename: "{uninstallexe}"; +Name: "{group}\XChat-WDK (x64)"; Filename: "{app}\xchat.exe"; Tasks: not portablemode +Name: "{group}\Uninstall XChat-WDK (x64)"; Filename: "{uninstallexe}"; Tasks: not portablemode [Messages] BeveledLabel= XChat-WDK (x64) diff --git a/build/xchat-wdk-x86.iss b/build/xchat-wdk-x86.iss index 64367316..82058213 100644 --- a/build/xchat-wdk-x86.iss +++ b/build/xchat-wdk-x86.iss @@ -1,9 +1,9 @@ [Setup] AppName=XChat-WDK (x86) -AppVerName=XChat WDK (x86) r1457 -AppVersion=14.57 -VersionInfoVersion=14.57 -OutputBaseFilename=XChat-WDK r1457 x86 +AppVerName=XChat WDK (x86) r1459 +AppVersion=14.59 +VersionInfoVersion=14.59 +OutputBaseFilename=XChat-WDK r1459 x86 AppPublisher=XChat-WDK AppPublisherURL=http://code.google.com/p/xchat-wdk/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny @@ -16,10 +16,10 @@ UninstallDisplayIcon={app}\xchat.exe UninstallDisplayName=XChat-WDK (x86) DefaultDirName={pf}\XChat-WDK DefaultGroupName=XChat-WDK +DisableProgramGroupPage=yes SolidCompression=yes SourceDir=..\..\xchat-wdk-x86 OutputDir=. -AllowNoIcons=yes FlatComponentsList=no PrivilegesRequired=none CreateUninstallRegKey=not IsTaskSelected('portablemode') @@ -33,8 +33,6 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom [Components] Name: "libs"; Description: "XChat-WDK"; Types: normal full custom; Flags: fixed -;Name: "xchatstandard"; Description: "XChat Standard"; Types: normal full custom -;Name: "xchatportable"; Description: "XChat Portable"; Types: full custom Name: "translations"; Description: "Translations"; Types: normal full custom Name: "plugins"; Description: "Language Interfaces"; Types: full custom Name: "plugins\lua"; Description: "Lua (experimental)"; Types: full custom @@ -92,8 +90,8 @@ Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubd Source: "share\*"; DestDir: "{app}\share"; Flags: createallsubdirs recursesubdirs; Components: translations [Icons] -Name: "{group}\XChat-WDK (x86)"; Filename: "{app}\xchat.exe" -Name: "{group}\Uninstall XChat-WDK (x86)"; Filename: "{uninstallexe}"; +Name: "{group}\XChat-WDK (x86)"; Filename: "{app}\xchat.exe"; Tasks: not portablemode +Name: "{group}\Uninstall XChat-WDK (x86)"; Filename: "{uninstallexe}"; Tasks: not portablemode [Messages] BeveledLabel= XChat-WDK (x86)