Licensing now ModifiedGPL

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5308 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber 2016-11-03 17:18:34 +00:00
parent 9ad4cd2fd4
commit 344e78ffb7
2 changed files with 92 additions and 59 deletions

View File

@ -1,8 +1,9 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<Package Version="4"> <Package Version="4">
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Name Value="longtimerpackage"/> <Name Value="longtimerpackage"/>
<Type Value="RunAndDesignTime"/>
<Author Value="minesadorada@charcodelvalle.com"/> <Author Value="minesadorada@charcodelvalle.com"/>
<CompilerOptions> <CompilerOptions>
<Version Value="11"/> <Version Value="11"/>
@ -10,17 +11,38 @@
<SearchPaths> <SearchPaths>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Other>
<CompilerMessages>
<MsgFileName Value=""/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions> </CompilerOptions>
<Description Value="TLongTimer is a descendant of TIdleTimer that samples every 30minutes when idle. <Description Value="TLongTimer is a descendant of TIdleTimer that samples every 30minutes when idle.
It is intended for TTrayIcon applications. DailyHour is a 24-hour clock (16 = 4pm) and MonthlyDate is best &lt; 29 "/> It is intended for TTrayIcon applications. DailyHour is a 24-hour clock (16 = 4pm) and MonthlyDate is best &lt; 29 "/>
<License Value="LGPL"/> <License Value="Copyright (C)2014 minesadorada@charcodelvalle.com
<Version Release="2"/> Copyright (C)2014 minesadorada@charcodelvalle.com
Modified GPL
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version with the following modification:
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent modules,and
to copy and distribute the resulting executable under terms of your choice,
provided that you also meet, for each linked independent module, the terms
and conditions of the license of that module. An independent module is a
module which is not derived from or based on this library. If you modify
this library, you may extend this exception to your version of the library,
but you are not obligated to do so. If you do not wish to do so, delete this
exception statement from your version.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
for more details.
You should have received a copy of the GNU Library General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"/>
<Version Release="3"/>
<Files Count="2"> <Files Count="2">
<Item1> <Item1>
<Filename Value="ulongtimer.pas"/> <Filename Value="ulongtimer.pas"/>
@ -38,7 +60,6 @@ It is intended for TTrayIcon applications. DailyHour is a 24-hour clock (16 = 4
<OutDir Value="locale"/> <OutDir Value="locale"/>
<EnableI18NForLFM Value="True"/> <EnableI18NForLFM Value="True"/>
</i18n> </i18n>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="1"> <RequiredPkgs Count="1">
<Item1> <Item1>
<PackageName Value="IDEIntf"/> <PackageName Value="IDEIntf"/>

View File

@ -9,11 +9,22 @@ unit uLongTimer;
4. The underlying interval is 30 minutes (when idle) 4. The underlying interval is 30 minutes (when idle)
Copyright (C)2014 minesadorada@charcodelvalle.com Copyright (C)2014 minesadorada@charcodelvalle.com
Modified GPL
This library is free software; you can redistribute it and/or modify it This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your the Free Software Foundation; either version 2 of the License, or (at your
option) any later version. option) any later version with the following modification:
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent modules,and
to copy and distribute the resulting executable under terms of your choice,
provided that you also meet, for each linked independent module, the terms
and conditions of the license of that module. An independent module is a
module which is not derived from or based on this library. If you modify
this library, you may extend this exception to your version of the library,
but you are not obligated to do so. If you do not wish to do so, delete this
exception statement from your version.
This program is distributed in the hope that it will be useful, but WITHOUT This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@ -23,6 +34,7 @@ unit uLongTimer;
You should have received a copy of the GNU Library General Public License You should have received a copy of the GNU Library General Public License
along with this library; if not, write to the Free Software Foundation, along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
} }
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
@ -103,7 +115,7 @@ implementation
const const
C_OneMinute = 60000; C_OneMinute = 60000;
C_Version = '0.0.2'; C_Version = '0.0.3';
(* (*
V0.0.1: Initial commit V0.0.1: Initial commit
@ -141,7 +153,7 @@ begin
AboutBoxAuthorname := 'Gordon Bamber'; AboutBoxAuthorname := 'Gordon Bamber';
// AboutBoxOrganisation (string) // AboutBoxOrganisation (string)
AboutBoxAuthorEmail := 'minesadorada@charcodelvalle.com'; AboutBoxAuthorEmail := 'minesadorada@charcodelvalle.com';
AboutBoxLicenseType := 'LGPL';// (string e.g. 'GPL', ModifiedGPL' etc AboutBoxLicenseType := 'MODIFIEDGPL';// (string e.g. 'GPL', ModifiedGPL' etc
fHourDone := False; fHourDone := False;
fDayDone := False; fDayDone := False;
@ -308,7 +320,7 @@ begin
// Temporarily disable running timer? // Temporarily disable running timer?
TimerEnabled := Enabled; TimerEnabled := Enabled;
Enabled := False; Enabled := False;
if (aHour >= 0) and (aHour <= 24) then if ((aHour >= 0) and (aHour <= 24)) then
fHour := aHour; fHour := aHour;
Enabled := TimerEnabled; Enabled := TimerEnabled;
end; end;