1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename configure.exe => configureapp.exe

Browse Source 
now that the bat file is responsible for displaying the help in addition
to bootstrapping configure, the exe file should not shadow it any more.

amends c027cffbe.

Change-Id: I5c8a52f59ff455575e646fae55cd214db98a3736
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-09-30 16:06:36 +02:00
parent 9e048799b8
commit 5a4d469dcb
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -202,7 +202,7 @@ src/3rdparty/webkit/includes2.txt
# generated files in configure.exe bootstrapping # generated files in configure.exe bootstrapping
tools/configure/configure.intermediate.manifest tools/configure/configure.intermediate.manifest
tools/configure/configure_pch.pch tools/configure/configure_pch.pch
/configure.exe /configureapp.exe
# Symlinks generated by configure # Symlinks generated by configure
tools/qvfb/qvfbhdr.h tools/qvfb/qvfbhdr.h

2
configure.bat
View File

@ -130,7 +130,7 @@ if errorlevel 1 (cd ..\.. & exit /b 1)
cd ..\.. cd ..\..
:conf :conf
configure.exe -srcdir %QTSRC% %ARGS% configureapp.exe -srcdir %QTSRC% %ARGS%
goto exit goto exit
:help :help

2
tools/configure/Makefile.mingw
View File

@ -12,7 +12,7 @@ LINK = g++
LFLAGS = -Wl,-subsystem,console -mthreads LFLAGS = -Wl,-subsystem,console -mthreads
LIBS = -lole32 -ladvapi32 -luuid LIBS = -lole32 -ladvapi32 -luuid
TARGET = ../../configure.exe TARGET = ../../configureapp.exe
OBJECTS = \ OBJECTS = \
main.o \ main.o \

2
tools/configure/Makefile.win32
View File

@ -17,7 +17,7 @@ LINK = link
LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO /SUBSYSTEM:CONSOLE "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /MANIFEST /MANIFESTFILE:"configure.intermediate.manifest" LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO /SUBSYSTEM:CONSOLE "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /MANIFEST /MANIFESTFILE:"configure.intermediate.manifest"
LIBS = ole32.lib advapi32.lib shell32.lib LIBS = ole32.lib advapi32.lib shell32.lib
TARGET = ..\..\configure.exe TARGET = ..\..\configureapp.exe
OBJECTS = \ OBJECTS = \
main.obj \ main.obj \

2
tools/configure/configure.pro
View File

@ -1,4 +1,4 @@
TARGET = configure TARGET = configureapp
DESTDIR = $$PWD/../.. # build directly in source dir DESTDIR = $$PWD/../.. # build directly in source dir
CONFIG += console flat stl rtti_off CONFIG += console flat stl rtti_off