From 9439a78e2f67b81b7a3ba642266b2f5404da2cab Mon Sep 17 00:00:00 2001 From: thiagoralves Date: Mon, 14 Mar 2016 17:56:10 -0500 Subject: [PATCH] Small script fix --- .../OPLC_starter.cpp | 2 +- build.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename {core/OPLC_starter_src => OPLC_starter_source}/OPLC_starter.cpp (96%) diff --git a/core/OPLC_starter_src/OPLC_starter.cpp b/OPLC_starter_source/OPLC_starter.cpp similarity index 96% rename from core/OPLC_starter_src/OPLC_starter.cpp rename to OPLC_starter_source/OPLC_starter.cpp index efda9ca..3227dc6 100644 --- a/core/OPLC_starter_src/OPLC_starter.cpp +++ b/OPLC_starter_source/OPLC_starter.cpp @@ -48,7 +48,7 @@ int main() if (!fork()) { //executes OpenPLC - execl("./openplc", "./openplc", (char *) 0); + execl("./core/openplc", "./core/openplc", (char *) 0); } else diff --git a/build.sh b/build.sh index 20a36f5..306926d 100755 --- a/build.sh +++ b/build.sh @@ -7,17 +7,17 @@ echo [LADDER] cd .. cp ./OPLC_Compiler_source/OPLC_Compiler ./ ./OPLC_Compiler ./ladder_files/blank_ladder.ld &> /dev/null -rm ./core/ladder.cpp +rm -f ./core/ladder.cpp mv ./ladder.cpp ./core/ -cd core -rm ./hardware_layer.cpp echo [OPLC_STARTER] -cd OPLC_starter_src +cd OPLC_starter_source g++ *.cpp -o OPLC_starter cd .. -cp ./OPLC_starter_src/OPLC_starter ./ +cp ./OPLC_starter_source/OPLC_starter ./ +cd core +rm -f ./hardware_layer.cpp echo The OpenPLC needs a driver to be able to control physical or virtual hardware. echo Please select the driver you would like to use: OPTIONS="Blank Fischertechnik RaspberryPi Simulink Unipi"