diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-18 17:10:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-20 14:58:18 +0200 |
| commit | 8c2518eea421de365db4733af9e6faf09a173634 (patch) | |
| tree | e33ac5343e1698ba3f14f5928ea246ba75f95fd3 /configure.bat | |
| parent | 23a639d4cc4d7e3c3b598ad70e0d1be1463ac96a (diff) | |
rewrite top-level configures without perl
otherwise the whole no-syncqt-and-thus-perl-needed stunt in qtbase would
be fairly useless for top-level builds.
Task-number: QTBUG-31786
Change-Id: I9f9b38091155a2d50ffec169267e0363fc24d3c0
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/configure.bat b/configure.bat index 399dd339..73395684 100644 --- a/configure.bat +++ b/configure.bat @@ -1,3 +1,4 @@ +@echo off ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: :: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). @@ -38,5 +39,30 @@ :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -@rem ***** This assumes PERL is in the PATH ***** -@perl.exe %~dp0configure %* + +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 +) + +if not exist qtbase mkdir qtbase || exit /b 1 + +echo + cd qtbase +cd qtbase || exit /b 1 + +echo + %configure% %* +call %configure% %* +set err=%errorlevel% + +cd .. + +if not %err% == 0 goto out + +echo + qtbase\bin\qmake %srcpath% +qtbase\bin\qmake %srcpath% +set err=%errorlevel% + +:out +exit /b %err% |