don't skip the configure.exe build even when it already exists

[profile/ivi/qtbase.git] / configure.bat

diff --git a/configure.bat b/configure.bat
index f0b6ce5..6394795 100644 (file)
--- a/configure.bat
+++ b/configure.bat
@@ -42,35 +42,21 @@
 @echo off
 set QTSRC=%~dp0
 set QTDIR=%CD%
-if exist configure.exe goto conf
+if not exist %QTSRC%\.gitignore goto sconf
 echo Please wait while bootstrapping configure ...
 
 for %%C in (cl.exe icl.exe g++.exe perl.exe) do set %%C=%%~$PATH:C
 
-set nosyncqt=
-if not exist include (
-    if "%perl.exe%" == "" (
-        echo Perl not found in PATH. Aborting. >&2
-        exit /b 1
-    )
-    if not exist mkspecs (
-        md mkspecs
-        if errorlevel 1 goto exit
-    )
-    perl %QTSRC%bin\syncqt -outdir %QTDIR% %QTSRC%
-    if errorlevel 1 goto exit
-    set nosyncqt=-no-syncqt
+if "%perl.exe%" == "" (
+    echo Perl not found in PATH. Aborting. >&2
+    exit /b 1
 )
-
-if not exist src\corelib\global\qconfig.h (
-    if not exist src\corelib\global (
-        md src\corelib\global
-        if errorlevel 1 goto exit
-    )
-    echo #define Q_BIG_ENDIAN 4321 > src\corelib\global\qconfig.h
-    echo #define Q_LITTLE_ENDIAN 1234 >> src\corelib\global\qconfig.h
-    echo #define Q_BYTE_ORDER Q_LITTLE_ENDIAN >> src\corelib\global\qconfig.h
+if not exist mkspecs (
+    md mkspecs
+    if errorlevel 1 goto exit
 )
+perl %QTSRC%bin\syncqt -minimal -module QtCore -outdir %QTDIR% %QTSRC%
+if errorlevel 1 goto exit
 
 if not exist tools\configure (
     md tools\configure
@@ -117,5 +103,9 @@ if errorlevel 1 (cd ..\.. & exit /b 1)
 cd ..\..
 
 :conf
-configure.exe -srcdir %QTSRC% %* %nosyncqt%
+configure.exe -srcdir %QTSRC% %*
+goto exit
+
+:sconf
+%QTSRC%\configure.exe %*
 :exit