From 851f0d716572d0f75923d9de364cf60a68d87efc Mon Sep 17 00:00:00 2001 From: "leedongmyung[desktop]" Date: Wed, 15 Nov 2023 22:12:31 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=A6=BC=EC=9C=BC=EB=A1=9C=20=EB=82=98=EC=98=A4=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_win.yaml | 10 +++------- lib/oto/application.dart | 13 +++++++++++++ lib/oto/build/build_dart.dart | 5 +++-- lib/oto/build/build_dot_net.dart | 8 +++----- lib/oto/build/build_ios.dart | 26 ++++++++++++++------------ 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/build_win.yaml b/build_win.yaml index 631f513..390826c 100644 --- a/build_win.yaml +++ b/build_win.yaml @@ -3,7 +3,7 @@ common: workspace: "." commands: -### Version ¾²±â +### Version ���� - command: CreateAppData param: scm: Git @@ -12,17 +12,13 @@ commands: returnVersion: "" returnHash: "" -### ÇÁ·ÎÁ§Æ® ÆÐÅ°Áö ¾÷µ¥ÀÌÆ® -- command: BuildDart - param: {} - -### ½ÇÇà°¡´ÉÇÑ ÆÄÀÏ·Î ºôµå +### ���డ���� ���Ϸ� ���� - command: BuildDartCompile param: targetDartFile: "./bin/main.dart" buildFileName: oto_cli -### ÃÖÁ¾ zip ÆÄÀÏ ÇüÅ·ΠÀúÀå +### ���� zip ���� ���·� ���� - command: Zip param: zipFile: "/release/oto_win_v.zip" diff --git a/lib/oto/application.dart b/lib/oto/application.dart index 43e3752..b5b6357 100644 --- a/lib/oto/application.dart +++ b/lib/oto/application.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'dart:io'; +import 'package:dart_framework/platform/process.dart'; import 'package:dart_framework/utils/system_util.dart'; import 'package:oto_cli/oto/command.dart'; import 'package:oto_cli/oto/data/data.dart'; @@ -24,6 +25,8 @@ class Application { } Future build(BuildType buildType, {String? yamlContent}) async { + setKorean(); + Map? buildMap; Map? jenkinsMap; // var envArgs = envArguments(arguments); @@ -76,6 +79,16 @@ class Application { await execute(buildMap!); } + Future setKorean() async { + if (Platform.isWindows) { + var data = await ProcessExecutor.start( + StringBuffer('C:\\Windows\\System32\\chcp.com 65001')); + var exitCode = await data.process.exitCode; + print('======> Set Korean: ${exitCode == 0}'); + } + return simpleFuture; + } + Future execute(Map buildMap) async { var c = Completer(); DataBuild? build; diff --git a/lib/oto/build/build_dart.dart b/lib/oto/build/build_dart.dart index 9b5ad48..788904d 100644 --- a/lib/oto/build/build_dart.dart +++ b/lib/oto/build/build_dart.dart @@ -34,9 +34,10 @@ class BuildDart implements Command { ' && flutter pub run build_runner build --delete-conflicting-outputs'); } - var process = await ProcessExecutor.run(await appendShell(shell, command), + var process = await ProcessExecutor.start(await appendShell(shell, command), workspace: workspace); - print('#### Exit Code: ${process.exitCode.toString()}'); + var exitCode = await process.process.exitCode; + print('#### Exit Code: ${exitCode.toString()}'); var passCode = [0, 64]; //exitCode 65: package not defiend in pubspec.yaml var success = passCode.contains(process.exitCode); diff --git a/lib/oto/build/build_dot_net.dart b/lib/oto/build/build_dot_net.dart index f674ff1..4db01af 100644 --- a/lib/oto/build/build_dot_net.dart +++ b/lib/oto/build/build_dot_net.dart @@ -13,14 +13,12 @@ class BuildDotNet implements Command { var data = DataBuildDotNet.fromJson(command.param); var workspace = Application.instance.jenkinsData!.workspace; var shell = StringBuffer(); - // shell.writeln('C:\\Windows\\System32\\chcp.com 65001'); shell.writeln('cd $workspace'); shell.writeln( 'MSBuild ${data.projectFile} /t:build /p:Configuration=Release;Platform=x86'); - var process = await ProcessExecutor.run(shell, workspace: workspace); - // var exitCode = await process.process.exitCode; - // c.complete(process.isSuccess); - c.complete(process.exitCode == 0); + var process = await ProcessExecutor.start(shell, workspace: workspace); + var exitCode = await process.process.exitCode; + c.complete(exitCode == 0); return c.future; } } diff --git a/lib/oto/build/build_ios.dart b/lib/oto/build/build_ios.dart index 1f70dee..5940d4f 100644 --- a/lib/oto/build/build_ios.dart +++ b/lib/oto/build/build_ios.dart @@ -34,14 +34,16 @@ class BuildiOS implements Command { shell.write( ' && xcodebuild -workspace $workspacePath -scheme ${data.scheme} -destination $destination'); - var process = await ProcessExecutor.run(shell, workspace: workspace); - print('#### Exit Code: ${process.exitCode.toString()}'); - var success = process.exitCode == 0; + // var process = await ProcessExecutor.run(shell, workspace: workspace); + var processData = await ProcessExecutor.start(shell, workspace: workspace); + var exitCode = await processData.process.exitCode; + print('#### Exit Code: $exitCode'); + var success = exitCode == 0; if (success) { c.complete(success); return c.future; } else { - if (process.exitCode == 31) { + if (exitCode == 31) { data.cleanPod = true; command.param = data.toJson(); return await execute(command); @@ -68,10 +70,10 @@ class ArchiveiOS implements Command { shell.write( 'xcodebuild -workspace $workspacePath -scheme ${data.scheme} -archivePath $archivePath archive'); - var process = await ProcessExecutor.run(shell, workspace: workspace); - print('#### Exit Code: ${process.exitCode.toString()}'); - var success = process.exitCode == 0; - c.complete(success); + var processData = await ProcessExecutor.start(shell, workspace: workspace); + var exitCode = await processData.process.exitCode; + print('#### Exit Code: $exitCode'); + c.complete(exitCode == 0); return c.future; } } @@ -93,10 +95,10 @@ class ExportiOS implements Command { shell.write( 'xcodebuild -exportArchive -archivePath $archivePath -exportPath $exportPath -exportOptionsPlist $exportOptionPlistPath'); - var process = await ProcessExecutor.run(shell, workspace: workspace); - print('#### Exit Code: ${process.exitCode.toString()}'); - var success = process.exitCode == 0; - c.complete(success); + var processData = await ProcessExecutor.start(shell, workspace: workspace); + var exitCode = await processData.process.exitCode; + print('#### Exit Code: $exitCode'); + c.complete(exitCode == 0); return c.future; } }