diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-25 10:10:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-05-26 06:35:45 +0000 |
| commit | 63df649655a857599cc14dbe29a3e1647d927fb9 (patch) | |
| tree | 3a5c69db4518436e53463e3cd17294f19415d266 | |
| parent | bb418d2769e2025525f8ae05149b719fca4122b7 (diff) | |
Packaging: Get rid of binary-artifacts repository usage
We removed the cdbextension and wininterrupt binaries from there a long time
ago, and instead package these for the installer. Package newest jom version
from its actual release in the installer as well.
Task-number: QTCREATORBUG-23908
Change-Id: Ic9bdc97774cbeb894fc261e57af127d6cdc71205
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| -rw-r--r-- | cmake/QtCreatorIDEBranding.cmake | 1 | ||||
| -rw-r--r-- | qtcreator.pro | 10 | ||||
| -rw-r--r-- | qtcreator_ide_branding.pri | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 05f4a3fc77..e82e06f29d 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,4 +1,3 @@ -#BINARY_ARTIFACTS_BRANCH = master #PROJECT_USER_FILE_EXTENSION = .user set(IDE_VERSION "4.12.82") # The IDE version. diff --git a/qtcreator.pro b/qtcreator.pro index 02392bc9de..a8cb39fac3 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -124,14 +124,8 @@ macx { BINDIST_EXCLUDE_ARG.debug = $${BINDIST_EXCLUDE_ARG.release} deployqt.commands = python -u $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX/bin/$${IDE_APP_TARGET}\" \"$(QMAKE)\" deployqt.depends = install - win32:!isEmpty(BINARY_ARTIFACTS_BRANCH) { - deployartifacts.depends = install - deployartifacts.commands = git clone --depth 1 -b $$BINARY_ARTIFACTS_BRANCH \ - "http://code.qt.io/qt-creator/binary-artifacts.git" \ - && xcopy /s /q /y /i "binary-artifacts\\win32" \"$(INSTALL_ROOT)$$QTC_PREFIX\" \ - && rmdir /s /q binary-artifacts - QMAKE_EXTRA_TARGETS += deployartifacts - } + # legacy dummy target + win32: QMAKE_EXTRA_TARGETS += deployartifacts } INSTALLER_ARCHIVE_FROM_ENV = $$(INSTALLER_ARCHIVE) diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index e13aab6bf0..465db489e6 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -2,7 +2,6 @@ QTCREATOR_VERSION = 4.12.82 QTCREATOR_COMPAT_VERSION = 4.12.82 QTCREATOR_DISPLAY_VERSION = 4.13.0-beta1 QTCREATOR_COPYRIGHT_YEAR = 2020 -BINARY_ARTIFACTS_BRANCH = master IDE_DISPLAY_NAME = Qt Creator IDE_ID = qtcreator |