diff --git a/Justfile b/Justfile deleted file mode 100644 index 684a827..0000000 --- a/Justfile +++ /dev/null @@ -1,7 +0,0 @@ -all: - yarn workspace @cvmts/cvm-rs run build - yarn workspace @cvmts/collab-vm-1.2-binary-protocol run build - yarn workspace @cvmts/cvmts run build - -pkg: - yarn diff --git a/cvm-rs/Cargo.lock b/cvm-rs/Cargo.lock index 00d2143..be20b1b 100644 --- a/cvm-rs/Cargo.lock +++ b/cvm-rs/Cargo.lock @@ -61,8 +61,9 @@ dependencies = [ [[package]] name = "cvm-rs" -version = "0.1.0" +version = "0.1.1" dependencies = [ + "libc", "neon", "once_cell", "tokio", diff --git a/cvm-rs/Cargo.toml b/cvm-rs/Cargo.toml index 3b78185..849a736 100644 --- a/cvm-rs/Cargo.toml +++ b/cvm-rs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cvm-rs" description = "Rust utility library for cvmts. Runs all the high performance code" -version = "0.1.0" +version = "0.1.1" edition = "2021" exclude = ["index.node"] @@ -10,6 +10,7 @@ crate-type = ["cdylib"] [dependencies] neon = "1" +libc = "0.2.155" # Required for JPEG once_cell = "1.19.0" diff --git a/cvm-rs/package.json b/cvm-rs/package.json index 41d9dcb..6154c9e 100644 --- a/cvm-rs/package.json +++ b/cvm-rs/package.json @@ -1,6 +1,6 @@ { "name": "@cvmts/cvm-rs", - "version": "0.1.0", + "version": "0.1.1", "packageManager": "yarn@4.1.1", "type": "module", "main": "index.js", diff --git a/cvm-rs/src/jpeg_compressor.rs b/cvm-rs/src/jpeg_compressor.rs index 56248c4..40dd77f 100644 --- a/cvm-rs/src/jpeg_compressor.rs +++ b/cvm-rs/src/jpeg_compressor.rs @@ -45,7 +45,7 @@ impl JpegCompressor { vec.resize(size, 0); let mut ptr: *mut u8 = vec.as_mut_ptr(); - let mut size: u64 = 0; + let mut size: libc::c_ulong = 0; let res = tjCompress2( self.handle, diff --git a/package.json b/package.json index c1a3c67..de29ea2 100644 --- a/package.json +++ b/package.json @@ -11,15 +11,15 @@ "@parcel/transformer-sass": "2.12.0", "@parcel/transformer-typescript-types": "2.12.0", "@types/node": "^20.14.10", - "just-install": "^2.0.1", "parcel": "^2.12.0", "prettier": "^3.2.5", + "rimraf": "^6.0.1", "typescript": "^5.4.4" }, "packageManager": "yarn@4.1.1", "scripts": { - "build": "just", + "build": "yarn workspaces foreach -Apt run build", "serve": "node cvmts/dist/index.js", - "clean": "rm -rf .parcel-cache .yarn **/node_modules **/dist cvm-rs/target cvm-rs/index.node" + "clean": "npx rimraf .parcel-cache .yarn **/node_modules **/dist cvm-rs/target cvm-rs/index.node" } }