Skip to content

Commit 86637de

Browse files
committed
reorganize
1 parent c65e6e0 commit 86637de

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
.vscode
22

3-
# Scala-IDE specific
4-
.scala_dependencies
5-
.worksheet
6-
.idea/
7-
83
# macOS specific
94
.DS_Store
105

@@ -15,3 +10,4 @@
1510
Cargo.lock
1611

1712
zarr-matlab/rust/*/target
13+
/target

Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[workspace]
2+
resolver = "2"
3+
members = [
4+
"zarr-matlab/rust/zarr_mex",
5+
]

zarr-matlab/rust/wkw_init/target/.rustc_info.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

zarr-matlab/rust/wkw_save/target/.rustc_info.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

zarr-matlab/zarrBuild.m

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ function zarrBuild()
2020
% make link paths available for cargo
2121
exportExtraLinkPaths(extraLinkPaths);
2222

23-
%buildWithCargo('wkw_compress', 'wkwCompress');
24-
%buildWithCargo('wkw_init', 'wkwInit');
2523
buildWithCargo('zarr_mex', 'zarrMex');
26-
%buildWithCargo('wkw_save', 'wkwSaveRoi');
2724
end
2825

2926
function buildWithCargo(oldName, newName)
@@ -42,14 +39,14 @@ function buildWithCargo(oldName, newName)
4239
[~, unameResult] = system('uname -m');
4340
if strcmp(strtrim(unameResult),'arm64')
4441
system('cargo build --release --target=aarch64-apple-darwin');
45-
libDir = fullfile(cargoDir, 'target', 'aarch64-apple-darwin', 'release');
42+
libDir = fullfile(thisDir, '..', 'target', 'aarch64-apple-darwin', 'release');
4643
else
4744
system('cargo build --release --target=x86_64-apple-darwin');
48-
libDir = fullfile(cargoDir, 'target', 'x86_64-apple-darwin', 'release');
45+
libDir = fullfile(thisDir, '..', 'target', 'x86_64-apple-darwin', 'release');
4946
end
5047
else
5148
system('cargo build --release');
52-
libDir = fullfile(cargoDir, 'target', 'release');
49+
libDir = fullfile(thisDir, '..', 'target', 'release');
5350
end
5451

5552
% rename library

0 commit comments

Comments
 (0)