Mirrors/ftw
2
0
Fork 0
mirror of https://github.com/macalimlim/ftw synced 2024-11-10 12:34:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

use Path to get current directory

Browse source
This commit is contained in:
Michael Angelo Calimlim 2023-10-22 08:43:49 +08:00
parent ad200a6df1
commit eb0ba4546c
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ftw_command.rs
View file

@ -1036,7 +1036,7 @@ enable-cross-compilation=true
build_type: FtwBuildType::Debug, build_type: FtwBuildType::Debug,
}; };
let _ = cmd.process(); let _ = cmd.process();
let _ = env::set_current_dir(Path::new("../../")); let _ = env::set_current_dir(Path::new("../"));
assert!(project assert!(project
.read("rust/Cargo.toml") .read("rust/Cargo.toml")
.contains(&project.get_name())); .contains(&project.get_name()));

9
src/ftw_compiler.rs
View file

@ -8,7 +8,6 @@ use crate::util;
use command_macros::cmd; use command_macros::cmd;
use fs_extra::dir::CopyOptions; use fs_extra::dir::CopyOptions;
use fs_extra::{move_items, remove_items}; use fs_extra::{move_items, remove_items};
use std::env;
use std::path::Path; use std::path::Path;
pub enum FtwCompiler { pub enum FtwCompiler {
@ -36,7 +35,7 @@ impl Compiler for FtwCompiler {
target: _, target: _,
build_type: _, build_type: _,
} => { } => {
let current_dir = env::current_dir()?; let current_dir = Path::new(".").canonicalize()?;
let current_dir_display = current_dir.display(); let current_dir_display = current_dir.display();
let volume_mount = format!("{current_dir_display}:/build"); let volume_mount = format!("{current_dir_display}:/build");
cmd!(docker run ("-v") (volume_mount) cmd!(docker run ("-v") (volume_mount)
@ -74,7 +73,7 @@ impl Compiler for FtwCompiler {
let build_type_cli_arg = build_type.to_cli_arg(); let build_type_cli_arg = build_type.to_cli_arg();
let target_lib_ext = target.to_lib_ext(); let target_lib_ext = target.to_lib_ext();
let cargo_build_cmd = format!("cargo build --target {target_cli_arg} {build_type_cli_arg} ; mv -b ./target/{target_cli_arg}/{build_type}/*.{target_lib_ext} ./lib/{target_cli_arg}"); let cargo_build_cmd = format!("cargo build --target {target_cli_arg} {build_type_cli_arg} ; mv -b ./target/{target_cli_arg}/{build_type}/*.{target_lib_ext} ./lib/{target_cli_arg}");
let current_dir = env::current_dir()?; let current_dir = Path::new(".").canonicalize()?;
let current_dir_display = current_dir.display(); let current_dir_display = current_dir.display();
let volume_mount = format!("{current_dir_display}:/build"); let volume_mount = format!("{current_dir_display}:/build");
cmd!(docker run ("-v") (volume_mount) cmd!(docker run ("-v") (volume_mount)
@ -100,8 +99,8 @@ impl Compiler for FtwCompiler {
let export_path = format!("../bin/{target_cli_arg}/{crate_name}.{build_type}.{target_cli_arg}{target_app_ext}"); let export_path = format!("../bin/{target_cli_arg}/{crate_name}.{build_type}.{target_cli_arg}{target_app_ext}");
let current_platform = util::get_current_platform().parse().unwrap_or_default(); let current_platform = util::get_current_platform().parse().unwrap_or_default();
let godot_executable = util::get_godot_exe_for_exporting(current_platform); let godot_executable = util::get_godot_exe_for_exporting(current_platform);
env::set_current_dir(Path::new("./godot"))?;
cmd!((godot_executable.as_str())(build_type_export_arg)(export_name)(export_path)) cmd!((godot_executable.as_str())(build_type_export_arg)(export_name)(export_path))
.current_dir("./godot")
.run() .run()
} }
FtwCompiler::Cross { target, build_type } => { FtwCompiler::Cross { target, build_type } => {
@ -114,7 +113,7 @@ impl Compiler for FtwCompiler {
let export_path = format!("../bin/{target_cli_arg}/{crate_name}.{build_type}.{target_cli_arg}{target_app_ext}"); let export_path = format!("../bin/{target_cli_arg}/{crate_name}.{build_type}.{target_cli_arg}{target_app_ext}");
let godot_export_cmd = let godot_export_cmd =
format!("cd godot/ ; godot_headless --export '{export_name}' {export_path}"); format!("cd godot/ ; godot_headless --export '{export_name}' {export_path}");
let current_dir = env::current_dir()?; let current_dir = Path::new(".").canonicalize()?;
let current_dir_display = current_dir.display(); let current_dir_display = current_dir.display();
let volume_mount = format!("{current_dir_display}:/build"); let volume_mount = format!("{current_dir_display}:/build");
cmd!(docker run ("-v") (volume_mount) cmd!(docker run ("-v") (volume_mount)