From 790aa4b360ae7d342de39307f86dedf2b6f8296e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2012 10:53:12 +0200 Subject: [PATCH 1/4] auto-generate module pris Change-Id: Ia7eb1091c62269a7787ad4a21aac8ecfa5a80f66 Reviewed-by: Oswald Buddenhagen --- src/modules/qt_v8.pri | 16 ---------------- src/v8/v8.pro | 2 +- sync.profile | 3 --- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 src/modules/qt_v8.pri diff --git a/src/modules/qt_v8.pri b/src/modules/qt_v8.pri deleted file mode 100644 index 89d6c26..0000000 --- a/src/modules/qt_v8.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.v8.VERSION = 5.0.0 -QT.v8.MAJOR_VERSION = 5 -QT.v8.MINOR_VERSION = 0 -QT.v8.PATCH_VERSION = 0 - -QT.v8.name = QtV8 -QT.v8.bins = $$QT_MODULE_BIN_BASE -QT.v8.includes = $$QT_MODULE_INCLUDE_BASE/QtV8 -QT.v8.private_includes = $$QT_MODULE_INCLUDE_BASE/QtV8/$$QT.v8.VERSION -QT.v8.sources = $$QT_MODULE_BASE/src/v8 -QT.v8.libs = $$QT_MODULE_LIB_BASE -QT.v8.plugins = $$QT_MODULE_PLUGIN_BASE -QT.v8.imports = $$QT_MODULE_IMPORT_BASE -QT.v8.depends = -QT.v8.DEFINES = -!contains(QT_CONFIG, static): QT.v8.DEFINES += V8_SHARED USING_V8_SHARED diff --git a/src/v8/v8.pro b/src/v8/v8.pro index f4959c7..3eec82e 100644 --- a/src/v8/v8.pro +++ b/src/v8/v8.pro @@ -5,7 +5,7 @@ QPRO_PWD = $$PWD QT = CONFIG += module -MODULE_PRI = ../modules/qt_v8.pri +!contains(QT_CONFIG, static): MODULE_DEFINES += V8_SHARED USING_V8_SHARED win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 diff --git a/sync.profile b/sync.profile index 365e554..14a2a4f 100644 --- a/sync.profile +++ b/sync.profile @@ -11,9 +11,6 @@ "qtv8version.h" => "QtV8Version", ); %mastercontent = (); -%modulepris = ( - "QtV8" => "$basedir/src/modules/qt_v8.pri", -); # Module dependencies. # Every module that is required to build this module should have one entry. From 572d090b01a901ba9050cddd17a1a3247d7dfd44 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 5 Apr 2012 14:45:38 +0200 Subject: [PATCH 2/4] switch to new-style configure tests Change-Id: Ia374567babe00a5ca0692e95e88b154d846e0882 Reviewed-by: Oswald Buddenhagen --- qtjsbackend.pro | 3 +++ src/v8/v8.pri | 2 +- sync.profile | 5 ----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/qtjsbackend.pro b/qtjsbackend.pro index b2c9a10..1f71ae0 100644 --- a/qtjsbackend.pro +++ b/qtjsbackend.pro @@ -1,3 +1,6 @@ +load(configure) +qtCompileTest(hardfloat) + TEMPLATE = subdirs module_qtjsbackend_src.subdir = src diff --git a/src/v8/v8.pri b/src/v8/v8.pri index e2b764e..45beffc 100644 --- a/src/v8/v8.pri +++ b/src/v8/v8.pri @@ -151,7 +151,7 @@ SOURCES += \ equals(V8_TARGET_ARCH, arm) { DEFINES += V8_TARGET_ARCH_ARM -contains(config_test_hardfloat, yes) { +config_hardfloat { DEFINES += USE_EABI_HARDFLOAT=1 } else { DEFINES += USE_EABI_HARDFLOAT=0 diff --git a/sync.profile b/sync.profile index 14a2a4f..111ce7d 100644 --- a/sync.profile +++ b/sync.profile @@ -21,8 +21,3 @@ %dependencies = ( "qtbase" => "refs/heads/master", ); - -# compile tests -%configtests = ( - "hardfloat" => {}, -); From f061136f333da509eefd9f4d7201066cd793f243 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2012 12:15:23 +0200 Subject: [PATCH 3/4] build system cleanups - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - pointless QPRO_PWD assignments - qmake -project boilerplate Change-Id: I7b2cd36920a2b56bf745965a8a682d85af3ed48e Reviewed-by: Oswald Buddenhagen --- src/tools/mkv8snapshot/mkv8snapshot.pro | 2 -- src/v8/v8.pro | 6 +----- sync.profile | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro index 41fa5df..0ccf5ec 100644 --- a/src/tools/mkv8snapshot/mkv8snapshot.pro +++ b/src/tools/mkv8snapshot/mkv8snapshot.pro @@ -7,8 +7,6 @@ CONFIG += console CONFIG += warn_off DESTDIR = ../../../bin -INCLUDEPATH += . -DEPENDPATH += . LIBS = OBJECTS_DIR = . diff --git a/src/v8/v8.pro b/src/v8/v8.pro index 3eec82e..e75d42c 100644 --- a/src/v8/v8.pro +++ b/src/v8/v8.pro @@ -1,10 +1,8 @@ -load(qt_module) +load(qt_build_config) TARGET = QtV8 -QPRO_PWD = $$PWD QT = -CONFIG += module !contains(QT_CONFIG, static): MODULE_DEFINES += V8_SHARED USING_V8_SHARED win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 @@ -20,8 +18,6 @@ INCLUDEPATH -= $$MODULE_PRIVATE_INCLUDES INCLUDEPATH -= $$MODULE_PRIVATE_INCLUDES/$$TARGET INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. -HEADERS += qtv8version.h - !contains(QT_CONFIG, static): DEFINES += V8_SHARED BUILDING_V8_SHARED include(v8.pri) diff --git a/sync.profile b/sync.profile index 111ce7d..05b86d2 100644 --- a/sync.profile +++ b/sync.profile @@ -7,10 +7,6 @@ @allmoduleheadersprivate = ( "QtV8" ); -%classnames = ( - "qtv8version.h" => "QtV8Version", -); -%mastercontent = (); # Module dependencies. # Every module that is required to build this module should have one entry. From daab0ec821a6a9b736be63670b6ca45aa25273e2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2012 19:57:03 +0200 Subject: [PATCH 4/4] compile mkv8snapshot in host mode this permits actually using it for x-compiles Change-Id: Id89e53cf2394e6f6773e2b06946769d4951eae80 Reviewed-by: Oswald Buddenhagen --- src/tools/mkv8snapshot/mkv8snapshot.pro | 17 ++++------------- src/tools/tools.pro | 2 +- src/v8/v8.pro | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro index 0ccf5ec..16beb02 100644 --- a/src/tools/mkv8snapshot/mkv8snapshot.pro +++ b/src/tools/mkv8snapshot/mkv8snapshot.pro @@ -1,10 +1,7 @@ -TEMPLATE = app -TARGET = mkv8snapshot -QT = -CONFIG -= app_bundle -CONFIG -= qt -CONFIG += console -CONFIG += warn_off +option(host_build) +TARGET = mkv8snapshot$$qtPlatformTargetSuffix() +CONFIG -= qt app_bundle +CONFIG += console warn_off DESTDIR = ../../../bin LIBS = @@ -13,12 +10,6 @@ OBJECTS_DIR = . contains(QT_CONFIG, build_all): CONFIG += build_all win32|mac:!macx-xcode: CONFIG += debug_and_release -TARGET = $$TARGET$$qtPlatformTargetSuffix() - -cross_compile { - equals(QT_ARCH, arm): V8_TARGET_ARCH = arm -} - include(../../v8/v8.pri) cross_compile { diff --git a/src/tools/tools.pro b/src/tools/tools.pro index d96f6fc..20037a3 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS = -!cross_compile:contains(QT_CONFIG, v8snapshot): SUBDIRS += mkv8snapshot +contains(QT_CONFIG, v8snapshot): SUBDIRS += mkv8snapshot diff --git a/src/v8/v8.pro b/src/v8/v8.pro index e75d42c..e6be168 100644 --- a/src/v8/v8.pro +++ b/src/v8/v8.pro @@ -22,7 +22,7 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. include(v8.pri) -!cross_compile:contains(QT_CONFIG, v8snapshot) { +contains(QT_CONFIG, v8snapshot) { mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} DUMMY_FILE = v8.pro mkv8snapshot.input = DUMMY_FILE