summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKonstantin Podsvirov <konstantin@podsvirov.pro>2016-06-21 13:56:22 +0300
committerIikka Eklund <iikka.eklund@qt.io>2016-11-08 10:23:16 +0000
commit82dfa6992e5c311d21395a23d48208224d584f4c (patch)
tree8ff27fe43ac1e154c4bc71346dfe372de4b1c810 /doc
parentc1b54a0a7b6c34a348a8f30826c8fc2d4b62d615 (diff)
Resolve relative URLs from Updates.xml
This change allows you to use relative URLs to update repositories. Absolute addresses are resolved relative to the current Updates.xml file is parsed. Documentation added to ifw-updates.html page. Change-Id: I025bdc3044d1ca9d6abcce3ccdc043d5f03667fc Reviewed-by: Konstantin Podsvirov <konstantin@podsvirov.pro> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/installerfw.qdoc41
1 files changed, 39 insertions, 2 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index a937631bd..c126e3467 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -1228,6 +1228,14 @@
displayname="Example Repository" />
\endcode
+ \c{url} will be used as a base url to resolve an \c{Updates.xml} file against.
+ If \c{url} is itself relative, it will be resolved against the base url of the current document.
+
+ \c{displayname} specifies how the repository should be named in the \gui Settings page
+ of the Maintenance Tool.
+
+ \c{name} and \c{password} optionally specify credentials for a protected repository.
+
\section2 Removing Repositories
To remove a repository, add a \c <Repository> child element to the
\c <RepositoryUpdate> element with the following options:
@@ -1236,15 +1244,44 @@
<Repository action="remove" url="http://www.example.com/repository" />
\endcode
+ \c{url} must match exactly the url that is to be removed.
+
\section2 Replacing Repositories
To replace one repository with another, add a \c <Repository> child element to the
\c <RepositoryUpdate> element with the following options:
\code
- <Repository action="replace" oldurl="http://www.example.com/repository"
- newurl="http://www.example.com/newrepository" name="user" password="password"
+ <Repository action="replace" oldUrl="http://www.example.com/repository"
+ newUrl="http://www.example.com/newrepository" name="user" password="password"
displayname="New Example Repository" />
\endcode
+
+ \c{oldUrl} must match exactly the url that is to be replaced.
+
+ \c{newUrl} must match exactly the url that is replace to.
+
+ \section1 Relocatable Repositories
+
+ Some projects contain multiple repositories. To create relocatable set
+ of repositories you should use relative paths.
+
+ So if generic repository available at address \c{http://www.example.com/repositories/generic}
+ and \c{Updates.xml} contains \c <Repository> element with the following options:
+
+ \code
+ <Repository action="add" url="../module" name="user" password="password"
+ displayname="Module Repository" />
+ \endcode
+
+ Resolved address of added repository will be \c{http://www.example.com/repositories/module}.
+ So that the repository does not contain information about their absolute location.
+
+ If you want to change the address, you can simply copy a set of repositories as is.
+ It recommended for some time to maintain the old generic repository and replace addresses
+ as described above. You can also provide the updated installer with the new generic address.
+
+ You can use relative path for arguments \c url, \c oldUrl and \c newUrl at
+ \c <Repository> element.
*/
/*!