Updates GitHub property names

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5661 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
gbamber
2017-01-16 12:00:41 +00:00
parent 232575bde6
commit 1597ac8b91
3 changed files with 18 additions and 18 deletions

View File

@ -10,7 +10,7 @@
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="5"/> <EditorIndex Value="5"/>
<CursorPos X="33" Y="27"/> <CursorPos X="33" Y="27"/>
<UsageCount Value="42"/> <UsageCount Value="43"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
@ -22,7 +22,7 @@
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<TopLine Value="32"/> <TopLine Value="32"/>
<CursorPos X="103" Y="53"/> <CursorPos X="103" Y="53"/>
<UsageCount Value="42"/> <UsageCount Value="43"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
</Unit1> </Unit1>
@ -33,7 +33,7 @@
<WindowIndex Value="1"/> <WindowIndex Value="1"/>
<TopLine Value="3"/> <TopLine Value="3"/>
<CursorPos X="76" Y="8"/> <CursorPos X="76" Y="8"/>
<UsageCount Value="25"/> <UsageCount Value="26"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
@ -47,8 +47,8 @@
<Filename Value="..\ulazautoupdate.pas"/> <Filename Value="..\ulazautoupdate.pas"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<WindowIndex Value="1"/> <WindowIndex Value="1"/>
<TopLine Value="70"/> <TopLine Value="349"/>
<CursorPos X="42" Y="110"/> <CursorPos X="21" Y="364"/>
<ExtraEditorCount Value="2"/> <ExtraEditorCount Value="2"/>
<ExtraEditor1> <ExtraEditor1>
<EditorIndex Value="3"/> <EditorIndex Value="3"/>

View File

@ -123,8 +123,8 @@ object mainform: Tmainform
VersionCountLimit = 1000000 VersionCountLimit = 1000000
DownloadCountLimit = 10000000 DownloadCountLimit = 10000000
ZipfileName = 'testapp.zip' ZipfileName = 'testapp.zip'
GitHubUsername = 'lazarusccr' GitHubProjectname = 'lazarusccr'
GitHubProjectName = 'TestApp' GitHubRepositoryName = 'TestApp'
GitHubBranch = 'TestBranch' GitHubBranch = 'TestBranch'
Left = 200 Left = 200
Top = 24 Top = 24

View File

@ -203,8 +203,8 @@ type
TLazAutoUpdate = class(TAboutLazAutoUpdate) TLazAutoUpdate = class(TAboutLazAutoUpdate)
private private
fSourceForgeProjectName: string; fSourceForgeProjectName: string;
fGitHubUsername:String;
fGitHubProjectName:String; fGitHubProjectName:String;
fGitHubRepositoryName:String;
fGitHubBranch:String; fGitHubBranch:String;
fApplicationVersionString: string; fApplicationVersionString: string;
fApplicationVersionQuad: TVersionQuad; fApplicationVersionQuad: TVersionQuad;
@ -372,8 +372,8 @@ type
property ZipfileName: string read fZipfileName write fZipfileName; property ZipfileName: string read fZipfileName write fZipfileName;
property UpdateExe:String read fUpdateExe; property UpdateExe:String read fUpdateExe;
property UpdateExeSilent:String read fUpdateSilentExe; property UpdateExeSilent:String read fUpdateSilentExe;
property GitHubUsername:String read fGitHubUsername write fGitHubUsername; property GitHubProjectname:String read fGitHubProjectName write fGitHubProjectName;
Property GitHubProjectName:String read fGitHubProjectName write fGitHubProjectName; Property GitHubRepositoryName:String read fGitHubRepositoryName write fGitHubRepositoryName;
Property GitHubBranch:String read fGitHubBranch write fGitHubBranch; Property GitHubBranch:String read fGitHubBranch write fGitHubBranch;
end; end;
@ -916,7 +916,7 @@ begin
end; end;
if fProjectType = auGitHubReleaseZip then if fProjectType = auGitHubReleaseZip then
begin begin
if ((fGitHubUserName = '') or (fGitHubProjectName = '')) then if ((fGitHubProjectName = '') or (fGitHubRepositoryName = '')) then
begin begin
if fShowDialogs then if fShowDialogs then
ShowMessage(C_PropIsEmpty); ShowMessage(C_PropIsEmpty);
@ -925,9 +925,9 @@ begin
Exit; Exit;
end; end;
If ((fUpdatesFolder=C_NotApplicable) or (fUpdatesFolder='')) then If ((fUpdatesFolder=C_NotApplicable) or (fUpdatesFolder='')) then
szURL := Format(C_GITHUBFILE_URL, [fGitHubUserName,fGitHubProjectName,fGitHubBranch,fVersionsININame]) szURL := Format(C_GITHUBFILE_URL, [fGitHubProjectName,fGitHubRepositoryName,fGitHubBranch,fVersionsININame])
else else
szURL := Format(C_GITHUBFILE_URL_UPDATES, [fGitHubUserName,fGitHubProjectName,fGitHubBranch,fUpdatesFolder,fVersionsININame]); szURL := Format(C_GITHUBFILE_URL_UPDATES, [fGitHubProjectName,fGitHubRepositoryName,fGitHubBranch,fUpdatesFolder,fVersionsININame]);
end; end;
// ShowMessage(szURL); // ShowMessage(szURL);
if fProjectType = auOther then if fProjectType = auOther then
@ -1082,9 +1082,9 @@ begin
ExtractFileName(szTargetPath)]); ExtractFileName(szTargetPath)]);
if fProjectType = auGitHubReleaseZip then if fProjectType = auGitHubReleaseZip then
If ((fUpdatesFolder=C_NotApplicable) or (fUpdatesFolder='')) then If ((fUpdatesFolder=C_NotApplicable) or (fUpdatesFolder='')) then
szURL := Format(C_GITHUBFILE_URL, [fGitHubUserName,fGitHubProjectName,fGitHubBranch,fZipfileName]) szURL := Format(C_GITHUBFILE_URL, [fGitHubProjectName,fGitHubRepositoryName,fGitHubBranch,fZipfileName])
else else
szURL := Format(C_GITHUBFILE_URL_UPDATES, [fGitHubUserName,fGitHubProjectName,fGitHubBranch,fUpdatesFolder,fZipfileName]); szURL := Format(C_GITHUBFILE_URL_UPDATES, [fGitHubProjectName,fGitHubRepositoryName,fGitHubBranch,fUpdatesFolder,fZipfileName]);
if fProjectType = auOther then if fProjectType = auOther then
// fauOtherSourceURL ends with '/' // fauOtherSourceURL ends with '/'
begin begin
@ -1943,8 +1943,8 @@ begin
if fProjectType = auOther then if fProjectType = auOther then
begin begin
fSourceForgeProjectName := C_NotApplicable; fSourceForgeProjectName := C_NotApplicable;
fGitHubRepositoryName := C_NotApplicable;
fGitHubProjectName := C_NotApplicable; fGitHubProjectName := C_NotApplicable;
fGitHubUserName := C_NotApplicable;
fGitHubBranch:=C_NotApplicable; fGitHubBranch:=C_NotApplicable;
fauOtherSourceFilename:=''; fauOtherSourceFilename:='';
fauOtherSourceURL:=''; fauOtherSourceURL:='';
@ -1955,8 +1955,8 @@ begin
fSourceForgeProjectName := ''; fSourceForgeProjectName := '';
fauOtherSourceFilename := C_NotApplicable; fauOtherSourceFilename := C_NotApplicable;
fauOtherSourceURL := C_NotApplicable; fauOtherSourceURL := C_NotApplicable;
fGitHubRepositoryName := C_NotApplicable;
fGitHubProjectName := C_NotApplicable; fGitHubProjectName := C_NotApplicable;
fGitHubUserName := C_NotApplicable;
fGitHubBranch:=C_NotApplicable; fGitHubBranch:=C_NotApplicable;
end; end;
if fProjectType = auGitHubReleaseZip then if fProjectType = auGitHubReleaseZip then
@ -1967,8 +1967,8 @@ begin
fauOtherSourceFilename := C_NotApplicable; fauOtherSourceFilename := C_NotApplicable;
fauOtherSourceURL := C_NotApplicable; fauOtherSourceURL := C_NotApplicable;
fGitHubBranch:= C_MASTER; fGitHubBranch:= C_MASTER;
fGitHubRepositoryName := '';
fGitHubProjectName := ''; fGitHubProjectName := '';
fGitHubUserName := '';
fUpdatesFolder:=C_NotApplicable; fUpdatesFolder:=C_NotApplicable;
end; end;