Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 23 additions & 85 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions mruby-math/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "mrubyedge-math"
version = "0.1.2"
version = "0.2.0"
edition = "2024"
authors = ["Uchio Kondo <udzura@udzura.jp>"]
description = "mruby-math provides Math module for mruby/edge"
license = "BSD-3-Clause"

[dependencies]
mrubyedge = { version = "1.1.9" }
mrubyedge = { version = "2.0.0" }

[dev-dependencies]
mrubyedge = { version = "1.1.9", features = ["default"] }
mec-mrbc-sys = "3.3.1"
mrubyedge = { version = "2.0.0", features = ["default"] }
mruby-compiler2-sys = "0.5.0"
4 changes: 2 additions & 2 deletions mruby-math/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ Add this to your `Cargo.toml`:

```toml
[dependencies]
mruby-math = "0.1.0"
mrubyedge = "1.1.1"
mruby-math = "0.2.0"
mrubyedge = "2.0.0"
```

Initialize the Math module in your VM:
Expand Down
32 changes: 3 additions & 29 deletions mruby-math/tests/helpers/mod.rs
Original file line number Diff line number Diff line change
@@ -1,34 +1,8 @@
#![allow(dead_code)]

use std::{ffi::CStr, fs::File, io::Write};

pub fn mrbc_compile(fname: &'static str, code: &'static str) -> Vec<u8> {
let mut src = std::env::temp_dir();
src.push(format!("{}.{}.rb", fname, std::process::id()));
let mut f = File::create(&src).expect("cannot open src file");
f.write_all(code.as_bytes())
.expect("cannot create src file");
f.flush().unwrap();

let mut src0 = src.as_os_str().to_string_lossy().into_owned();
src0.push('\0');

let mut dest = std::env::temp_dir();
dest.push(format!("{}.{}.mrb", fname, std::process::id()));
let mut dest0 = dest.as_os_str().to_string_lossy().into_owned();
dest0.push('\0');

let args = [
c"mrbc".as_ptr(),
c"-o".as_ptr(),
CStr::from_bytes_with_nul(dest0.as_bytes())
.unwrap()
.as_ptr(),
CStr::from_bytes_with_nul(src0.as_bytes()).unwrap().as_ptr(),
];
pub fn mrbc_compile(_fname: &'static str, code: &'static str) -> Vec<u8> {
unsafe {
mec_mrbc_sys::mrbc_main(args.len() as i32, args.as_ptr() as *mut *mut i8);
let mut context = mruby_compiler2_sys::MRubyCompiler2Context::new();
context.compile(code).unwrap()
}

std::fs::read(dest).unwrap()
}
8 changes: 4 additions & 4 deletions mruby-serde-json/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[package]
name = "mrubyedge-serde-json"
version = "0.1.2"
version = "0.2.0"
edition = "2024"
authors = ["Uchio Kondo <udzura@udzura.jp>"]
description = "mruby-serde-json provides JSON serialization/deserialization for mruby/edge using serde_json"
license = "BSD-3-Clause"

[dependencies]
mrubyedge = { version = "1.1.9" }
mrubyedge = { version = "2.0.0" }
serde = ">= 1.0.228"
serde_json = ">= 1.0.149"

[dev-dependencies]
mrubyedge = { version = "1.1.9", features = ["default"] }
mec-mrbc-sys = "3.3.1"
mrubyedge = { version = "2.0.0", features = ["default"] }
mruby-compiler2-sys = "0.5.0"
32 changes: 3 additions & 29 deletions mruby-serde-json/tests/helpers/mod.rs
Original file line number Diff line number Diff line change
@@ -1,34 +1,8 @@
#![allow(dead_code)]

use std::{ffi::CStr, fs::File, io::Write};

pub fn mrbc_compile(fname: &'static str, code: &'static str) -> Vec<u8> {
let mut src = std::env::temp_dir();
src.push(format!("{}.{}.rb", fname, std::process::id()));
let mut f = File::create(&src).expect("cannot open src file");
f.write_all(code.as_bytes())
.expect("cannot create src file");
f.flush().unwrap();

let mut src0 = src.as_os_str().to_string_lossy().into_owned();
src0.push('\0');

let mut dest = std::env::temp_dir();
dest.push(format!("{}.{}.mrb", fname, std::process::id()));
let mut dest0 = dest.as_os_str().to_string_lossy().into_owned();
dest0.push('\0');

let args = [
CStr::from_bytes_with_nul(b"mrbc\0").unwrap().as_ptr(),
CStr::from_bytes_with_nul(b"-o\0").unwrap().as_ptr(),
CStr::from_bytes_with_nul(dest0.as_bytes())
.unwrap()
.as_ptr(),
CStr::from_bytes_with_nul(src0.as_bytes()).unwrap().as_ptr(),
];
pub fn mrbc_compile(_fname: &'static str, code: &'static str) -> Vec<u8> {
unsafe {
mec_mrbc_sys::mrbc_main(args.len() as i32, args.as_ptr() as *mut *mut i8);
let mut context = mruby_compiler2_sys::MRubyCompiler2Context::new();
context.compile(code).unwrap()
}

std::fs::read(dest).unwrap()
}
8 changes: 4 additions & 4 deletions mruby-time/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[package]
name = "mrubyedge-time"
version = "0.1.3"
version = "0.2.0"
edition = "2024"
authors = ["Uchio Kondo <udzura@udzura.jp>"]
description = "mruby-time provides Time class for mruby/edge"
license = "BSD-3-Clause"

[dependencies]
mrubyedge = { version = "1.1.9" }
mrubyedge = { version = "2.0.0" }
libc = "0.2"

[dev-dependencies]
mrubyedge = { version = "1.1.9", features = ["default"] }
mec-mrbc-sys = "3.3.1"
mrubyedge = { version = "2.0.0", features = ["default"] }
mruby-compiler2-sys = "0.5.0"

[features]
default = []
Expand Down
Loading
Loading