cthrace/collabvm-1.2.ts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cvm-rs build on Windows, replace Just with yarn builtin, make clean work on Windows

Browse Source
This commit is contained in:
MDMCK10
2024-08-02 21:01:53 +02:00
parent 11380f00cf
commit ddcba7b308
6 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Justfile
View File

@@ -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

3
cvm-rs/Cargo.lock generated
View File

@@ -61,8 +61,9 @@ dependencies = [
[[package]] [[package]]
name = "cvm-rs" name = "cvm-rs"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"libc",
"neon", "neon",
"once_cell", "once_cell",
"tokio", "tokio",

3
cvm-rs/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package] [package]
name = "cvm-rs" name = "cvm-rs"
description = "Rust utility library for cvmts. Runs all the high performance code" description = "Rust utility library for cvmts. Runs all the high performance code"
version = "0.1.0" version = "0.1.1"
edition = "2021" edition = "2021"
exclude = ["index.node"] exclude = ["index.node"]
@@ -10,6 +10,7 @@ crate-type = ["cdylib"]
[dependencies] [dependencies]
neon = "1" neon = "1"
libc = "0.2.155"
# Required for JPEG # Required for JPEG
once_cell = "1.19.0" once_cell = "1.19.0"

2
cvm-rs/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "@cvmts/cvm-rs", "name": "@cvmts/cvm-rs",
"version": "0.1.0", "version": "0.1.1",
"packageManager": "yarn@4.1.1", "packageManager": "yarn@4.1.1",
"type": "module", "type": "module",
"main": "index.js", "main": "index.js",

2
cvm-rs/src/jpeg_compressor.rs
View File

@@ -45,7 +45,7 @@ impl JpegCompressor {
vec.resize(size, 0); vec.resize(size, 0);
let mut ptr: *mut u8 = vec.as_mut_ptr(); let mut ptr: *mut u8 = vec.as_mut_ptr();
let mut size: u64 = 0; let mut size: libc::c_ulong = 0;
let res = tjCompress2( let res = tjCompress2(
self.handle, self.handle,

6
package.json
View File

@@ -11,15 +11,15 @@
"@parcel/transformer-sass": "2.12.0", "@parcel/transformer-sass": "2.12.0",
"@parcel/transformer-typescript-types": "2.12.0", "@parcel/transformer-typescript-types": "2.12.0",
"@types/node": "^20.14.10", "@types/node": "^20.14.10",
"just-install": "^2.0.1",
"parcel": "^2.12.0", "parcel": "^2.12.0",
"prettier": "^3.2.5", "prettier": "^3.2.5",
"rimraf": "^6.0.1",
"typescript": "^5.4.4" "typescript": "^5.4.4"
}, },
"packageManager": "yarn@4.1.1", "packageManager": "yarn@4.1.1",
"scripts": { "scripts": {
"build": "just", "build": "yarn workspaces foreach -Apt run build",
"serve": "node cvmts/dist/index.js", "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"
} }
} }