diff --git a/Cargo.lock b/Cargo.lock index 4238830..6f44943 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "app" -version = "0.3.1" +version = "0.4.0" dependencies = [ "enum-map", "fluent 0.15.0", @@ -2781,7 +2781,7 @@ dependencies = [ [[package]] name = "pslink" -version = "0.3.1" +version = "0.4.0" dependencies = [ "actix-files", "actix-identity", @@ -3507,7 +3507,7 @@ dependencies = [ [[package]] name = "shared" -version = "0.3.1" +version = "0.4.0" dependencies = [ "chrono", "enum-map", diff --git a/Makefile.toml b/Makefile.toml index 63c974d..8733dcc 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -13,6 +13,11 @@ extend = "build" description = "Build client and server in release mode" dependencies = ["build_client_release", "build_server_release"] +[tasks.build_standalone] +extend = "build" +description = "Build client and server with musl libc embedded" +dependencies = ["build_client_release", "build_server_standalone"] + [tasks.build_client] description = "Build client" install_crate = { crate_name = "wasm-pack", binary = "wasm-pack", test_arg = "-V" } @@ -35,20 +40,31 @@ extend = "build_server" description = "Build server in release mode" args = ["build", "--package", "pslink", "--release"] +[tasks.build_server_standalone] +extend = "build_server" +description = "Build server with the musl libc embedded" +args = ["build", "--package", "pslink", "--release", "--target", "x86_64-unknown-linux-musl"] + # ---- START ---- [tasks.start] -description = "Build and start Actix server with client on port 8000" +description = "Build and start the pslink server in debug mode" command = "cargo" args = ["run", "--package", "pslink", "--", "runserver"] dependencies = ["build"] [tasks.start_release] extend = "start" -description = "Build and start Actix server with client on port 8000 in release mode" +description = "Build and start the pslink server in release mode" args = ["run", "--package", "pslink", "--release", "--", "runserver"] dependencies = ["build_release"] +[tasks.start_standalone] +extend = "start" +description = "Build and start the pslink server with the musl c library embedded." +args = ["run", "--package", "pslink", "--release", "--", "runserver", "--target", "x86_64-unknown-linux-musl"] +dependencies = ["build_standalone"] + # ---- TEST ---- [tasks.test_firefox] diff --git a/README.md b/README.md index 365d332..4c5b1db 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ $ export SQLX_OFFLINE=1 $ cargo make build_release ``` -If pslink is built with `cargo build release --target=x86_64-unknown-linux-musl` everything is embedded and it should be portable to any 64bit linux system. Otherwise the same or newer version of libc needs to be installed on the target linux system. +If pslink is built with `cargo make build_standalone` everything is embedded and it should be portable to any 64bit linux system. Otherwise the same or newer version of libc needs to be installed on the target linux system. Note that you need to install `musl-gcc` for this to work using: `sudo dnf install musl-libc musl-gcc` or `sudo apt-get install musl-tools`. Templates and migrations are allways embedded in the binary so it should run standalone without anything extra. diff --git a/app/Cargo.toml b/app/Cargo.toml index 5eb3ee5..1cf8cce 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["url", "link", "webpage", "actix", "web"] license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/enaut/pslink/" -version = "0.3.1" +version = "0.4.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/pslink/Cargo.toml b/pslink/Cargo.toml index 23713fc..e4a01b3 100644 --- a/pslink/Cargo.toml +++ b/pslink/Cargo.toml @@ -9,7 +9,8 @@ license = "MIT OR Apache-2.0" name = "pslink" readme = "README.md" repository = "https://github.com/enaut/pslink/" -version = "0.3.1" +version = "0.4.0" + [build-dependencies] actix-web-static-files = "3.0" diff --git a/pslink/static/wasm/README.md b/pslink/static/wasm/README.md new file mode 100644 index 0000000..576b56e --- /dev/null +++ b/pslink/static/wasm/README.md @@ -0,0 +1,11 @@ +# The Frontend for pslink + +This part of `pslink` is the wasm binary for the frontend of `pslink`. + +It provides: + * a login screen + * management for links + * management for users + * switching the language + +The wasm binary communicates via a REST-JSON-Api with the server. \ No newline at end of file diff --git a/shared/Cargo.toml b/shared/Cargo.toml index e080f08..0c9e770 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" name = "shared" readme = "../pslink/README.md" repository = "https://github.com/enaut/pslink/" -version = "0.3.1" +version = "0.4.0" [dependencies] serde = "1.0"