firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to using XZ instead of BZip2 for tar archives. (#13620)

Browse Source 
XZ is about 50MB smaller, and it works on both Mac and Linux.
This commit is contained in:
Greg Spencer 2017-12-15 16:40:49 -08:00 committed by GitHub
parent a43be998ec
commit a556ad095d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dev/bots/prepare_package.dart
View File

@ -42,12 +42,12 @@ class ArchiveCreator {
/// [tempDir] is the directory to use for creating the archive. Will place
/// several GiB of data there, so it should have available space.
/// [outputFile] is the name of the output archive. It should end in either
/// ".tar.bz2" or ".zip".
/// ".tar.xz" or ".zip".
/// The runner argument is used to inject a mock of [Process.runSync] for
/// testing purposes.
ArchiveCreator(this.tempDir, this.outputFile, {ProcessRunner runner})
: assert(outputFile.path.toLowerCase().endsWith('.zip') ||
outputFile.path.toLowerCase().endsWith('.tar.bz2')),
outputFile.path.toLowerCase().endsWith('.tar.xz')),
flutterRoot = new Directory(path.join(tempDir.path, 'flutter')),
_runner = runner ?? Process.runSync {
flutter = path.join(
@ -111,7 +111,7 @@ class ArchiveCreator {
void createArchive() {
if (outputFile.path.toLowerCase().endsWith('.zip')) {
createZipArchive(outputFile, flutterRoot);
} else if (outputFile.path.toLowerCase().endsWith('.tar.bz2')) {
} else if (outputFile.path.toLowerCase().endsWith('.tar.xz')) {
createTarArchive(outputFile, flutterRoot);
}
}
@ -153,7 +153,7 @@ class ArchiveCreator {
return _runProcess(git, args, workingDirectory: workingDirectory);
}
String createZipArchive(File output, Directory source) {
void createZipArchive(File output, Directory source) {
final List<String> args = <String>[
'-r',
'-9',
@ -162,17 +162,17 @@ class ArchiveCreator {
path.basename(source.absolute.path),
];
return _runProcess(zip, args,
_runProcess(zip, args,
workingDirectory: new Directory(path.dirname(source.absolute.path)));
}
String createTarArchive(File output, Directory source) {
void createTarArchive(File output, Directory source) {
final List<String> args = <String>[
'cjf',
'cJf',
output.absolute.path,
path.basename(source.absolute.path),
];
return _runProcess(tar, args,
_runProcess(tar, args,
workingDirectory: new Directory(path.dirname(source.absolute.path)));
}
}
@ -200,7 +200,7 @@ void main(List<String> argList) {
'output',
defaultsTo: null,
help: 'The path where the output archive should be written. '
'The suffix determines the output format: .tar.bz2 or .zip are the '
'The suffix determines the output format: .tar.xz or .zip are the '
'only formats supported.',
);
final ArgResults args = argParser.parse(argList);
@ -229,11 +229,11 @@ void main(List<String> argList) {
String outputFileString = args['output'];
if (outputFileString == null || outputFileString.isEmpty) {
final String suffix = Platform.isWindows ? '.zip' : '.tar.bz2';
final String suffix = Platform.isWindows ? '.zip' : '.tar.xz';
outputFileString = path.join(tmpDir.path, 'flutter_${args['revision']}$suffix');
} else if (!outputFileString.toLowerCase().endsWith('.zip') &&
!outputFileString.toLowerCase().endsWith('.tar.bz2')) {
errorExit('Output file has unsupported suffix. It should be either ".zip" or ".tar.bz2".');
!outputFileString.toLowerCase().endsWith('.tar.xz')) {
errorExit('Output file has unsupported suffix. It should be either ".zip" or ".tar.xz".');
}
final File outputFile = new File(outputFileString);

8
dev/bots/test/prepare_package_test.dart
View File

@ -66,7 +66,7 @@ void main() {
});
test('sets PUB_CACHE properly', () async {
outputFile = new File(path.join(tmpDir.absolute.path, 'flutter_master.tar.bz2'));
outputFile = new File(path.join(tmpDir.absolute.path, 'flutter_master.tar.xz'));
preparer = new ArchiveCreator(tmpDir, outputFile, runner: runner);
_answerWithResults();
results = <MockProcessResult>[new MockProcessResult('deadbeef\n', '', 0)];
@ -86,7 +86,7 @@ void main() {
});
test('calls the right commands for tar output', () async {
outputFile = new File(path.join(tmpDir.absolute.path, 'flutter_master.tar.bz2'));
outputFile = new File(path.join(tmpDir.absolute.path, 'flutter_master.tar.xz'));
preparer = new ArchiveCreator(tmpDir, outputFile, runner: runner);
_answerWithResults();
results = <MockProcessResult>[new MockProcessResult('deadbeef\n', '', 0)];
@ -106,7 +106,7 @@ void main() {
'$flutterExe create --template=package ${path.join(tmpDir.path, 'create_package')}',
'$flutterExe create --template=plugin ${path.join(tmpDir.path, 'create_plugin')}',
'$gitExe clean -f -X **/.packages',
'$tarExe cjf ${path.join(tmpDir.path, 'flutter_master.tar.bz2')} flutter',
'$tarExe cJf ${path.join(tmpDir.path, 'flutter_master.tar.xz')} flutter',
];
int step = 0;
for (String command in commands) {
@ -144,7 +144,7 @@ void main() {
});
test('throws when a command errors out', () async {
outputFile = new File(path.join(tmpDir.absolute.path, 'flutter.tar.bz2'));
outputFile = new File(path.join(tmpDir.absolute.path, 'flutter.tar.xz'));
preparer = new ArchiveCreator(
tmpDir,
outputFile,