From c027cffbef6cb317a5a09e1785398c046f0a6395 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 1 Aug 2016 12:40:03 +0200 Subject: make the windows configure also use config_help.txt specifically, make configure.bat dump the text file (which got some windows-specific adjustments). incidentally, this change removes the need for including a pre-built configure.exe into our source packages. Change-Id: Ib3515c113f3602767554fe1493df226551a7bf10 Reviewed-by: Lars Knoll --- configure.bat | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'configure.bat') diff --git a/configure.bat b/configure.bat index 5c01890116..4fcf254a59 100644 --- a/configure.bat +++ b/configure.bat @@ -28,9 +28,26 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @echo off +setlocal ENABLEEXTENSIONS +set ARGS=%* set QTSRC=%~dp0 set QTDIR=%CD% +:doargs + if "%~1" == "" goto doneargs + + if "%~1" == "/?" goto help + if "%~1" == "-?" goto help + if /i "%~1" == "/h" goto help + if /i "%~1" == "-h" goto help + if /i "%~1" == "/help" goto help + if /i "%~1" == "-help" goto help + if /i "%~1" == "--help" goto help + + shift + goto doargs +:doneargs + if not exist %QTSRC%.gitignore goto sconf echo Please wait while bootstrapping configure ... @@ -114,9 +131,13 @@ if errorlevel 1 (cd ..\.. & exit /b 1) cd ..\.. :conf -configure.exe -srcdir %QTSRC% %* +configure.exe -srcdir %QTSRC% %ARGS% +goto exit + +:help +type %QTSRC%config_help.txt goto exit :sconf -%QTSRC%configure.exe %* +%QTSRC%configure.exe %ARGS% :exit -- cgit v1.2.3