lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-10 21:40:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor: let Metadata::create_env_patched_bin handle compiler

Browse source 
defaults

In the previous commit, I had moved `LuaCompiler` construction into the
CLI command, which was not necessary. This reverts that.
This commit is contained in:
Erica Marigold 2024-04-20 11:38:33 +05:30
parent 0070f132b0
commit d889031cc1
No known key found for this signature in database
GPG key ID: 2768CC0C23D245D1
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cli/build.rs
View file

@ -10,7 +10,6 @@ use async_zip::base::read::seek::ZipFileReader;
use clap::Parser; use clap::Parser;
use console::style; use console::style;
use directories::BaseDirs; use directories::BaseDirs;
use mlua::Compiler;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use thiserror::Error; use thiserror::Error;
use tokio::{ use tokio::{
@ -69,16 +68,9 @@ impl BuildCommand {
style("Compile").green().bold(), style("Compile").green().bold(),
style(input_path_displayed).underlined() style(input_path_displayed).underlined()
); );
let patched_bin = Metadata::create_env_patched_bin( let patched_bin = Metadata::create_env_patched_bin(base_exe_path, source_code.clone())
base_exe_path, .await
source_code.clone(), .context("failed to create patched binary")?;
Compiler::new()
.set_optimization_level(2)
.set_coverage_level(0)
.set_debug_level(1),
)
.await
.context("failed to create patched binary")?;
// And finally write the patched binary to the output file // And finally write the patched binary to the output file
println!( println!(

6
src/standalone/metadata.rs
View file

@ -51,8 +51,12 @@ impl Metadata {
pub async fn create_env_patched_bin( pub async fn create_env_patched_bin(
base_exe_path: PathBuf, base_exe_path: PathBuf,
script_contents: impl Into<Vec<u8>>, script_contents: impl Into<Vec<u8>>,
compiler: LuaCompiler,
) -> Result<Vec<u8>> { ) -> Result<Vec<u8>> {
let compiler = LuaCompiler::new()
.set_optimization_level(2)
.set_coverage_level(0)
.set_debug_level(1);
let mut patched_bin = fs::read(base_exe_path).await?; let mut patched_bin = fs::read(base_exe_path).await?;
// Compile luau input into bytecode // Compile luau input into bytecode