Skip to content
Snippets Groups Projects
Commit 4673edb5 authored by Manos Angelidis's avatar Manos Angelidis Committed by Ugo Albanese
Browse files

Merged in NRRPLT-8116 (pull request #72)

[NRRPLT-8116] Reverted the graphic SMACH code

- Kept the nginx conf that serves as a template for future
  external packages

Approved-by: Sandro Weber
Approved-by: Antoine Detailleur
parent b165b20b
No related branches found
No related tags found
No related merge requests found
......@@ -20,10 +20,11 @@ server {
root <HBP>/ExDFrontend/dist/;
}
location /frontendStateMachineEditor/ {
alias <HBP>/frontendStateMachineEditor/build/;
index index.html index.htm;
}
# template on how to serve external packages on the frontend
#location /frontendStateMachineEditor/ {
# alias <HBP>/frontendStateMachineEditor/build/;
# index index.html index.htm;
#}
location /robot-designer/ {
root <HBP>/ExDFrontend/dist/node_modules;
......
......@@ -217,18 +217,6 @@ function build_gzweb {
npm install --no-save || { echo GZ3D INSTALL ERROR; exit 1; }
}
function build_frontend_state_machine_editor {
echo
echo -------------------------
echo frontendStateMachineEditor
echo -------------------------
sleep 2
cd $HBP/frontendStateMachineEditor || { echo ERROR: $HBP/frontendStateMachineEditor NOT FOUND. You might want to run the clone-all-repos script to get this repo; exit 1; }
git checkout -- package.json || { echo frontendStateMachineEditor CHECKOUT ERROR; exit 1; }
npm install --no-save || { echo frontendStateMachineEditor INSTALL ERROR; exit 1; }
npm run-script build || { echo frontendStateMachineEditor BUILD ERROR; exit 1; }
}
function nrp_rebase {
rebase_all=$1
rebase_branch=$2
......@@ -386,7 +374,6 @@ function nrp_build {
done
build_gzweb
build_frontend_state_machine_editor
process_models
install_template_experiments_requirements
}
......
......@@ -17,7 +17,6 @@ nrp_js=(
nrpBackendProxy
brainvisualizer
ExDFrontend
frontendStateMachineEditor
)
nrp_repos=(
${nrp_python[*]}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment