flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 08:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjust artifacts filenames to schema type-os-version.extension

Browse Source
This commit is contained in:
Roland Winklmeier
2017-12-08 01:08:41 +01:00
parent 925c3d6210
commit b952c60f04
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
install.pri
View File

@@ -211,18 +211,18 @@ bitrock_builder_bin = $$(BITROCK_BUILDER)
WINDOWS64BITMODE = 0 WINDOWS64BITMODE = 0
win32 { win32 {
INSTALLER_PLATFORM = windows INSTALLER_PLATFORM = windows
INSTALLER_BASENAME = swift-installer-windows-$${WORD_SIZE}-$${BLACK_VERSION} INSTALLER_BASENAME = swiftinstaller-windows-$${WORD_SIZE}-$${BLACK_VERSION}
INSTALLER_EXT = exe INSTALLER_EXT = exe
equals(WORD_SIZE,64): WINDOWS64BITMODE = 1 equals(WORD_SIZE,64): WINDOWS64BITMODE = 1
} }
else:macx { else:macx {
INSTALLER_PLATFORM = osx INSTALLER_PLATFORM = osx
INSTALLER_BASENAME = swift-installer-macos-$${WORD_SIZE}-$${BLACK_VERSION} INSTALLER_BASENAME = swiftinstaller-macos-$${WORD_SIZE}-$${BLACK_VERSION}
INSTALLER_EXT = app INSTALLER_EXT = app
} }
else:unix { else:unix {
INSTALLER_PLATFORM = linux-x$${WORD_SIZE} 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 INSTALLER_EXT = run
} }
create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} $${INSTALLER_PLATFORM} \ create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} $${INSTALLER_PLATFORM} \

2
installer/installbuilder/createbundledmg.xml
View File

@@ -11,7 +11,7 @@
</setInstallerVariable> </setInstallerVariable>
<setInstallerVariableFromRegEx> <setInstallerVariableFromRegEx>
<name>installerBasename</name> <name>installerBasename</name>
<pattern>(swift-installer-macos-\d+-\d.\d.\d).app</pattern> <pattern>(swiftinstaller-macos-\d+-\d.\d.\d).app</pattern>
<substitution>\1</substitution> <substitution>\1</substitution>
<text>${project.installerFilename}</text> <text>${project.installerFilename}</text>
</setInstallerVariableFromRegEx> </setInstallerVariableFromRegEx>

4
scripts/jenkins.py
View File

@@ -96,7 +96,7 @@ class Builder:
version_segments = self.version.split('.') version_segments = self.version.split('.')
lastSegment = version_segments.pop() lastSegment = version_segments.pop()
version_without_timestamp = '.'.join(version_segments) 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_new = '.'.join([installer_name_old, lastSegment])
installer_name_old = installer_name_old + '.' + extension_map[platform.system()] installer_name_old = installer_name_old + '.' + extension_map[platform.system()]
installer_name_new = installer_name_new + '.' + 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.process(binary_path)
dumper.finish() dumper.finish()
os_map = {'Linux': 'linux', 'Darwin': 'macos', 'Windows': 'windows'} 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)) tar_path = path.abspath(path.join(self._get_swift_source_path(), tar_filename))
dumper.pack(tar_path) dumper.pack(tar_path)
if upload_symbols: if upload_symbols: