diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-24 18:34:07 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-24 18:34:14 +0200 |
| commit | f3d6fe82ab8c1c2b4fda4f4a87a68e86cd1f2a4f (patch) | |
| tree | fa5f507651e467a3b8281008535a9d38037e98e9 /configure.bat | |
| parent | df0a7fd6dc0ce6d859e0c21231758c4e230ff189 (diff) | |
| parent | 76e3f3d2a6648f3f18bb022f6ebc668d25ee525e (diff) | |
Merge branch 'stable' into dev
Conflicts:
qtactiveqt
qtbase
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtjsbackend
qtmultimedia
qtquick1
qtquickcontrols
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtx11extras
qtxmlpatterns
Change-Id: Ie3f5321de50ec76a7b3f5a0e2d2be1835abce527
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% |