diff --git a/components/lazautoupdate/latest_stable/lazupdate.lpk b/components/lazautoupdate/latest_stable/lazupdate.lpk
index 7d2e51ba3..a48f2f08a 100644
--- a/components/lazautoupdate/latest_stable/lazupdate.lpk
+++ b/components/lazautoupdate/latest_stable/lazupdate.lpk
@@ -55,7 +55,7 @@ More information in the Wiki Home Page http://wiki.freepascal.org/LazAutoUpdater
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"/>
-
+
diff --git a/components/lazautoupdate/latest_stable/open_ssl.pas b/components/lazautoupdate/latest_stable/open_ssl.pas
index 7d8b5aabe..4ef7cac87 100644
--- a/components/lazautoupdate/latest_stable/open_ssl.pas
+++ b/components/lazautoupdate/latest_stable/open_ssl.pas
@@ -5,23 +5,26 @@ unit open_ssl;
interface
uses
- // Built-in 'fphttpclient' replaces 'lazautoupdate_httpclient' for general use
+ // Built-in 'fphttpclient' unit replaces 'lazautoupdate_httpclient' unit for general use
Classes, SysUtils,lazautoupdate_httpclient,LazFileUtils,FileUtil,zipper;
function CheckForOpenSSL:Boolean;
function OpenSSLInstalled:Boolean;
implementation
-const
+Var FHTTPClient:TFPHttpClient;
+
{$ifdef win64}
+const
cOpenSSLURL = 'http://packages.lazarus-ide.org/openssl-1.0.2j-x64_86-win64.zip';
cAltOpenSSLURL = 'http://indy.fulgan.com/SSL/openssl-1.0.2j-i386-win32.zip';
{$endif}
{$ifdef win32}
+const
cOpenSSLURL = 'http://packages.lazarus-ide.org/openssl-1.0.2j-i386-win32.zip';
cAltOpenSSLURL = 'http://indy.fulgan.com/SSL/openssl-1.0.2j-x64_86-win64.zip';
{$endif}
-Var FHTTPClient:TFPHttpClient;
+
function OpenSSLInstalled:Boolean;
begin
diff --git a/components/lazautoupdate/latest_stable/testapp/testapp.lps b/components/lazautoupdate/latest_stable/testapp/testapp.lps
index b5cdd9af4..a08ef897d 100644
--- a/components/lazautoupdate/latest_stable/testapp/testapp.lps
+++ b/components/lazautoupdate/latest_stable/testapp/testapp.lps
@@ -4,13 +4,13 @@
-
+
-
+
@@ -19,9 +19,10 @@
-
-
-
+
+
+
+
@@ -30,30 +31,29 @@
-
-
-
+
+
+
-
-
+
-
-
+
+
-
-
+
+
@@ -61,7 +61,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -120,98 +120,155 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/lazautoupdate/latest_stable/testapp/umainform.lfm b/components/lazautoupdate/latest_stable/testapp/umainform.lfm
index 652bac450..ba1366eee 100644
--- a/components/lazautoupdate/latest_stable/testapp/umainform.lfm
+++ b/components/lazautoupdate/latest_stable/testapp/umainform.lfm
@@ -111,9 +111,10 @@ object mainform: Tmainform
OnNewVersionAvailable = LazAutoUpdate1NewVersionAvailable
OnDownloaded = LazAutoUpdate1Downloaded
OnDebugEvent = LazAutoUpdate1DebugEvent
- SFProjectName = 'lazautoupdate'
- auOtherSourceURL = '/'
+ SFProjectName = ''
+ auOtherSourceURL = ''
auOtherSourceFilename = ''
+ ProjectType = auGitHubReleaseZip
CopyTree = False
UpdatesFolder = 'updates'
VersionsININame = 'testapp.ini'
@@ -122,9 +123,9 @@ object mainform: Tmainform
VersionCountLimit = 1000000
DownloadCountLimit = 10000000
ZipfileName = 'testapp.zip'
- GitHubUsername = ''
- GitHubProjectName = ''
- GitHubBranch = ''
+ GitHubUsername = 'lazarusccr'
+ GitHubProjectName = 'TestApp'
+ GitHubBranch = 'TestBranch'
Left = 200
Top = 24
end
diff --git a/components/lazautoupdate/latest_stable/ulazautoupdate.pas b/components/lazautoupdate/latest_stable/ulazautoupdate.pas
index 8f81c1413..bf7a2e8e1 100644
--- a/components/lazautoupdate/latest_stable/ulazautoupdate.pas
+++ b/components/lazautoupdate/latest_stable/ulazautoupdate.pas
@@ -49,11 +49,11 @@ const
'https://sourceforge.net/projects/%s/files/%s/%s/download';
// [updatepath,projectname,filename]
// C_GITHUBFILE_URL = 'https://raw.github.com/%s/%s/master/%s/%s';
- C_GITHUBFILE_URL = 'https://raw.github.com/%s/%s/%s/%s/%s';
- // https://raw.github.com////some_directory/file
+ C_GITHUBFILE_URL = 'https://raw.github.com/%s/%s/%s/%s';
+ // https://raw.github.com////file
// GitHubUserName,GitHubProjectName,updatepath,filename
-
- C_GITHUBFILE_URL_UPDATES = 'https://raw.github.com/%s/%s/%s/%s/%s/%s';
+ C_GITHUBFILE_URL_UPDATES = 'https://raw.github.com/%s/%s/%s/%s/%s';
+ // https://raw.github.com////some_directory/file
C_TLazAutoUpdateComponentVersion = '0.2.3';
C_LAUTRayINI = 'lauimport.ini';
@@ -107,6 +107,7 @@ const
V0.1.25:Changed default: CopyTree = TRUE
V0.1.26:Updated uses clause for FileUtils.
V0.2.0: Rewritten for 2017
+ V0.2.4: GitHub integration with branches
}
C_TThreadedDownloadComponentVersion = '0.0.3';
{
@@ -923,9 +924,12 @@ begin
fOndebugEvent(Self, 'NewVersionAvailable', C_PropIsEmpty);
Exit;
end;
- szURL := Format(C_GITHUBFILE_URL,
- [fGitHubUserName,fGitHubProjectName,fGitHubBranch,fVersionsININame]);
+ If ((fUpdatesFolder=C_NotApplicable) or (fUpdatesFolder='')) then
+ szURL := Format(C_GITHUBFILE_URL, [fGitHubUserName,fGitHubProjectName,fGitHubBranch,fVersionsININame])
+ else
+ szURL := Format(C_GITHUBFILE_URL_UPDATES, [fGitHubUserName,fGitHubProjectName,fGitHubBranch,fUpdatesFolder,fVersionsININame]);
end;
+ // ShowMessage(szURL);
if fProjectType = auOther then
// fauOtherSourceURL ends with '/'
begin