Skip to content

Commit 10ef4d4

Browse files
committed
Update ports for supporting debug symbols.
1 parent 98c8100 commit 10ef4d4

File tree

10 files changed

+18
-17
lines changed

10 files changed

+18
-17
lines changed

.github/workflows/release-rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
os: [ubuntu-latest, macos-latest] # TODO: , windows-latest]
26+
os: [ubuntu-latest] # TODO: , macos-latest, windows-latest]
2727
steps:
2828
- name: Check out the repo
2929
uses: actions/checkout@v4

source/ports/node_port/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ const platformInstallPaths = () => {
6969
case 'win32':
7070
return {
7171
paths: [ path.join(process.env['LOCALAPPDATA'], 'MetaCall', 'metacall') ],
72-
name: 'metacall.dll'
72+
name: /^metacall(d)?\.dll$/
7373
}
7474
case 'darwin':
7575
return {
7676
paths: [ '/opt/homebrew/lib/', '/usr/local/lib/' ],
77-
name: 'libmetacall.dylib'
77+
name: /^libmetacall(d)?\.dylib$/
7878
}
7979
case 'linux':
8080
return {
8181
paths: [ '/usr/local/lib/', '/gnu/lib/' ],
82-
name: 'libmetacall.so'
82+
name: /^libmetacall(d)?\.so$/
8383
}
8484
}
8585

source/ports/node_port/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/ports/node_port/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "metacall",
3-
"version": "0.5.1",
3+
"version": "0.5.2",
44
"description": "Call Python, C#, Ruby... functions from NodeJS (a NodeJS Port for MetaCall)",
55
"repository": "github:metacall/core",
66
"bugs": "https://github.com/metacall/core/issues",

source/ports/py_port/metacall/api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ def platform_install_paths():
3636
if sys.platform == 'win32':
3737
return {
3838
'paths': [ os.path.join(os.environ.get('LOCALAPPDATA', ''), 'MetaCall', 'metacall') ],
39-
'name': r'metacall\.dll'
39+
'name': r'^metacall(d)?\.dll$'
4040
}
4141
elif sys.platform == 'darwin':
4242
return {
4343
'paths': [ '/opt/homebrew/lib/', '/usr/local/lib/' ],
44-
'name': r'libmetacall\.dylib'
44+
'name': r'^libmetacall(d)?\.dylib$'
4545
}
4646
elif sys.platform == 'linux':
4747
return {
4848
'paths': [ '/usr/local/lib/', '/gnu/lib/' ],
49-
'name': r'libmetacall\.so'
49+
'name': r'^libmetacall(d)?\.so$'
5050
}
5151
else:
5252
raise RuntimeError(f"Platform {sys.platform} not supported")

source/ports/py_port/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# Versions should comply with PEP440. For a discussion on single-sourcing
4040
# the version across setup.py and the project code, see
4141
# https://packaging.python.org/en/latest/single_source_version.html
42-
'version': '0.5.3',
42+
'version': '0.5.4',
4343

4444
'description': 'A library for providing inter-language foreign function interface calls',
4545
'long_description': long_description,

source/ports/rs_port/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ path = "src/lib.rs"
1919
metacall-inline = { version = "0.2.0", path = "./inline" }
2020

2121
[build-dependencies]
22-
metacall-sys = { version = "0.1.2", path = "./sys" }
22+
metacall-sys = { version = "0.1.3", path = "./sys" }
2323

2424
[workspace]
2525
members = [

source/ports/rs_port/sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "metacall-sys"
3-
version = "0.1.2"
3+
version = "0.1.3"
44
repository = "https://github.com/metacall/core/tree/develop/source/ports/rs_port/sys"
55
keywords = ["ffi", "bindings", "metacall"]
66
edition = "2021"

source/ports/rs_port/sys/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,20 @@ fn platform_install_paths() -> Result<InstallPath, Box<dyn std::error::Error>> {
6868
paths: vec![PathBuf::from(local_app_data)
6969
.join("MetaCall")
7070
.join("metacall")],
71-
names: vec!["metacall.lib"],
71+
names: vec!["metacall.lib", "metacalld.lib"],
7272
})
7373
} else if cfg!(target_os = "macos") {
7474
Ok(InstallPath {
7575
paths: vec![
7676
PathBuf::from("/opt/homebrew/lib/"),
7777
PathBuf::from("/usr/local/lib/"),
7878
],
79-
names: vec!["libmetacall.dylib"],
79+
names: vec!["libmetacall.dylib, libmetacalld.dylib"],
8080
})
8181
} else if cfg!(target_os = "linux") {
8282
Ok(InstallPath {
8383
paths: vec![PathBuf::from("/usr/local/lib/"), PathBuf::from("/gnu/lib/")],
84-
names: vec!["libmetacall.so"],
84+
names: vec!["libmetacall.so", "libmetacalld.so"],
8585
})
8686
} else {
8787
Err(format!("Platform {} not supported", env::consts::OS).into())

source/tests/metacall_cxx_port_test/source/metacall_cxx_port_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ TEST_F(metacall_cxx_port_test, DefaultConstructor)
126126
127127
auto fn = metacall::register_function(cxx_void_test);
128128
129-
EXPECT_EQ(nullptr, fn().to_value());
129+
fn(); // no return value
130+
130131
EXPECT_EQ(cxx_void_test_called, true);
131132
}
132133
*/

0 commit comments

Comments
 (0)