Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #11 from cycocrew/master

Multiple fixes to allow help integration in Delphi XE5
  • Loading branch information...
commit 8b9cd7bbb56b001e1f227e43c3d98b840c8de6b8 2 parents c6cba78 + f384053
@obones obones authored
View
4 help/Strings.dtx
@@ -2108,7 +2108,9 @@ Parameters:
List - A TStrings derivative that receives the individual elements.
S - The string to split into elements.
Sep - The string that separates the individual elements.
+ AllowEmptyString - Specifies whether empty strings can be added to the list or not.
See also:
+ StrIToStrings
StringsToStr
Donator:
Anthony Steele
@@ -2718,7 +2720,7 @@ Parameters:
List - A TStrings derivative that receives the individual elements.
AllowEmptyString - Specifies whether empty strings can be added to the list or not.
See also:
- StrToStrings
+ StrToStrings
Donator:
Anthony Steele
--------------------------------------------------------------------------------
View
261 help/SysInfo.dtx
@@ -502,6 +502,7 @@ See also:
GetWindowsVersion
Donator:
Marcel van Brakel
+ Jean-Fabien Connault
@@TWindowsVersion.wvUnknown
Anonymous Windows version. This can happen when a new Windows version is released
after JCL or if you are running a Windows version with a different build number
@@ -540,6 +541,18 @@ Donator:
Windows 7
@@TWindowsVersion.wvWinServer2008R2
Windows Server 2008 R2
+@@TWindowsVersion.wvWin8
+ Windows 8
+@@TWindowsVersion.wvWin8RT
+ Windows RT
+@@TWindowsVersion.wvWinServer2012
+ Windows Server 2012
+@@TWindowsVersion.wvWin81
+ Windows 8.1
+@@TWindowsVersion.wvWin81RT
+ Windows RT 8.1
+@@TWindowsVersion.wvWinServer2012R2
+ Windows Server 2012 R2
--------------------------------------------------------------------------------
@@TWindowsEdition
<GROUP SystemInformationRoutines.VersionInformation>
@@ -604,6 +617,22 @@ Donator:
Windows 7 Enterprise
@@TWindowsEdition.weWin7Ultimate
Windows 7 Ultimate
+@@TWindowsEdition.weWin8
+ Windows 8
+@@TWindowsEdition.weWin8Professional
+ Windows 8 Professional
+@@TWindowsEdition.weWin8Enterprise
+ Windows 8 Enterprise
+@@TWindowsEdition.weWin8RT
+ Windows RT
+@@TWindowsEdition.weWin81
+ Windows 8.1
+@@TWindowsEdition.weWin81Professional
+ Windows 8.1 Professional
+@@TWindowsEdition.weWin81Enterprise
+ Windows 8.1 Enterprise
+@@TWindowsEdition.weWin81RT
+ Windows RT 8.1
--------------------------------------------------------------------------------
@@GetWindowsVersion
<GROUP SystemInformationRoutines.VersionInformation>
@@ -633,8 +662,13 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Marcel van Brakel
+ Jean-Fabien Connault
--------------------------------------------------------------------------------
@@GetWindowsEdition
<GROUP SystemInformationRoutines.VersionInformation>
@@ -722,6 +756,17 @@ See also:
Donator:
Jean-Fabien Connault
--------------------------------------------------------------------------------
+@@GetWindowsBuildNumber
+<GROUP SystemInformationRoutines.VersionInformation>
+Summary:
+ Returns the Windows build number.
+Description:
+ Returns the Windows build number.
+Result:
+ The Windows build number.
+Donator:
+ Jean-Fabien Connault
+--------------------------------------------------------------------------------
@@GetWindowsServicePackVersion
<GROUP SystemInformationRoutines.VersionInformation>
Summary:
@@ -1314,6 +1359,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1344,6 +1393,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1374,6 +1427,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1404,6 +1461,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1434,6 +1495,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1467,6 +1532,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1497,6 +1566,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1527,6 +1600,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1557,6 +1634,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1587,6 +1668,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1617,6 +1702,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Nick Hodges
--------------------------------------------------------------------------------
@@ -1647,6 +1736,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Marcel van Brakel
--------------------------------------------------------------------------------
@@ -1677,6 +1770,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Petr Vones
--------------------------------------------------------------------------------
@@ -1707,6 +1804,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Petr Vones
--------------------------------------------------------------------------------
@@ -1737,6 +1838,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Petr Vones
--------------------------------------------------------------------------------
@@ -1767,6 +1872,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Florent Ouchet
--------------------------------------------------------------------------------
@@ -1775,7 +1884,7 @@ Donator:
Summary:
Returns whether the system is running Windows 7.
Description:
- IsWinVista returns whether or not the system is running Windows 7.
+ IsWin7 returns whether or not the system is running Windows 7.
Result:
If the system is running Windows 7 the result is True otherwise the result is False.
See also:
@@ -1797,6 +1906,10 @@ See also:
IsWinVista
IsWinServer2008
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Jean-Fabien Connault
--------------------------------------------------------------------------------
@@ -1827,6 +1940,10 @@ See also:
IsWinVista
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Florent Ouchet
--------------------------------------------------------------------------------
@@ -1835,7 +1952,7 @@ Donator:
Summary:
Returns whether the system is running Windows Server 2008 R2.
Description:
- IsWinServer2008 returns whether or not the system is running Windows Server 2008 R2.
+ IsWinServer2008R2 returns whether or not the system is running Windows Server 2008 R2.
Result:
If the system is running Windows Server 2008 R2 the result is True otherwise the result is False.
See also:
@@ -1857,6 +1974,142 @@ See also:
IsWinVista
IsWin7
IsWinServer2008
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
+Donator:
+ Jean-Fabien Connault
+--------------------------------------------------------------------------------
+@@IsWin8
+<GROUP SystemInformationRoutines.VersionInformation>
+Summary:
+ Returns whether the system is running Windows 8.
+Description:
+ IsWin8 returns whether or not the system is running Windows 8.
+Result:
+ If the system is running Windows 8 the result is True otherwise the result is False.
+See also:
+ IsWin95
+ IsWin95OSR2
+ IsWin98
+ IsWin98SE
+ IsWinME
+ IsWinNT
+ IsWinNT3
+ IsWinNT31
+ IsWinNT35
+ IsWinNT351
+ IsWinNT4
+ IsWin2K
+ IsWinXP
+ IsWin2003
+ IsWin2003R2
+ IsWinVista
+ IsWinServer2008
+ IsWinServer2008R2
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
+Donator:
+ Jean-Fabien Connault
+--------------------------------------------------------------------------------
+@@IsWinServer2012
+<GROUP SystemInformationRoutines.VersionInformation>
+Summary:
+ Returns whether the system is running Windows Server 2008.
+Description:
+ IsWinServer2012 returns whether or not the system is running Windows Server 2012.
+Result:
+ If the system is running Windows Server 2012 the result is True otherwise the result is False.
+See also:
+ IsWin95
+ IsWin95OSR2
+ IsWin98
+ IsWin98SE
+ IsWinME
+ IsWinNT
+ IsWinNT3
+ IsWinNT31
+ IsWinNT35
+ IsWinNT351
+ IsWinNT4
+ IsWin2K
+ IsWinXP
+ IsWin2003
+ IsWin2003R2
+ IsWinVista
+ IsWin7
+ IsWinServer2008R2
+ IsWin8
+ IsWin81
+ IsWinServer2012R2
+Donator:
+ Jean-Fabien Connault
+--------------------------------------------------------------------------------
+@@IsWin81
+<GROUP SystemInformationRoutines.VersionInformation>
+Summary:
+ Returns whether the system is running Windows 8.1.
+Description:
+ IsWin81 returns whether or not the system is running Windows 8.1.
+Result:
+ If the system is running Windows 8.1 the result is True otherwise the result is False.
+See also:
+ IsWin95
+ IsWin95OSR2
+ IsWin98
+ IsWin98SE
+ IsWinME
+ IsWinNT
+ IsWinNT3
+ IsWinNT31
+ IsWinNT35
+ IsWinNT351
+ IsWinNT4
+ IsWin2K
+ IsWinXP
+ IsWin2003
+ IsWin2003R2
+ IsWinVista
+ IsWinServer2008
+ IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWinServer2012R2
+Donator:
+ Jean-Fabien Connault
+--------------------------------------------------------------------------------
+@@IsWinServer2012R2
+<GROUP SystemInformationRoutines.VersionInformation>
+Summary:
+ Returns whether the system is running Windows Server 2012 R2.
+Description:
+ IsWinServer2012R2 returns whether or not the system is running Windows Server 2012 R2.
+Result:
+ If the system is running Windows Server 2012 R2 the result is True otherwise the result is False.
+See also:
+ IsWin95
+ IsWin95OSR2
+ IsWin98
+ IsWin98SE
+ IsWinME
+ IsWinNT
+ IsWinNT3
+ IsWinNT31
+ IsWinNT35
+ IsWinNT351
+ IsWinNT4
+ IsWin2K
+ IsWinXP
+ IsWin2003
+ IsWin2003R2
+ IsWinVista
+ IsWin7
+ IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
Donator:
Jean-Fabien Connault
--------------------------------------------------------------------------------
@@ -1899,6 +2152,10 @@ See also:
IsWinServer2008
IsWin7
IsWinServer2008R2
+ IsWin8
+ IsWinServer2012
+ IsWin81
+ IsWinServer2012R2
Donator:
Marcel van Brakel
Contributors:
View
11 jcl/install/JclInstall.pas
@@ -16,9 +16,9 @@
{ Copyright (C) of Petr Vones. All Rights Reserved. }
{ }
{ Contributor(s): }
-{ - Robert Rossmair - crossplatform & BCB support, refactoring }
-{ - Florent Ouchet (outchy) - New installer core }
-{ - Resource refactorings }
+{ Robert Rossmair - crossplatform & BCB support, refactoring }
+{ Florent Ouchet (outchy) - New installer core, resource refactorings }
+{ Jean-Fabien Connault (cycocrew) }
{ }
{**************************************************************************************************}
{ }
@@ -3716,8 +3716,9 @@ function TJclDistribution.RegHelpExecuteCommands(DisplayErrors: Boolean): Boolea
if Assigned(GUI) and not IsElevated then
GUI.Dialog(LoadResString(@RsHTMLHelp2Credentials), dtInformation, [drOK]);
- // RegHelper.exe manifest requires elevation on Vista
- if IsAdministrator or IsWinVista or IsWinServer2008 or IsWin7 or IsWinServer2008R2 then
+ // RegHelper.exe manifest requires elevation on Windows Vista/7/8/8.1 and Windows Server 2008/2008R2/2012/2012R2
+ if IsAdministrator or IsWinVista or IsWinServer2008 or IsWin7 or IsWinServer2008R2 or
+ IsWin8 or IsWinServer2012 or IsWin81 or IsWinServer2012R2 then
Verb := 'open'
else
Verb := 'runas';
View
8 jcl/install/JclInstallResources.pas
@@ -16,9 +16,9 @@
{ Copyright (C) of Petr Vones. All Rights Reserved. }
{ }
{ Contributor(s): }
-{ - Robert Rossmair - crossplatform & BCB support, refactoring }
-{ - Florent Ouchet (outchy) - New installer core }
-{ - Resource refactorings }
+{ Robert Rossmair - crossplatform & BCB support, refactoring }
+{ Florent Ouchet (outchy) - New installer core, resource refactorings }
+{ Jean-Fabien Connault (cycocrew) }
{ }
{**************************************************************************************************}
{ }
@@ -162,7 +162,7 @@ interface
RsCaptionHelpHlp = 'Add help file to IDE help system';
RsCaptionHelpChm = 'Add HTML help to the Tools menu';
RsCaptionHelpHxS = 'Register help 2.0 files';
- RsCaptionHelpHxSPlugin = 'Plug help 2.0 files in the Borland help system';
+ RsCaptionHelpHxSPlugin = 'Plug help 2.0 files in the Embarcadero help system';
// demos
RsCaptionMakeDemos = 'Make demos';
View
5 jcl/install/RegHelper.dpr
@@ -16,6 +16,7 @@
{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All Rights Reserved. }
{ }
{ Contributor(s): }
+{ Jean-Fabien Connault (cycocrew) }
{ }
{**************************************************************************************************}
{ }
@@ -181,7 +182,7 @@ var
procedure DisplayCopyright;
begin
WriteLn(RegHelperOutput,'HTML Help 2.0 registration helper');
- WriteLn(RegHelperOutput,'Copyright (c) 2007 Project JEDI');
+ WriteLn(RegHelperOutput,'Copyright (c) 2007-2013 Project JEDI');
WriteLn(RegHelperOutput,'');
end;
@@ -258,7 +259,7 @@ function ParseArguments: Boolean;
end
else
begin
- WriteLn(RegHelperOutput,'Error: Number of parameter is invalid for command: ', Argument);
+ WriteLn(RegHelperOutput, 'Error: Number of parameters (' + intToStr(ParamCount) + ' found instead of ' + intToStr(CommandRecs[IndexCommand].ParamCount) + ' expected) is invalid for command: ', Argument);
Result := False;
Exit;
end;
View
8 jcl/source/common/JclAnsiStrings.pas
@@ -3485,8 +3485,8 @@ procedure StrToStrings(S, Sep: AnsiString; const List: TJclAnsiStrings; const Al
Delete(S, 1, I + L - 1);
I := Pos(Sep, S);
end;
- if S <> '' then
- List.Add(S); // Ignore empty strings at the end.
+ if (S <> '') or AllowEmptyString then
+ List.Add(S); // Ignore empty strings at the end (only if AllowEmptyString = False).
finally
List.EndUpdate;
end;
@@ -3515,8 +3515,8 @@ procedure StrIToStrings(S, Sep: AnsiString; const List: TJclAnsiStrings; const A
Delete(LowerCaseStr, 1, I + L - 1);
I := Pos(Sep, LowerCaseStr);
end;
- if S <> '' then
- List.Add(S); // Ignore empty strings at the end.
+ if (S <> '') or AllowEmptyString then
+ List.Add(S); // Ignore empty strings at the end (only if AllowEmptyString = False).
finally
List.EndUpdate;
end;
View
18 jcl/source/common/JclSysUtils.pas
@@ -3562,7 +3562,7 @@ procedure ListAddItems(var List: string; const Separator, Items: string);
begin
StrList := TStringList.Create;
try
- StrToStrings(List, Separator, StrList);
+ StrToStrings(List, Separator, StrList, False);
NewItems := TStringList.Create;
try
@@ -3589,7 +3589,7 @@ procedure ListIncludeItems(var List: string; const Separator, Items: string);
begin
StrList := TStringList.Create;
try
- StrToStrings(List, Separator, StrList);
+ StrToStrings(List, Separator, StrList, False);
NewItems := TStringList.Create;
try
@@ -3620,11 +3620,11 @@ procedure ListRemoveItems(var List: string; const Separator, Items: string);
begin
StrList := TStringList.Create;
try
- StrToStrings(List, Separator, StrList);
+ StrToStrings(List, Separator, StrList, False);
RemItems := TStringList.Create;
try
- StrToStrings(Items, Separator, RemItems);
+ StrToStrings(Items, Separator, RemItems, False);
for Index := 0 to RemItems.Count - 1 do
begin
@@ -3652,7 +3652,7 @@ procedure ListDelItem(var List: string; const Separator: string; const Index: In
begin
StrList := TStringList.Create;
try
- StrToStrings(List, Separator, StrList);
+ StrToStrings(List, Separator, StrList, False);
StrList.Delete(Index);
@@ -3669,7 +3669,7 @@ function ListItemCount(const List, Separator: string): Integer;
begin
StrList := TStringList.Create;
try
- StrToStrings(List, Separator, StrList);
+ StrToStrings(List, Separator, StrList, False);
Result := StrList.Count;
finally
@@ -3684,7 +3684,7 @@ function ListGetItem(const List, Separator: string; const Index: Integer): strin
begin
StrList := TStringList.Create;
try
- StrToStrings(List, Separator, StrList);
+ StrToStrings(List, Separator, StrList, False);
Result := StrList.Strings[Index];
finally
@@ -3700,7 +3700,7 @@ procedure ListSetItem(var List: string; const Separator: string;
begin
StrList := TStringList.Create;
try
- StrToStrings(List, Separator, StrList);
+ StrToStrings(List, Separator, StrList, False);
StrList.Strings[Index] := Value;
@@ -3717,7 +3717,7 @@ function ListItemIndex(const List, Separator, Item: string): Integer;
begin
StrList := TStringList.Create;
try
- StrToStrings(List, Separator, StrList);
+ StrToStrings(List, Separator, StrList, False);
Result := StrList.IndexOf(Item);
finally
View
8 jcl/source/windows/JclHelpUtils.pas
@@ -119,7 +119,7 @@ TJclHelp2Manager = class
RCSfile: '$URL$';
Revision: '$Revision$';
Date: '$Date$';
- LogPath: 'JCL\source\windows';
+ LogPath: 'jcl\source\windows';
Extra: '';
Data: nil
);
@@ -314,6 +314,12 @@ constructor TJclHelp2Manager.Create(IDEVersionNumber: Integer);
FHxPlugin := nil;
if IDEVersionNumber > 0 then
begin
+ if (IDEVersionNumber = 12) then
+ FIdeNameSpace := 'embarcadero.rs_xe5'
+ else
+ if (IDEVersionNumber = 11) then
+ FIdeNameSpace := 'embarcadero.rs_xe4'
+ else
if (IDEVersionNumber = 10) then
FIdeNameSpace := 'embarcadero.rs_xe3'
else
Please sign in to comment.
Something went wrong with that request. Please try again.