Skip to content

Commit bf132da

Browse files
committed
Removed SEMPARE_TEMPLATE_CONFIRM_LICENSE requirement
1 parent 176282b commit bf132da

File tree

2 files changed

+4
-31
lines changed

2 files changed

+4
-31
lines changed

src/Sempare.Template.Compiler.inc

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
* *
1717
* Contact: info@sempare.ltd *
1818
* *
19-
* Licensed under the GPL Version 3.0 or the Sempare Commercial License *
19+
* Licensed under the Apache Version 2.0 or the Sempare Commercial License *
2020
* You may not use this file except in compliance with one of these Licenses. *
2121
* You may obtain a copy of the Licenses at *
2222
* *
23-
* https://www.gnu.org/licenses/gpl-3.0.en.html *
23+
* https://www.apache.org/licenses/LICENSE-2.0 *
2424
* https://github.com/sempare/sempare-delphi-template-engine/blob/master/docs/commercial.license.md *
2525
* *
2626
* Unless required by applicable law or agreed to in writing, software *
@@ -30,12 +30,7 @@
3030
* limitations under the License. *
3131
* *
3232
*************************************************************************************************%*)
33-
34-
// -----------------------------------------------
3533

36-
// Uncomment the following to confirm the license conditions
37-
// {$DEFINE SEMPARE_TEMPLATE_CONFIRM_LICENSE}
38-
3934
// -----------------------------------------------
4035
{$IF CompilerVersion >= 25} // from XE4 onwards
4136
{$DEFINE SUPPORT_JSON_DBX}

src/Sempare.Template.pas

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
* *
1717
* Contact: info@sempare.ltd *
1818
* *
19-
* Licensed under the GPL Version 3.0 or the Sempare Commercial License *
19+
* Licensed under the Apache Version 2.0 or the Sempare Commercial License *
2020
* You may not use this file except in compliance with one of these Licenses. *
2121
* You may obtain a copy of the Licenses at *
2222
* *
23-
* https://www.gnu.org/licenses/gpl-3.0.en.html *
23+
* https://www.apache.org/licenses/LICENSE-2.0 *
2424
* https://github.com/sempare/sempare-delphi-template-engine/blob/master/docs/commercial.license.md *
2525
* *
2626
* Unless required by applicable law or agreed to in writing, software *
@@ -440,29 +440,7 @@ class procedure Template.EvalWithContext(const AContext: ITemplateContext; const
440440
LTemplateVisitor: IEvaluationTemplateVisitor;
441441
LResolveContext: TTemplateValue;
442442
LValue: TTemplateValue;
443-
{$IFNDEF SEMPARE_TEMPLATE_CONFIRM_LICENSE}
444-
LConfirmLicense: TStringStream;
445-
{$ENDIF}
446443
begin
447-
{$IFDEF RELEASE}
448-
{$IFNDEF SEMPARE_TEMPLATE_CONFIRM_LICENSE }
449-
{$MESSAGE FATAL 'The SEMPARE_TEMPLATE_CONFIRM_LICENSE define must be set in RELEASE mode.'}
450-
{$ENDIF}
451-
{$ENDIF}
452-
{$IFNDEF SEMPARE_TEMPLATE_CONFIRM_LICENSE}
453-
LConfirmLicense := TStringStream.Create('Thank you for trying the Sempare Template Engine.'#13#10#13#10 + //
454-
'To supress this message, set the conditional define SEMPARE_TEMPLATE_CONFIRM_LICENSE in the project options.'#13#10#13#10#13#10 + //
455-
'Please remember the library is dual licensed. This is open source - Free as in speech, not Free as in beer. You are free to use it under conditions of the GPL or you can support the project with a commercial license to keep it alive as per:'#13#10#13#10#13#10 + //
456-
'https://github.com/sempare/sempare-delphi-template-engine/blob/main/docs/commercial.license.md'#13#10#13#10#13#10 + //
457-
'NOTE: Downloading the Sempare Template Engine through GetIt does not mean you are exempt of licensing for commercial use.'#13#10#13#10#13#10 //
458-
);
459-
try
460-
LConfirmLicense.Position := 0;
461-
AStream.CopyFrom(LConfirmLicense, LConfirmLicense.Size);
462-
finally
463-
LConfirmLicense.Free;
464-
end;
465-
{$ENDIF}
466444
LResolveContext := AResolveContext;
467445
if LResolveContext.IsType<TTemplateValue> then
468446
LResolveContext := LResolveContext.AsType<TTemplateValue>;

0 commit comments

Comments
 (0)