qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QmlDom: Remove the standalone version of QmlDom 

Change-Id: Icf3194b0a6ce52622a4eef5b3e20bc5180661a20
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit b153740606)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Casimir Saastamoinen <casimir.saastamoinen@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Olivier De Cannière 2023-05-04 10:31:12 +02:00 committed by Ulf Hermann
parent a67e0a6e51
commit 09b73218cb
11 changed files with 5 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
coin/instructions/coin_dom_standalone_old_qt_mac.yaml
View File

@ -1,69 +0,0 @@
type: Group
instructions:
- type: SetBuildDirectory
directory: "{{.SourceDir}}/examples/qml/qmldom"
- type: MakeDirectory
directory: "{{.BuildDir}}/qt63"
- type: ChangeDirectory
directory: "{{.BuildDir}}/qt63"
- type: EnvironmentVariable
variableName: CONFIGURE_ENV_PREFIX
variableValue: "{{.Env.ENV_PREFIX}}"
- type: ExecuteCommand
command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtbase/qtbase-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z -o qtbase.7z"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtbase/qtbase-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z failed
- type: ExecuteCommand
command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtdeclarative/qtdeclarative-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z -o qtdeclarative.7z"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
Download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtdeclarative/qtdeclarative-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z failed
- type: ExecuteCommand
command: "7za x qtbase.7z"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
Uncompress of qtbase failed.
- type: ExecuteCommand
command: "7za x qtdeclarative.7z"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
Uncompress of qtdeclarative failed.
- type: ExecuteCommand
command: "{{.Env.ENV_PREFIX}} cmake -S {{.SourceDir}}/examples/qml/qmldom -B standalone63 -DCMAKE_PREFIX_PATH={{.BuildDir}}/qt63"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
configuration of qmldom standalone on Qt 6.3 failed
- type: ExecuteCommand
command: "{{.Env.ENV_PREFIX}} cmake --build standalone63"
ignoreExitCode: false
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 1800
userMessageOnFailure: >
Compilation of qmldom standalone on Qt 6.3 FAILED, see the log for details.
- type: ExecuteCommand
command: "./standalone63/qmldomloadeditwrite"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
Run of qmldom standalone on Qt 6.3 FAILED
enable_if:
condition: and
conditions:
- condition: property
property: target.arch
contains_value: X86_64
- condition: property
property: target.os
contains_value: MacOS

75
coin/instructions/coin_dom_standalone_old_qt_win.yaml
View File

@ -1,75 +0,0 @@
type: Group
instructions:
- type: SetBuildDirectory
directory: "{{.SourceDir}}/examples/qml/qmldom"
- type: MakeDirectory
directory: "{{.BuildDir}}/qt63"
- type: ChangeDirectory
directory: "{{.BuildDir}}/qt63"
- type: EnvironmentVariable
variableName: CONFIGURE_ENV_PREFIX
variableValue: "{{.Env.ENV_PREFIX}}"
- type: ExecuteCommand
command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtbase/qtbase-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z -o qtbase.7z"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtbase/qtbase-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z failed
- type: ExecuteCommand
command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtdeclarative/qtdeclarative-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z -o qtdeclarative.7z"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
Download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt/qtdeclarative/qtdeclarative-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z failed
- type: ExecuteCommand
command: "7z.exe x qtbase.7z"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
Uncompress of qtbase failed.
- type: ExecuteCommand
command: "7z.exe x qtdeclarative.7z"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
Uncompress of qtdeclarative failed.
- type: ExecuteCommand
command: "{{.Env.ENV_PREFIX}} cmake -S {{.SourceDir}}/examples/qml/qmldom -B standalone63 -DCMAKE_PREFIX_PATH={{.BuildDir}}/qt63"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
configuration of qmldom standalone on Qt 6.3 failed
- type: ExecuteCommand
command: "{{.Env.ENV_PREFIX}} cmake --build standalone63"
ignoreExitCode: false
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 1800
userMessageOnFailure: >
Compilation of qmldom standalone on Qt 6.3 FAILED, see the log for details.
- type: PrependToEnvironmentVariable
variableName: PATH
variableValue: "{{.BuildDir}}/qt63/bin;"
- type: ExecuteCommand
command: "./standalone63/qmldomloadeditwrite"
ignoreExitCode: false
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 900
userMessageOnFailure: >
Run of qmldom standalone on Qt 6.3 FAILED
enable_if:
condition: and
conditions:
- condition: property
property: target.arch
contains_value: X86_64
- condition: property
property: target.os
contains_value: Windows
- condition: property
property: target.compiler
contains_value: MSVC

2
coin/module_config.yaml
View File

@ -17,5 +17,3 @@ instructions:
Test:
- !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml"
- !include "{{qt/qtbase}}/coin_module_test_docs.yaml"
- !include "{{qt/qtdeclarative}}/coin_dom_standalone_old_qt_mac.yaml"
- !include "{{qt/qtdeclarative}}/coin_dom_standalone_old_qt_win.yaml"

6
src/qmldom/qqmldomelements_p.h
View File

@ -28,11 +28,7 @@
#include <QtCore/QMutexLocker>
#include <QtCore/QPair>
#ifdef QMLDOM_STANDALONE
# include "qmlcompiler/qqmljsscope_p.h"
#else
# include <private/qqmljsscope_p.h>
#endif
#include <private/qqmljsscope_p.h>
#include <functional>
#include <limits>

6
src/qmldom/qqmldomtypesreader.cpp
View File

@ -9,11 +9,7 @@
#include <QtQml/private/qqmljsparser_p.h>
#include <QtQml/private/qqmljslexer_p.h>
#include <QtQml/private/qqmljsengine_p.h>
#ifdef QMLDOM_STANDALONE
# include "qmlcompiler/qqmljstypedescriptionreader_p.h"
#else
# include <private/qqmljstypedescriptionreader_p.h>
#endif
#include <private/qqmljstypedescriptionreader_p.h>
#include <QtCore/qdir.h>

10
src/qmldom/qqmldomtypesreader_p.h
View File

@ -20,13 +20,9 @@
// for Q_DECLARE_TR_FUNCTIONS
#include <QtCore/qcoreapplication.h>
#ifdef QMLDOM_STANDALONE
# include "qmlcompiler/qqmljsmetatypes_p.h"
# include "qmlcompiler/qqmljsscope_p.h"
#else
# include <private/qqmljsmetatypes_p.h>
# include <private/qqmljsscope_p.h>
#endif
#include <private/qqmljsmetatypes_p.h>
#include <private/qqmljsscope_p.h>
QT_BEGIN_NAMESPACE
namespace QQmlJS {

1
tests/auto/qmldom/CMakeLists.txt
View File

@ -10,4 +10,3 @@ add_subdirectory(stringdumper)
add_subdirectory(merging)
add_subdirectory(reformatter)
add_subdirectory(combined)
add_subdirectory(standalone)

1
tests/auto/qmldom/combined/CMakeLists.txt
View File

@ -20,7 +20,6 @@ qt_internal_add_test(tst_dom_all
../domitem/tst_qmldomitem.h
../merging/tst_dommerging.h
../reformatter/tst_reformatter.h
../standalone/tst_standalone.h
INCLUDE_DIRECTORIES
..
DEFINES

5
tests/auto/qmldom/combined/tst_dom_all.cpp
View File

@ -7,7 +7,6 @@
#include "merging/tst_dommerging.h"
#include "path/tst_qmldompath.h"
#include "reformatter/tst_reformatter.h"
#include "standalone/tst_standalone.h"
#include <QtCore/qdebug.h>
@ -38,10 +37,6 @@ int main(int argc, char *argv[])
QQmlJS::Dom::TestReformatter test;
status |= QTest::qExec(&test, argc, argv);
}
{
QQmlJS::Dom::TestStandalone test;
status |= QTest::qExec(&test, argc, argv);
}
if (status)
qWarning() << "Combined test failed!";
return status;

39
tests/auto/qmldom/standalone/CMakeLists.txt
View File

@ -1,39 +0,0 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_dom_all Binary executing all tests together
## (simpler to verify coverage)
#####################################################################
# Collect test data
file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/..
domdata/*)
list(APPEND test_data ${test_data_glob})
set(QMLDOM_EXTERNAL_BUILD OFF CACHE BOOL "If the build is against an external Qt, and not tested inside a build of this Qt" FORCE)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/qmldom/standalone qmldomlib)
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
elseif (MINGW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj")
endif()
qt_internal_add_test(tst_standalone
SOURCES
tst_standalone.cpp
DEFINES
QT_DEPRECATED_WARNINGS
QT_QMLTEST_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/../domdata"
LIBRARIES
Qt::Core
Qt::QmlPrivate
qmldomlib
TESTDATA ${test_data}
)
qt_internal_extend_target(tst_standalone CONDITION ANDROID OR IOS
DEFINES
QT_QMLTEST_DATADIR=":/domdata"
)

5
tests/auto/qmldom/standalone/tst_standalone.cpp
View File

@ -1,5 +0,0 @@
// Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "tst_standalone.h"
QTEST_MAIN(QQmlJS::Dom::TestStandalone)