AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not route qtmodule-configtests invocation through syncqt

Browse Source 
there is completely no reason to do it.

Change-Id: Ie186ef4c1bbd12c256acb2fe374d12ebe777d6c9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-04 14:02:10 +02:00
parent 0b37ec3321
commit 2d8dd9a6c9
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bin/syncqt
View File

@ -104,7 +104,6 @@ my $create_private_headers = 1;
my $module_fwd = "";
my $cache_module_fwd = 0;
my $developer_build = 0;
my $makefile_generator = "";
my @modules_to_sync ;
$force_relative = 1 if ( -d "/System/Library/Frameworks" );
@ -143,7 +142,6 @@ sub showUsage
print " fwd includes\n";
print " -developer-build Point libraries and binaries to a common directory for\n";
print " easy development\n";
print " -generator <PATH> Specify the makefile generator setting (e.g. 'UNIX')\n";
print " -help This help\n";
exit 0;
}
@ -684,9 +682,6 @@ while ( @ARGV ) {
} elsif($arg eq "-qtdir") {
$var = "qtdir";
$val = shift @ARGV;
} elsif($arg eq "-generator") {
$var = "makefile_generator";
$val = shift @ARGV;
} elsif($arg =~/^-/) {
print "Unknown option: $arg\n\n" if(!$var);
showUsage();
@ -770,8 +765,6 @@ while ( @ARGV ) {
$cache_module_fwd = 1;
} elsif ($var eq "developer_build") {
$developer_build = 1;
} elsif ($var eq "makefile_generator") {
$makefile_generator = $val;
} elsif ($var eq "output") {
my $outdir = $val;
if(checkRelative($outdir)) {
@ -1383,21 +1376,4 @@ if($check_includes) {
}
}
# Do configure tests now (pass some things along)
# fatal tests have a non zero return
# If the generator is not set (e.g. someone invoking syncqt as part of configure etc, then don't run tests either)
unless ($showonly || $makefile_generator eq '') {
my $configtests = dirname($0)."/qtmodule-configtests";
if (! -f $configtests) {
$configtests = $qtbasedir."/bin/qtmodule-configtests";
}
if (! -f $configtests) {
warn "Unable to locate qtmodule-configtests script - config tests disabled.\n";
} else {
if (system($EXECUTABLE_NAME, $configtests, $basedir, $out_basedir, $qtbasedir, $makefile_generator)) {
die "$configtests exited with status $?";
}
}
}
exit 0;

5
mkspecs/features/default_pre.prf
View File

@ -16,7 +16,7 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG
qtPrepareTool(QMAKE_SYNCQT, syncqt)
isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$OUT_PWD
MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] $$QTFWD -generator $$MAKEFILE_GENERATOR -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_)
MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] $$QTFWD -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_)
!silent:message($$MSG)
system($$MSG) {
# success! Nothing to do
@ -24,6 +24,9 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG
error("Failed to run: $$MSG")
}
# Do configure tests now. Fatal tests have a non zero return.
system("perl $$[QT_HOST_BINS/get]/qtmodule-configtests $$_PRO_FILE_PWD_ $$OUT_PWD $$[QT_HOST_PREFIX/get] $$MAKEFILE_GENERATOR")|error("Aborting.")
unset(QTFWD)
}