change option name to -base not to be same as python module option

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2019-05-30 08:03:31 +09:00
parent b34a8099e6
commit 69e60e511f
5 changed files with 18 additions and 13 deletions

View File

@@ -14,7 +14,7 @@ Current changes
Added
-----
* Option to specify mirror site.
* Option -b | --base to specify mirror site.
Changed
-------

View File

@@ -55,8 +55,8 @@ General usage looks like this:
.. code-block:: bash
aqt [-h][--help] install <qt-version> <host> <target> [<arch>]
python -m aqt [-h][--help] install <qt-version> <host> <target> [<arch>]
aqt [-h][--help][-O | --outputdir <directory>][-b | --base <mirror url>] install <qt-version> <host> <target> [<arch>]
python -m aqt [-h][--help][-O | --outputdir <directory>][-b | --base <mirror url>] install <qt-version> <host> <target> [<arch>]
* The Qt version is formatted like this: `5.11.3`
* Host is one of: `linux`, `mac`, `windows`
@@ -72,8 +72,7 @@ run such as follows:
.. code-block:: bash
C:\> mkdir Qt
C:\> cd Qt
C:\Qt\> aqt install 5.11.3 windows desktop win64_msvc2017_64
C:\> aqt install -O c:\Qt 5.11.3 windows desktop win64_msvc2017_64
Example: Installing Qt 5.12.0 for Linux:
@@ -81,8 +80,7 @@ Example: Installing Qt 5.12.0 for Linux:
.. code-block:: bash
pip install aqtinstall
cd /opt
sudo aqt install 5.12.0 linux desktop
sudo aqt install --outputdir /opt 5.12.0 linux desktop
Example: Installing Android (armv7) Qt 5.10.2:

View File

@@ -44,7 +44,7 @@ class QtPackage:
class QtArchives:
BASE_URL = 'https://download.qt.io/online/qtsdkrepository/'
BASE_URL = 'https://download.qt.io'
archives = []
base = None
@@ -59,9 +59,9 @@ class QtArchives:
self.base = self.BASE_URL
qt_ver_num = qt_version.replace(".", "")
if os_name == 'windows':
archive_url = self.base + os_name + '_x86/' + target + '/' + 'qt5_' + qt_ver_num + '/'
archive_url = self.base + '/online/qtsdkrepository/' + os_name + '_x86/' + target + '/' + 'qt5_' + qt_ver_num + '/'
else:
archive_url = self.base + os_name + '_x64/' + target + '/' + 'qt5_' + qt_ver_num + '/'
archive_url = self.base + '/online/qtsdkrepository/' + os_name + '_x64/' + target + '/' + 'qt5_' + qt_ver_num + '/'
# Get packages index
update_xml_url = "{0}Updates.xml".format(archive_url)

View File

@@ -36,7 +36,7 @@ class Cli():
target = args.target
os_name = args.host
output_dir = args.outputdir
mirror = args.mirror
mirror = args.base
if arch is None:
if os_name == "linux" and target == "desktop":
arch = "gcc_64"
@@ -88,7 +88,7 @@ class Cli():
"\nandroid: android_x86, android_armv7")
install_parser.add_argument('-O', '--outputdir', nargs='?',
help='Target output directory(default current directory)')
install_parser.add_argument('-m', '--mirror', nargs='?',
install_parser.add_argument('-b', '--base', nargs='?',
help="Specify mirror base url such as http://mirrors.ocf.berkeley.edu/qt/, "
"where 'online' folder exist.")
list_parser = subparsers.add_parser('list')

View File

@@ -51,4 +51,11 @@ long options may be truncated to the shortest unambiguous abbreviation.
Display help text
.. option::
.. option:: --outputdir, -O <Output Directory>
specify output directory.
.. option:: --base, -b <base url>
specify mirror site base url such as -b 'http://mirrors.ocf.berkeley.edu/qt/'
where 'online' folder exist.