aboutsummaryrefslogtreecommitdiffstats
path: root/configure.bat
diff options
context:
space:
mode:
Diffstat (limited to 'configure.bat')
-rw-r--r--configure.bat63
1 files changed, 19 insertions, 44 deletions
diff --git a/configure.bat b/configure.bat
index 500d627f..9c0e0e62 100644
--- a/configure.bat
+++ b/configure.bat
@@ -1,48 +1,23 @@
-@echo off
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-::
-:: Copyright (C) 2020 The Qt Company Ltd.
-:: Contact: http://www.qt.io/licensing/
-::
-:: This file is part of the tools applications of the Qt Toolkit.
-::
-:: $QT_BEGIN_LICENSE:GPL-EXCEPT$
-:: Commercial License Usage
-:: Licensees holding valid commercial Qt licenses may use this file in
-:: accordance with the commercial license agreement provided with the
-:: Software or, alternatively, in accordance with the terms contained in
-:: a written agreement between you and The Qt Company. For licensing terms
-:: and conditions see https://www.qt.io/terms-conditions. For further
-:: information use the contact form at https://www.qt.io/contact-us.
-::
-:: GNU General Public License Usage
-:: Alternatively, this file may be used under the terms of the GNU
-:: General Public License version 3 as published by the Free Software
-:: Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-:: included in the packaging of this file. Please review the following
-:: information to ensure the GNU General Public License requirements will
-:: be met: https://www.gnu.org/licenses/gpl-3.0.html.
-::
-:: $QT_END_LICENSE$
-::
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-set "srcpath=%~dp0"
-set "configure=%srcpath%qtbase\configure.bat"
-if not exist "%configure%" (
- echo %configure% not found. Did you forget to run "init-repository"? >&2
- exit /b 1
-)
+:: Copyright (C) 2024 The Qt Company Ltd.
+:: SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-if not exist qtbase mkdir qtbase || exit /b 1
-
-echo + cd qtbase
-cd qtbase || exit /b 1
+@echo off
+setlocal ENABLEDELAYEDEXPANSION ENABLEEXTENSIONS
+set script_dir_path=%~dp0
+set script_dir_path=%script_dir_path:~0,-1%
-echo + %configure% -top-level %*
-call %configure% -top-level %*
-set err=%errorlevel%
+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
-cd ..
+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"
-exit /b %err%
+del config.tl.opt.in
+del config.tl.opt