Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 05:04:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change install path (#48) (#49)

Browse Source 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2019-11-10 13:25:46 +09:00
committed by GitHub
parent b4940e3eb0
commit 0363599359
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.rst
View File

@@ -17,6 +17,9 @@ Added
Changed Changed
------- -------
* Change install path from <target>/Qt/Qt<version>/<version> to <target>/<version> (#48).
- Also update CI test to specify --outputdir <target> that is $(BinariesDirectory)/Qt
Fixed Fixed
----- -----

6
aqt/installer.py
View File

@@ -90,10 +90,10 @@ class QtInstaller:
def install(self, command=None, target_dir=None): def install(self, command=None, target_dir=None):
qt_version, target, arch = self.qt_archives.get_target_config() qt_version, target, arch = self.qt_archives.get_target_config()
if target_dir is not None: if target_dir is None:
base_dir = os.path.join(target_dir, 'Qt') base_dir = os.getcwd()
else: else:
base_dir = os.path.join(os.getcwd(), 'Qt') base_dir = target_dir
archives = self.qt_archives.get_archives() archives = self.qt_archives.get_archives()
p = Pool(NUM_PROCESS) p = Pool(NUM_PROCESS)
ret_arr = p.map(functools.partial(self.retrieve_archive, command=command, path=base_dir), archives) ret_arr = p.map(functools.partial(self.retrieve_archive, command=command, path=base_dir), archives)

6
ci/steps.yml
View File

@@ -24,7 +24,7 @@ steps:
inputs: inputs:
scriptSource: filePath scriptSource: filePath
scriptPath: $(Build.SourcesDirectory)/bin/aqt scriptPath: $(Build.SourcesDirectory)/bin/aqt
arguments: install $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) --internal arguments: install --outputdir $(Build.BinariesDirectory)/Qt $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) --internal
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
condition: and(not(variables['QT_BASE_MIRROR']), not(variables['TOOL_NAME'])) condition: and(not(variables['QT_BASE_MIRROR']), not(variables['TOOL_NAME']))
displayName: Run Aqt (No Base URL Set) displayName: Run Aqt (No Base URL Set)
@@ -32,7 +32,7 @@ steps:
inputs: inputs:
scriptSource: filePath scriptSource: filePath
scriptPath: $(Build.SourcesDirectory)/bin/aqt scriptPath: $(Build.SourcesDirectory)/bin/aqt
arguments: install $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) -b $(QT_BASE_MIRROR) arguments: install --outputdir $(Build.BinariesDirectory)/Qt $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) -b $(QT_BASE_MIRROR)
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
condition: and(variables['QT_BASE_MIRROR'], not(variables['TOOL_NAME'])) condition: and(variables['QT_BASE_MIRROR'], not(variables['TOOL_NAME']))
displayName: Run Aqt (Base URL Set) displayName: Run Aqt (Base URL Set)
@@ -105,7 +105,7 @@ steps:
inputs: inputs:
scriptSource: filePath scriptSource: filePath
scriptPath: $(Build.SourcesDirectory)/bin/aqt scriptPath: $(Build.SourcesDirectory)/bin/aqt
arguments: tool $(HOST) $(TOOL_NAME) $(TOOL_VERSION) $(ARCH) --internal arguments: tool --outputdir $(Build.BinariesDirectory)/Qt $(HOST) $(TOOL_NAME) $(TOOL_VERSION) $(ARCH) --internal
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
condition: variables['TOOL_NAME'] condition: variables['TOOL_NAME']
displayName: Run Aqt (Tool) displayName: Run Aqt (Tool)