aksdb
/
CentrED
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

* Bumped version 

* Updated copyright
* Read copyright from resource
* Removed obsolete lines from version.inc
This commit is contained in:
Andreas Schneider 2012-01-07 17:23:07 +01:00
parent 811d91cc8a
commit aa37b1cf1d
12 changed files with 78 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Client/CentrED.lpi
View File

@ -18,12 +18,15 @@
<UseVersionInfo Value="True"/> <UseVersionInfo Value="True"/>
<MinorVersionNr Value="6"/> <MinorVersionNr Value="6"/>
<RevisionNr Value="2"/> <RevisionNr Value="2"/>
<BuildNr Value="223"/> <BuildNr Value="238"/>
<StringTable CompanyName="AKS DataBasis" ProductName="CentrED" InternalName="CentrED" LegalCopyright="Andreas Schneider" ProductVersion="0.6.2" FileDescription="UO CentrED" OriginalFilename="CentrED.exe"/> <StringTable CompanyName="AKS DataBasis" ProductName="CentrED" InternalName="CentrED" LegalCopyright="(c) 2012 Andreas Schneider" ProductVersion="0.6.2" FileDescription="UO CentrED" OriginalFilename="CentrED.exe"/>
</VersionInfo> </VersionInfo>
<BuildModes Count="3"> <BuildModes Count="3">
<Item1 Name="default" Default="True"/> <Item1 Name="default" Default="True"/>
<Item2 Name="Release Win32"> <Item2 Name="Release Win32">
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="win32"/>
</MacroValues>
<CompilerOptions> <CompilerOptions>
<Version Value="11"/> <Version Value="11"/>
<Target> <Target>
@ -73,6 +76,9 @@
</CompilerOptions> </CompilerOptions>
</Item2> </Item2>
<Item3 Name="Release Linux GTK2 x86"> <Item3 Name="Release Linux GTK2 x86">
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="gtk2"/>
</MacroValues>
<CompilerOptions> <CompilerOptions>
<Version Value="11"/> <Version Value="11"/>
<Target> <Target>

2
Client/CentrED.lpr
View File

@ -21,7 +21,7 @@
* CDDL HEADER END * CDDL HEADER END
* *
* *
* Portions Copyright 2011 Andreas Schneider * Portions Copyright 2012 Andreas Schneider
*) *)
program CentrED; program CentrED;

2
Client/UfrmAbout.lfm
View File

@ -116,7 +116,7 @@ object frmAbout: TfrmAbout
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
BorderSpacing.Around = 4 BorderSpacing.Around = 4
Caption = 'Copyright 2011 Andreas Schneider' Caption = 'Copyright 2012 Andreas Schneider'
ParentColor = False ParentColor = False
end end
end end

3
Client/UfrmAbout.pas
View File

@ -21,7 +21,7 @@
* CDDL HEADER END * CDDL HEADER END
* *
* *
* Portions Copyright 2011 Andreas Schneider * Portions Copyright 2012 Andreas Schneider
*) *)
unit UfrmAbout; unit UfrmAbout;
@ -75,6 +75,7 @@ end;
procedure TfrmAbout.FormCreate(Sender: TObject); procedure TfrmAbout.FormCreate(Sender: TObject);
begin begin
lblVersion.Caption := Format('Version %s', [VersionInfo.GetProductVersionString]); lblVersion.Caption := Format('Version %s', [VersionInfo.GetProductVersionString]);
lblCopyright.Caption := VersionInfo.GetCopyright(True);
end; end;
initialization initialization

9
Client/UfrmLogin.lfm
View File

@ -1,20 +1,20 @@
object frmLogin: TfrmLogin object frmLogin: TfrmLogin
Left = 290 Left = 290
Height = 250 Height = 265
Top = 201 Top = 201
Width = 483 Width = 483
ActiveControl = btnOK ActiveControl = btnOK
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'UO CentrED' Caption = 'UO CentrED'
ClientHeight = 250 ClientHeight = 265
ClientWidth = 483 ClientWidth = 483
Font.Height = -11 Font.Height = -11
OnClose = FormClose OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
ShowInTaskBar = stAlways ShowInTaskBar = stAlways
LCLVersion = '0.9.29' LCLVersion = '0.9.31'
object lblCopyright: TLabel object lblCopyright: TLabel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = gbData AnchorSideTop.Control = gbData
@ -24,12 +24,13 @@ object frmLogin: TfrmLogin
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 0 Left = 0
Height = 1 Height = 14
Top = 249 Top = 249
Width = 483 Width = 483
Alignment = taCenter Alignment = taCenter
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = ' '
ParentColor = False ParentColor = False
end end
object gbConnection: TGroupBox object gbConnection: TGroupBox

8
Client/UfrmLogin.pas
View File

@ -79,9 +79,7 @@ var
implementation implementation
uses uses
UdmNetwork; UdmNetwork, vinfo;
{$I version.inc}
{ TfrmLogin } { TfrmLogin }
@ -171,8 +169,8 @@ procedure TfrmLogin.FormCreate(Sender: TObject);
var var
searchRec: TSearchRec; searchRec: TSearchRec;
begin begin
lblCopyright.Caption := Format('UO CentrED Client Version %s (c) %s', lblCopyright.Caption := Format('UO CentrED Client Version %s %s',
[ProductVersion, Copyright]); [VersionInfo.GetProductVersionString, VersionInfo.GetCopyright]);
FProfilePath := GetAppConfigDir(False) + 'Profiles' + PathDelim; FProfilePath := GetAppConfigDir(False) + 'Profiles' + PathDelim;
ForceDirectories(FProfilePath); ForceDirectories(FProfilePath);

22
Server/cedserver.lpi
View File

@ -13,15 +13,18 @@
<VersionInfo> <VersionInfo>
<UseVersionInfo Value="True"/> <UseVersionInfo Value="True"/>
<MinorVersionNr Value="6"/> <MinorVersionNr Value="6"/>
<RevisionNr Value="1"/> <RevisionNr Value="2"/>
<BuildNr Value="209"/> <BuildNr Value="238"/>
<StringTable CompanyName="AKS DataBasis" FileDescription="CentrED Server" InternalName="CentrED Server" LegalCopyright="Andreas Schneider" OriginalFilename="cedserver.exe" ProductName="CentrED" ProductVersion="0.6.1"/> <StringTable CompanyName="AKS DataBasis" ProductName="CentrED" InternalName="CentrED Server" LegalCopyright="(c) 2012 Andreas Schneider" ProductVersion="0.6.2" FileDescription="CentrED Server" OriginalFilename="cedserver.exe"/>
</VersionInfo> </VersionInfo>
<BuildModes Count="3"> <BuildModes Count="3">
<Item1 Name="default" Default="True"/> <Item1 Name="default" Default="True"/>
<Item2 Name="Release Linux i686"> <Item2 Name="Release Linux i686">
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="gtk2"/>
</MacroValues>
<CompilerOptions> <CompilerOptions>
<Version Value="10"/> <Version Value="11"/>
<Target> <Target>
<Filename Value="../bin/cedserver"/> <Filename Value="../bin/cedserver"/>
</Target> </Target>
@ -48,6 +51,7 @@
</CodeGeneration> </CodeGeneration>
<Linking> <Linking>
<Debugging> <Debugging>
<GenerateDebugInfo Value="False"/>
<UseLineInfoUnit Value="False"/> <UseLineInfoUnit Value="False"/>
<StripSymbols Value="True"/> <StripSymbols Value="True"/>
</Debugging> </Debugging>
@ -64,8 +68,11 @@
</CompilerOptions> </CompilerOptions>
</Item2> </Item2>
<Item3 Name="Release Win32"> <Item3 Name="Release Win32">
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="win32"/>
</MacroValues>
<CompilerOptions> <CompilerOptions>
<Version Value="10"/> <Version Value="11"/>
<Target> <Target>
<Filename Value="../bin/cedserver"/> <Filename Value="../bin/cedserver"/>
</Target> </Target>
@ -92,6 +99,7 @@
</CodeGeneration> </CodeGeneration>
<Linking> <Linking>
<Debugging> <Debugging>
<GenerateDebugInfo Value="False"/>
<UseLineInfoUnit Value="False"/> <UseLineInfoUnit Value="False"/>
<StripSymbols Value="True"/> <StripSymbols Value="True"/>
</Debugging> </Debugging>
@ -211,7 +219,7 @@
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="10"/> <Version Value="11"/>
<Target> <Target>
<Filename Value="../bin/cedserver"/> <Filename Value="../bin/cedserver"/>
</Target> </Target>
@ -228,7 +236,7 @@
</Parsing> </Parsing>
<Linking> <Linking>
<Debugging> <Debugging>
<GenerateDwarf Value="True"/> <DebugInfoType Value="dsDwarf2Set"/>
<UseHeaptrc Value="True"/> <UseHeaptrc Value="True"/>
</Debugging> </Debugging>
</Linking> </Linking>

6
Server/cedserver.lpr
View File

@ -21,7 +21,7 @@
* CDDL HEADER END * CDDL HEADER END
* *
* *
* Portions Copyright 2011 Andreas Schneider * Portions Copyright 2012 Andreas Schneider
*) *)
program cedserver; program cedserver;
@ -37,8 +37,8 @@ uses
begin begin
Writeln(''); Writeln('');
Writeln('CentrED Server Version ', versionInfo.GetProductVersionString); Writeln('CentrED Server Version ', VersionInfo.GetProductVersionString);
Writeln('Copyright 2011 Andreas Schneider'); Writeln(VersionInfo.GetCopyright(True));
//Writeln('================================'); //Writeln('================================');
Writeln(''); Writeln('');

10
Setup/CentrED_win32.iss
View File

@ -3,7 +3,7 @@
[Setup] [Setup]
AppName=CentrED AppName=CentrED
AppVerName=CentrED 0.6.1 AppVerName=CentrED 0.6.2
AppPublisher=AKS DataBasis AppPublisher=AKS DataBasis
AppPublisherURL=http://www.aksdb.de/CentrED AppPublisherURL=http://www.aksdb.de/CentrED
AppSupportURL=http://www.aksdb.de/CentrED AppSupportURL=http://www.aksdb.de/CentrED
@ -13,15 +13,15 @@ DefaultGroupName=AKS DataBasis\CentrED
OutputBaseFilename=CentrED_win32 OutputBaseFilename=CentrED_win32
Compression=lzma Compression=lzma
SolidCompression=true SolidCompression=true
VersionInfoVersion=0.6.1 VersionInfoVersion=0.6.2
VersionInfoCompany=AKS DataBasis VersionInfoCompany=AKS DataBasis
VersionInfoDescription=Client/Server based multiuser map editor VersionInfoDescription=Client/Server based multiuser map editor
VersionInfoTextVersion=0.6.1 VersionInfoTextVersion=0.6.2
VersionInfoCopyright=Andreas Schneider VersionInfoCopyright=Andreas Schneider
AppCopyright=Andreas Schneider AppCopyright=Andreas Schneider
InfoBeforeFile=Changelog.txt InfoBeforeFile=Changelog.txt
SignTool=defsign $f SignTool=defsign $f
AppVersion=0.6.1 AppVersion=0.6.2
AppID={{77BCACC0-C2D9-470D-858F-A3D94A5F27A5} AppID={{77BCACC0-C2D9-470D-858F-A3D94A5F27A5}
SignedUninstaller=true SignedUninstaller=true
@ -44,4 +44,4 @@ Name: {commondesktop}\CentrED; Filename: {app}\CentrED.exe; Tasks: desktopicon
[Run] [Run]
Filename: {app}\CentrED.exe; Description: {cm:LaunchProgram,CentrED}; Flags: nowait postinstall skipifsilent Filename: {app}\CentrED.exe; Description: {cm:LaunchProgram,CentrED}; Flags: nowait postinstall skipifsilent
[Messages] [Messages]
BeveledLabel=Copyright 2009 Andreas Schneider BeveledLabel=Copyright 2012 Andreas Schneider

9
Setup/Changelog.txt
View File

@ -1,6 +1,14 @@
Changelog: Changelog:
[C] = Client, [S] = Server, [-] = Both/Unrelated [C] = Client, [S] = Server, [-] = Both/Unrelated
Version 0.6.2
=============
[C] Added random pool for hues
[C] Added more infos to the account list (for admins)
[C] Added sorting to account list
[C] Fixed possible crash with light sources enabled
[-] Added support for new tiledata from High Seas expansion
Version 0.6.1 Version 0.6.1
============= =============
[C] Added highlighting for (un)walkable tiles [C] Added highlighting for (un)walkable tiles
@ -9,7 +17,6 @@ Version 0.6.1
[C] Fixed flickering that occured in some cases [C] Fixed flickering that occured in some cases
[S] Fixed server not always saving changes [S] Fixed server not always saving changes
Version 0.6 Version 0.6
=========== ===========
[C] Added rendering of lightsources [C] Added rendering of lightsources

3
version.inc
View File

@ -1,5 +1,2 @@
const const
ProductVersion = '0.6.1';
ProtocolVersion = 6; ProtocolVersion = 6;
Revision = '209';
Copyright = '2009 Andreas Schneider';

27
vinfo.pas
View File

@ -29,6 +29,8 @@ type
//Helper functions //Helper functions
function GetProductVersionString(AMinPrecision: TVersionPrecision = 2): String; function GetProductVersionString(AMinPrecision: TVersionPrecision = 2): String;
function GetCopyright(ALong: Boolean = false): String;
procedure PrintStringFileInfo;
end; end;
var var
@ -100,6 +102,31 @@ begin
end; end;
end; end;
function TVersionInfo.GetCopyright(ALong: Boolean = False): String;
begin
Result := StringFileInfo[0]['LegalCopyright'];
if ALong then
Result := StringReplace(Result, '(c) ', 'Copyright ', []);
end;
procedure TVersionInfo.PrintStringFileInfo;
var
verStringInfo: TVersionStringFileInfo;
verStringTable: TVersionStringTable;
i, j: Integer;
begin
verStringInfo := GetStringFileInfo;
for i := 0 to verStringInfo.Count - 1 do
begin
writeln('Version String Info ', i + 1);
verStringTable := verStringInfo.Items[i];
for j := 0 to verStringTable.Count - 1 do
begin
writeln(' ', verStringTable.Keys[j], ' = ', verStringTable.ValuesByIndex[j]);
end;
end;
end;
initialization initialization
VersionInfo := TVersionInfo.Create; VersionInfo := TVersionInfo.Create;
VersionInfo.Load(HINSTANCE); VersionInfo.Load(HINSTANCE);