From 5dc71ff75eece02863f46a09aa5b0fe457d749b2 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Wed, 13 Dec 2023 12:57:45 +0100 Subject: [PATCH 1/5] Removed Ecdar-GUI-Web --- .gitmodules | 3 --- Ecdar-GUI-Web | 1 - src-tauri/tauri.conf.json | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 160000 Ecdar-GUI-Web diff --git a/.gitmodules b/.gitmodules index f51a327..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "Ecdar-GUI-Web"] - path = Ecdar-GUI-Web - url = https://github.com/ECDAR-AAU-SW-P5/Ecdar-GUI-Web.git diff --git a/Ecdar-GUI-Web b/Ecdar-GUI-Web deleted file mode 160000 index 7b93e3f..0000000 --- a/Ecdar-GUI-Web +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7b93e3f8f03a538fb992c86fcbe53eafda5deed2 diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 26a966a..3b87857 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "build": { - "beforeBuildCommand": "yarn --cwd=./Ecdar-GUI-Web/ build", - "beforeDevCommand": "yarn --cwd=./Ecdar-GUI-Web/ dev", + "beforeBuildCommand": "git submodule update --init --recursive && yarn --cwd=./Ecdar-GUI-Web install && yarn --cwd=./Ecdar-GUI-Web/ build", + "beforeDevCommand": "git submodule update --init --recursive && yarn --cwd=./Ecdar-GUI-Web install && yarn --cwd=./Ecdar-GUI-Web/ dev", "devPath": "http://localhost:5173", "distDir": "../Ecdar-GUI-Web/build/", "withGlobalTauri" : true From a857c2082c3c51a6cc11d870234257cf953ef47b Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Wed, 13 Dec 2023 13:20:04 +0100 Subject: [PATCH 2/5] Updated readme --- README.md | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 99c3e0d..912faba 100644 --- a/README.md +++ b/README.md @@ -2,55 +2,50 @@ A native implementation of Ecdar-GUI-Web -## Compile -Be shure to be in the root folder of the project and follow these steps -### Install Dependencies +### Install dependencies - -``` -$ git clone https://github.com/ECDAR-AAU-SW-P5/Ecdar-GUI-Web.git -``` +Install `node`, `yarn`, `protobuf` and `cargo` #### Linux - -Install `node`, `npm` and `cargo` ###### Arch ``` -$ sudo pacman -S cargo nodejs npm +sudo pacman -S cargo nodejs protobuf yarn ``` ###### Debian ``` -$ sudo apt install cargo node npm +sudo apt install cargo nodejs protobuf-compiler yarn ``` #### Mac +``` +brew install protobuf node yarn +``` #### Windows +[Protoc](https://www.geeksforgeeks.org/how-to-install-protocol-buffers-on-windows/) +[Yarn](https://classic.yarnpkg.com/lang/en/docs/install/#windows-stable) +[Node](https://nodejs.org/en/download) +[Cargo](https://doc.rust-lang.org/cargo/getting-started/installation.html) + -### Npm Dependencies -``` -$ npm i -g vite -$ cd Ecdar-GUI-WEB -$ npm install -$ cd .. -``` ### Cargo dependencies ``` -$ cargo install tauri-cli +cargo install tauri-cli ``` ### Run +How to Ecdar-GUI-Native #### Dev ``` -$ cargo tauri dev +cargo tauri dev ``` #### Release ``` -$ cargo tauri build +cargo tauri build ``` ###### Mac/Linux -The executable can be found at `./src-tauri/target/release/ecdar` +The executable can be found at `./target/release/ecdar` ###### Windows -The executable can be found at `.\src-tauri\target\release\ecdar.exe` +The executable can be found at `.\target\release\ecdar.exe` From b4af23b458a263a97b1d499f135a84cab4f17158 Mon Sep 17 00:00:00 2001 From: KamyaPA <92309613+KamyaPA@users.noreply.github.com> Date: Wed, 13 Dec 2023 13:45:20 +0100 Subject: [PATCH 3/5] Update README.md --- README.md | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 912faba..87dd0ca 100644 --- a/README.md +++ b/README.md @@ -8,34 +8,42 @@ A native implementation of Ecdar-GUI-Web Install `node`, `yarn`, `protobuf` and `cargo` #### Linux -###### Arch -``` -sudo pacman -S cargo nodejs protobuf yarn -``` ###### Debian ``` sudo apt install cargo nodejs protobuf-compiler yarn ``` +###### Arch +``` +sudo pacman -S cargo nodejs protobuf yarn +``` + + #### Mac ``` brew install protobuf node yarn ``` +Install [Cargo](https://doc.rust-lang.org/cargo/getting-started/installation.html) + #### Windows -[Protoc](https://www.geeksforgeeks.org/how-to-install-protocol-buffers-on-windows/) -[Yarn](https://classic.yarnpkg.com/lang/en/docs/install/#windows-stable) -[Node](https://nodejs.org/en/download) -[Cargo](https://doc.rust-lang.org/cargo/getting-started/installation.html) +Install [Protoc](https://www.geeksforgeeks.org/how-to-install-protocol-buffers-on-windows/) + +Install [Yarn](https://classic.yarnpkg.com/lang/en/docs/install/#windows-stable) + +Install [Node](https://nodejs.org/en/download) + +Install [Cargo](https://doc.rust-lang.org/cargo/getting-started/installation.html) ### Cargo dependencies +To run tauri applications some need to install tauri cli ``` cargo install tauri-cli ``` ### Run -How to Ecdar-GUI-Native +How to run Ecdar-GUI-Native #### Dev ``` cargo tauri dev @@ -44,8 +52,8 @@ cargo tauri dev ``` cargo tauri build ``` - +In release the executable can be found at ###### Mac/Linux -The executable can be found at `./target/release/ecdar` +```./target/release/ecdar``` ###### Windows -The executable can be found at `.\target\release\ecdar.exe` +```.\target\release\ecdar.exe``` From d9976b65a293f70b14c6fc6dcaa1a9a697417494 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Wed, 13 Dec 2023 13:53:37 +0100 Subject: [PATCH 4/5] Readded git EcdarGuiWeb --- .gitmodules | 4 ++++ Ecdar-GUI-Web | 1 + 2 files changed, 5 insertions(+) create mode 160000 Ecdar-GUI-Web diff --git a/.gitmodules b/.gitmodules index e69de29..5c6fd3c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "Ecdar-GUI-Web"] + path = Ecdar-GUI-Web + url = https://github.com/ECDAR-AAU-SW-P5/Ecdar-GUI-Web + branch = main diff --git a/Ecdar-GUI-Web b/Ecdar-GUI-Web new file mode 160000 index 0000000..b6ee55b --- /dev/null +++ b/Ecdar-GUI-Web @@ -0,0 +1 @@ +Subproject commit b6ee55b5a0f07178335b7e463c71ba9776fa676b From 593c1a7fecb8798d1d32632b0985356eb79becde Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 15 Dec 2023 09:43:07 +0100 Subject: [PATCH 5/5] Tweak installation instructions --- README.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 87dd0ca..27b0e62 100644 --- a/README.md +++ b/README.md @@ -5,24 +5,23 @@ A native implementation of Ecdar-GUI-Web ### Install dependencies -Install `node`, `yarn`, `protobuf` and `cargo` +Install `node`, `protobuf`, and `cargo` #### Linux ###### Debian ``` -sudo apt install cargo nodejs protobuf-compiler yarn +sudo apt install cargo nodejs protobuf-compiler ``` ###### Arch ``` -sudo pacman -S cargo nodejs protobuf yarn +sudo pacman -S cargo nodejs protobuf ``` - #### Mac ``` -brew install protobuf node yarn +brew install protobuf node ``` Install [Cargo](https://doc.rust-lang.org/cargo/getting-started/installation.html) @@ -30,18 +29,26 @@ Install [Cargo](https://doc.rust-lang.org/cargo/getting-started/installation.htm #### Windows Install [Protoc](https://www.geeksforgeeks.org/how-to-install-protocol-buffers-on-windows/) -Install [Yarn](https://classic.yarnpkg.com/lang/en/docs/install/#windows-stable) - Install [Node](https://nodejs.org/en/download) Install [Cargo](https://doc.rust-lang.org/cargo/getting-started/installation.html) ### Cargo dependencies -To run tauri applications some need to install tauri cli +To run tauri applications, some need to install tauri cli ``` cargo install tauri-cli ``` + +### Git dependencies +To install and initialize all submodules, run +``` +git submodule update --init --recursive +``` + +### Ecdar-GUI-Web dependencies +Open the `Ecdar-GUI-Web` submodule, and follow its installation instructions to ensure that it can compile itself. + ### Run How to run Ecdar-GUI-Native #### Dev