diff --git a/install.pri b/install.pri index 1742ccead..9d745ff3a 100644 --- a/install.pri +++ b/install.pri @@ -211,18 +211,18 @@ bitrock_builder_bin = $$(BITROCK_BUILDER) WINDOWS64BITMODE = 0 win32 { INSTALLER_PLATFORM = windows - INSTALLER_BASENAME = swift-installer-windows-$${WORD_SIZE}-$${BLACK_VERSION} + INSTALLER_BASENAME = swiftinstaller-windows-$${WORD_SIZE}-$${BLACK_VERSION} INSTALLER_EXT = exe equals(WORD_SIZE,64): WINDOWS64BITMODE = 1 } else:macx { INSTALLER_PLATFORM = osx - INSTALLER_BASENAME = swift-installer-macos-$${WORD_SIZE}-$${BLACK_VERSION} + INSTALLER_BASENAME = swiftinstaller-macos-$${WORD_SIZE}-$${BLACK_VERSION} INSTALLER_EXT = app } else:unix { INSTALLER_PLATFORM = linux-x$${WORD_SIZE} - INSTALLER_BASENAME = swift-installer-linux-$${WORD_SIZE}-$${BLACK_VERSION} + INSTALLER_BASENAME = swiftinstaller-linux-$${WORD_SIZE}-$${BLACK_VERSION} INSTALLER_EXT = run } create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} $${INSTALLER_PLATFORM} \ diff --git a/installer/installbuilder/createbundledmg.xml b/installer/installbuilder/createbundledmg.xml index 952059a7c..132597478 100644 --- a/installer/installbuilder/createbundledmg.xml +++ b/installer/installbuilder/createbundledmg.xml @@ -11,7 +11,7 @@ installerBasename - (swift-installer-macos-\d+-\d.\d.\d).app + (swiftinstaller-macos-\d+-\d.\d.\d).app \1 ${project.installerFilename} diff --git a/scripts/jenkins.py b/scripts/jenkins.py index 5b8e65f77..a52da53bf 100644 --- a/scripts/jenkins.py +++ b/scripts/jenkins.py @@ -96,7 +96,7 @@ class Builder: version_segments = self.version.split('.') lastSegment = version_segments.pop() version_without_timestamp = '.'.join(version_segments) - installer_name_old = '-'.join(['swift', 'installer', os_map[platform.system()], self.word_size, version_without_timestamp]) + installer_name_old = '-'.join(['swiftinstaller', os_map[platform.system()], self.word_size, version_without_timestamp]) installer_name_new = '.'.join([installer_name_old, lastSegment]) installer_name_old = installer_name_old + '.' + extension_map[platform.system()] installer_name_new = installer_name_new + '.' + extension_map[platform.system()] @@ -132,7 +132,7 @@ class Builder: dumper.process(binary_path) dumper.finish() os_map = {'Linux': 'linux', 'Darwin': 'macos', 'Windows': 'windows'} - tar_filename = '-'.join(['swift', 'symbols', os_map[platform.system()], self.word_size, self.version]) + '.tar.gz' + tar_filename = '-'.join(['swiftsymbols', os_map[platform.system()], self.word_size, self.version]) + '.tar.gz' tar_path = path.abspath(path.join(self._get_swift_source_path(), tar_filename)) dumper.pack(tar_path) if upload_symbols: