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

remove support for forwarding module pri creation via syncqt

Browse Source 
now that all modules have migrated, this dead code can be removed.

Change-Id: I5e9c7dd3fb271346d1b5f0e2930874da3e4d2d57
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-03 14:19:10 +02:00 committed by Qt by Nokia
parent 1329a57783
commit 311fe0e811
3 changed files with 11 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bin/syncqt
View File

@ -102,8 +102,6 @@ my $check_includes = 0;
my $copy_headers = 0;
my $create_uic_class_map = 0;
my $create_private_headers = 1;
my $module_fwd = "";
my $developer_build = 0;
my @modules_to_sync ;
$force_relative = 1 if ( -d "/System/Library/Frameworks" );
@ -136,10 +134,6 @@ sub showUsage
print " Create headers for <NAME> with original headers in\n";
print " <HEADERDIR> relative to <PROFILEDIR> \n";
print " -private Force copy private headers (default: " . ($create_private_headers ? "yes" : "no") . ")\n";
print " -module-fwd <PATH> Create fwd includes for module pri files in the given\n";
print " path (default: none)\n";
print " -developer-build Point libraries and binaries to a common directory for\n";
print " easy development\n";
print " -help This help\n";
exit 0;
}
@ -625,12 +619,6 @@ while ( @ARGV ) {
$arg eq "-relative" || $arg eq "-check-includes") {
$var = substr($arg, 1);
$val = "yes";
} elsif($arg eq "-module-fwd") {
$var = "module_fwd";
$val = shift @ARGV;
} elsif($arg eq "-developer-build") {
$var = "developer_build";
$val = "yes";
} elsif($arg =~ /^-no-(.*)$/) {
$var = $1;
$val = "no";
@ -739,10 +727,6 @@ while ( @ARGV ) {
} else {
die "The -qtdir option requires an argument";
}
} elsif ($var eq "module_fwd") {
$module_fwd = $val;
} elsif ($var eq "developer_build") {
$developer_build = 1;
} elsif ($var eq "output") {
my $outdir = $val;
if(checkRelative($outdir)) {
@ -1130,30 +1114,6 @@ foreach my $lib (@modules_to_sync) {
close HEADERS_PRI_FILE;
print "$lib: created headers.pri file\n" if($verbose_level);
}
# create forwarding module pri in qtbase/mkspecs/modules
if ($module_fwd) {
my $modulepri = $modulepris{$lib};
if (defined $modulepri and -e $modulepri) {
my $modulepriname = basename($modulepri);
make_path($module_fwd, $lib, $verbose_level);
my $moduleprifwd = "$module_fwd/$modulepriname";
my $mod_base = $basedir;
my $mod_component_base = $developer_build ? $qtbasedir : $out_basedir;
open MODULE_PRI_FILE, ">$moduleprifwd" or die("Could not open $moduleprifwd for writing");
print MODULE_PRI_FILE "QT_MODULE_BASE = $mod_base\n";
print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $mod_component_base/bin\n";
print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n";
print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $mod_component_base/imports\n";
print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $mod_component_base/lib\n";
print MODULE_PRI_FILE "QT_MODULE_PLUGIN_BASE = $mod_component_base/plugins\n";
print MODULE_PRI_FILE "include($modulepri)\n";
close MODULE_PRI_FILE;
utime(time, (stat($modulepri))[9], $moduleprifwd);
} elsif ($modulepri) {
print "$lib: WARNING: Module\'s pri file '$modulepri' not found.\n$lib: Skipped creating forwarding pri.\n";
}
}
}
}
unless($showonly || !$create_uic_class_map) {

26
mkspecs/features/default_pre.prf
View File

@ -2,31 +2,27 @@ load(exclusive_builds)
CONFIG = lex yacc warn_on debug exceptions $$CONFIG
!build_pass:exists($$_PRO_FILE_PWD_/sync.profile) {
# If the install directory is a build directory, we tell syncqt to do a -developer-build.
QTDIR = $$[QT_HOST_DATA]
exists($$QTDIR/.qmake.cache) {
QTFWD = -module-fwd $$QTDIR/mkspecs/modules -developer-build
} else {
isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$OUT_PWD
modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules
QTFWD = -module-fwd $$modpath
!isEmpty(_QMAKE_SUPER_CACHE_):!contains(QMAKEMODULES, $$modpath): \
cache(QMAKEMODULES, add super, modpath)
unset(modpath)
!exists($$[QT_HOST_DATA]/.qmake.cache) {
!isEmpty(_QMAKE_SUPER_CACHE_) {
# When doing a -prefix build of top-level qt5/qt.pro, we need to announce
# this repo's module pris' location to the other repos.
isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$OUT_PWD
modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules
!contains(QMAKEMODULES, $$modpath): \
cache(QMAKEMODULES, add super, modpath)
unset(modpath)
}
}
qtPrepareTool(QMAKE_SYNCQT, syncqt)
isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$OUT_PWD
MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] $$QTFWD -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_)
MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_)
!silent:message($$MSG)
system($$MSG) {
# success! Nothing to do
} else {
error("Failed to run: $$MSG")
}
unset(QTFWD)
}
# Populate the installdir which will be passed to qdoc in the default_post.prf

8
mkspecs/features/qt_module_fwdpri.prf
View File

@ -11,12 +11,6 @@
# Permit modules to enforce being built outside QTDIR.
force_independent: mod_component_base = $$MODULE_BASE_OUTDIR
# This check will be removed soon. Weird indentation to avoid reindenting the code later.
syncprofile = $$cat($$MODULE_PROFILE_DIR/sync.profile, lines)
contains(syncprofile, "^%modulepris.*") {
MODULE_FWD_PRI = $$mod_qmake_base/mkspecs/modules/$$replace(MODULE_PRI, ^.*/,)
} else {
MODULE_FWD_PRI = $$mod_qmake_base/mkspecs/modules/qt_$${MODULE}.pri
# Create a forwarding module .pri file
@ -31,8 +25,6 @@
write_file($$MODULE_FWD_PRI, MODULE_FWD_PRI_CONT)|error("Aborting.")
touch($$MODULE_FWD_PRI, $$MODULE_PRI)
} # create forwarding module pris
# Then, inject the new module into the current cache state
!contains(QMAKE_INTERNAL_INCLUDED_FILES, $$MODULE_PRI) { # before the actual include()!
added = $$MODULE_PRI $$MODULE_FWD_PRI