Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable non-interactive building #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 103 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
*.o
/dnp3/
/build_core.sh
/core/Config0.*
/core/LOCATED_VARIABLES.h
/core/POUS.*
/core/Res0.*
/core/VARIABLES.csv
/core/dnp3.disabled
/core/dnp3_dummy.cpp
/core/glue_generator
/core/hardware_layer.cpp
/core/openplc
/glue_generator_src/glue_generator
/iec2c
/libmodbus_src/Makefile
/libmodbus_src/Makefile.in
/libmodbus_src/aclocal.m4
/libmodbus_src/config.h
/libmodbus_src/config.h.in
/libmodbus_src/config.h.in~
/libmodbus_src/config.log
/libmodbus_src/config.status
/libmodbus_src/configure
/libmodbus_src/doc/Makefile
/libmodbus_src/doc/Makefile.in
/libmodbus_src/libmodbus.pc
/libmodbus_src/libtool
/libmodbus_src/src/Makefile
/libmodbus_src/src/Makefile.in
/libmodbus_src/src/libmodbus.la
/libmodbus_src/src/modbus-data.lo
/libmodbus_src/src/modbus-rtu.lo
/libmodbus_src/src/modbus-tcp.lo
/libmodbus_src/src/modbus-version.h
/libmodbus_src/src/modbus.lo
/libmodbus_src/src/win32/modbus.dll.manifest
/libmodbus_src/stamp-h1
/libmodbus_src/tests/Makefile
/libmodbus_src/tests/Makefile.in
/libmodbus_src/tests/bandwidth-client
/libmodbus_src/tests/bandwidth-server-many-up
/libmodbus_src/tests/bandwidth-server-one
/libmodbus_src/tests/random-test-client
/libmodbus_src/tests/random-test-server
/libmodbus_src/tests/stamp-h2
/libmodbus_src/tests/unit-test-client
/libmodbus_src/tests/unit-test-server
/libmodbus_src/tests/unit-test.h
/libmodbus_src/tests/version
/libmodbus_src/autom4te.cache/
/libmodbus_src/build-aux/
/libmodbus_src/src/.deps/
/libmodbus_src/src/.libs/
/libmodbus_src/tests/.deps/
/libmodbus_src/tests/.libs/
/matiec_src/Makefile
/matiec_src/Makefile.in
/matiec_src/absyntax/Makefile
/matiec_src/absyntax/Makefile.in
/matiec_src/absyntax/libabsyntax.a
/matiec_src/absyntax_utils/Makefile
/matiec_src/absyntax_utils/Makefile.in
/matiec_src/absyntax_utils/libabsyntax_utils.a
/matiec_src/aclocal.m4
/matiec_src/config.log
/matiec_src/config.status
/matiec_src/config/compile
/matiec_src/config/config.h
/matiec_src/config/config.h.in
/matiec_src/config/stamp-h1
/matiec_src/configure
/matiec_src/iec2c
/matiec_src/iec2iec
/matiec_src/stage1_2/Makefile
/matiec_src/stage1_2/Makefile.in
/matiec_src/stage1_2/iec_bison.cc
/matiec_src/stage1_2/iec_bison.hh
/matiec_src/stage1_2/iec_flex.cc
/matiec_src/stage1_2/libstage1_2.a
/matiec_src/stage3/Makefile
/matiec_src/stage3/Makefile.in
/matiec_src/stage3/libstage3.a
/matiec_src/stage4/Makefile
/matiec_src/stage4/Makefile.in
/matiec_src/stage4/generate_c/Makefile
/matiec_src/stage4/generate_c/Makefile.in
/matiec_src/stage4/generate_c/libstage4_c.a
/matiec_src/stage4/generate_c/stage4.Po
/matiec_src/stage4/generate_iec/Makefile
/matiec_src/stage4/generate_iec/Makefile.in
/matiec_src/stage4/generate_iec/libstage4_iec.a
/matiec_src/.deps/
/matiec_src/absyntax/.deps/
/matiec_src/absyntax_utils/.deps/
/matiec_src/autom4te.cache/
/matiec_src/stage1_2/.deps/
/matiec_src/stage3/.deps/
/matiec_src/stage4/generate_c/.deps/
/matiec_src/stage4/generate_iec/.deps/
/st_optimizer
/st_optimizer_src/st_optimizer

21 changes: 17 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
FROM debian:8

# Install dependencies
RUN apt-get update
RUN apt-get -y install sudo dos2unix build-essential pkg-config bison flex autoconf automake libtool make nodejs git
RUN apt-get update && apt-get -y \
install \
sudo \
dos2unix \
build-essential \
pkg-config \
bison \
flex \
autoconf \
automake \
libtool \
make \
nodejs \
git

COPY . /usr/local/src/OpenPLC
WORKDIR /usr/local/src/OpenPLC

# Convert windows type line endings
# Convert Windows-type line endings
RUN find . -type f -exec dos2unix {} \;

# Build the OpenPLC project
RUN printf "n\n1\n" | bash /usr/local/src/OpenPLC/build.sh
RUN DNP3_SUPPORT=N COMM_DRIVER=Blank bash /usr/local/src/OpenPLC/build.sh

#Start the server
CMD sudo nodejs server.js

185 changes: 88 additions & 97 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash

set -e

echo Building OpenPLC environment:

echo [MATIEC COMPILER]
Expand All @@ -25,10 +28,12 @@ g++ glue_generator.cpp -o glue_generator
cd ..
cp ./glue_generator_src/glue_generator ./core/glue_generator

clear
echo OpenPLC can talk Modbus/TCP and DNP3 SCADA protocols. Modbus/TCP is already
echo added to the system. Do you want to add support for DNP3 as well \(Y/N\)?
read DNP3_SUPPORT
if [ -z "$DNP3_SUPPORT" ]; then
clear
echo OpenPLC can talk Modbus/TCP and DNP3 SCADA protocols. Modbus/TCP is already
echo added to the system. Do you want to add support for DNP3 as well \(Y/N\)?
read DNP3_SUPPORT
fi
if [ "$DNP3_SUPPORT" = "Y" -o "$DNP3_SUPPORT" = "y" -o "$DNP3_SUPPORT" = "yes" ]; then
echo Installing DNP3 on the system...

Expand Down Expand Up @@ -69,96 +74,82 @@ fi
cd core
rm -f ./hardware_layer.cpp
rm -f ../build_core.sh
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 Modbus Fischertechnik RaspberryPi UniPi PiXtend PiXtend_2S Arduino ESP8266 Arduino+RaspberryPi Simulink "
select opt in $OPTIONS; do
if [ "$opt" = "Blank" ]; then
cp ./hardware_layers/blank.cpp ./hardware_layer.cpp
cp ./core_builders/build_normal.sh ../build_core.sh
echo [OPENPLC]
cd ..
./build_core.sh
exit
elif [ "$opt" = "Modbus" ]; then
cp ./hardware_layers/modbus_master.cpp ./hardware_layer.cpp
cp ./core_builders/build_modbus.sh ../build_core.sh
echo [LIBMODBUS]
cd ..
cd libmodbus_src
./autogen.sh
./configure
sudo make install
sudo ldconfig
echo [OPENPLC]
cd ..
./build_core.sh
exit
elif [ "$opt" = "Fischertechnik" ]; then
cp ./hardware_layers/fischertechnik.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
echo [OPENPLC]
cd ..
./build_core.sh
exit
elif [ "$opt" = "RaspberryPi" ]; then
cp ./hardware_layers/raspberrypi.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
echo [OPENPLC]
cd ..
./build_core.sh
exit
elif [ "$opt" = "UniPi" ]; then
cp ./hardware_layers/unipi.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
echo [OPENPLC]
cd ..
./build_core.sh
exit
elif [ "$opt" = "PiXtend" ]; then
cp ./hardware_layers/pixtend.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
echo [OPENPLC]
cd ..
./build_core.sh
exit
elif [ "$opt" = "PiXtend_2S" ]; then
cp ./hardware_layers/pixtend2s.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
echo [OPENPLC]
cd ..
./build_core.sh
exit
elif [ "$opt" = "Arduino" ]; then
cp ./hardware_layers/arduino.cpp ./hardware_layer.cpp
cp ./core_builders/build_normal.sh ../build_core.sh
echo [OPENPLC]
cd ..
./build_core.sh
exit
elif [ "$opt" = "ESP8266" ]; then
cp ./hardware_layers/esp8266.cpp ./hardware_layer.cpp
cp ./core_builders/build_normal.sh ../build_core.sh
echo [OPENPLC]
cd ..
./build_core.sh
exit
elif [ "$opt" = "Arduino+RaspberryPi" ]; then
cp ./hardware_layers/arduino.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
echo [OPENPLC]
cd ..
./build_core.sh
exit
elif [ "$opt" = "Simulink" ]; then
cp ./hardware_layers/simulink.cpp ./hardware_layer.cpp
cp ./core_builders/build_normal.sh ../build_core.sh
echo [OPENPLC]
cd ..
./build_core.sh
exit
else
#clear
echo bad option
fi
done
if [ -z "$COMM_DRIVER" ]; then
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 Modbus Fischertechnik RaspberryPi UniPi PiXtend PiXtend_2S Arduino ESP8266 Arduino+RaspberryPi Simulink "
select opt in $OPTIONS; do
COMM_DRIVER="$opt"
break
done
fi
case "$COMM_DRIVER" in
Blank)
cp ./hardware_layers/blank.cpp ./hardware_layer.cpp
cp ./core_builders/build_normal.sh ../build_core.sh
cd ..
;;
Modbus)
cp ./hardware_layers/modbus_master.cpp ./hardware_layer.cpp
cp ./core_builders/build_modbus.sh ../build_core.sh
echo [LIBMODBUS]
cd ..
cd libmodbus_src
./autogen.sh
./configure --enable-static=yes
make
cd ..
;;
Fischertechnik)
cp ./hardware_layers/fischertechnik.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
cd ..
;;
RaspberryPi)
cp ./hardware_layers/raspberrypi.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
cd ..
;;
UniPi)
cp ./hardware_layers/unipi.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
cd ..
;;
PiXtend)
cp ./hardware_layers/pixtend.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
cd ..
;;
PiXtend_2S)
cp ./hardware_layers/pixtend2s.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
cd ..
;;
Arduino)
cp ./hardware_layers/arduino.cpp ./hardware_layer.cpp
cp ./core_builders/build_normal.sh ../build_core.sh
cd ..
;;
ESP8266)
cp ./hardware_layers/esp8266.cpp ./hardware_layer.cpp
cp ./core_builders/build_normal.sh ../build_core.sh
cd ..
;;
Arduino+RaspberryPi)
cp ./hardware_layers/arduino.cpp ./hardware_layer.cpp
cp ./core_builders/build_rpi.sh ../build_core.sh
cd ..
;;
Simulink)
cp ./hardware_layers/simulink.cpp ./hardware_layer.cpp
cp ./core_builders/build_normal.sh ../build_core.sh
cd ..
;;
*)
echo "Invalid driver option" 1>&2
exit 1
esac

echo [OPENPLC]
./build_core.sh

10 changes: 0 additions & 10 deletions core/core_builders/build_modbus.sh

This file was deleted.

10 changes: 0 additions & 10 deletions core/core_builders/build_modbus_win.sh

This file was deleted.

10 changes: 0 additions & 10 deletions core/core_builders/build_normal.sh

This file was deleted.

11 changes: 0 additions & 11 deletions core/core_builders/build_rpi.sh

This file was deleted.

Loading