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>
This commit is contained in:
Eike Ziller
2020-05-25 10:10:01 +02:00
parent bb418d2769
commit 63df649655
3 changed files with 2 additions and 10 deletions

View File

@@ -1,4 +1,3 @@
#BINARY_ARTIFACTS_BRANCH = master
#PROJECT_USER_FILE_EXTENSION = .user
set(IDE_VERSION "4.12.82") # The IDE version.

View File

@@ -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)

View File

@@ -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