2c9664ca33
Calling configure will now implicitly run init-repository when appropriate. See further down below for what "appropriate" means. All supported init-repository options can be passed to configure as except for -mirror, -oslo, -berlin. This includes useful options like -submodules, -no-resolve-deps and -no-optional-deps. When running configure on a qt5.git clone without any submodules cloned, configure will exit with a helpful error message suggesting to pass -init-submodules, so it automatically clones missing repositories. This means cloning is opt-in, so that internet access is not done implicitly. The error message also suggests passing the -submodules option. This will affect which submodules will be cloned by init-repository and which submodules will be configured by configure. In this case -submodules is effectively an alias of init-repository's -module-subset for cloning purposes. When calling configure a second time, without -init-submodules, on an already configured repo, init-repository behavior is entirely skipped. -submodules now accepts init-repository-style special values like "essential", "addon", "all", "existing", "-deprecated" for the purpose of cloning submodules. The values are then translated into actual repos that should also be configured or skipped by configure. The default subset of cloned submodules is currently the same one as init-repository, "default", which clones 44 actively maintained repositories as well as deprecated submodules. If configure is called a second time WITH -init-submodules, it's the same as calling init-repository --force to re-initialize submodules. In this case passing something like --submodules existing,<additional-submodules> might make sense to add or remove submodules. As a drive-by this also fixes the bug where you couldn't pass a configure -- -DFOO=0 parameter to configure, because it got treated as '0>', redirecting from a different stream than stdout, leading to empty content in the file. [ChangeLog][General][Build System] The configure script now implicitly calls init-repository when appropriate and accepts init-repository command line options. Fixes: QTBUG-120030 Task-number: QTBUG-122622 Change-Id: Iedbfcbf0a87c8ee89e40d00b6377b68296a65a62 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
24 lines
1.0 KiB
Batchfile
24 lines
1.0 KiB
Batchfile
:: Copyright (C) 2024 The Qt Company Ltd.
|
|
:: SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
|
|
|
@echo off
|
|
setlocal ENABLEDELAYEDEXPANSION ENABLEEXTENSIONS
|
|
set script_dir_path=%~dp0
|
|
set script_dir_path=%script_dir_path:~0,-1%
|
|
|
|
set cmake_scripts_dir=%script_dir_path%\cmake
|
|
:: The '.' in 'echo.%*' ensures we don't print "echo is off" when no arguments are passed
|
|
:: https://devblogs.microsoft.com/oldnewthing/20170802-00/?p=96735
|
|
:: The space before the '>' makes sure that when we have a digit at the end of the args, we
|
|
:: don't accidentally concatenate it with the '>' resulting in '0>' or '2>' which redirects into the
|
|
:: file from a stream different than stdout, leading to broken or empty content.
|
|
echo.%* >config.tl.opt.in
|
|
|
|
call cmake -DIN_FILE=config.tl.opt.in -DOUT_FILE=config.tl.opt ^
|
|
-P "%cmake_scripts_dir%\QtWriteArgsFile.cmake"
|
|
call cmake -DOPTFILE=config.tl.opt -DTOP_LEVEL_SRC_PATH="%script_dir_path%" ^
|
|
-P "%cmake_scripts_dir%\QtTopLevelConfigureScript.cmake"
|
|
|
|
del config.tl.opt.in
|
|
del config.tl.opt
|