scripts add

dockerfile

@@ -6,10 +6,15 @@ WORKDIR /app
 COPY . /app
 
 # Устанавливаем необходимые зависимости
-RUN apt-get update && \
-    apt-get install -y make cppcheck git wget tar 
-  
-RUN ./scipts/gcc-arm/arm-none-edabi-install.sh
+RUN apt-get update && apt-get upgrade
+
+RUN ./scipts/cppcheck/cppcheck-install.sh 
+RUN ./scipts/gcc-arm/arm-none-edabi-install.sh 
+RUN ./scipts/doxygen/doxygen-install.sh
+RUN apt-get -y install openocd #последня версия в репе
+RUN apt-get -y install make #не последняя но нормально
+RUN apt-get -y install stlink-tools #не последняя но нормально
+RUN apt-get -y install graphviz #для doxygen
 
     
 

dslogic_insatll-lib.sh

@@ -1,52 +0,0 @@
-#!/bin/sh
-##
-## This file is part of the sigrok-util project.
-##
-## Copyright (C) 2016 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, see <http://www.gnu.org/licenses/>.
-##
-
-umask 022
-
-WGET="wget -c -q"
-if [ -z $PREFIX ]; then
-	PREFIX="/usr/local"
-fi
-FWDIR="$PREFIX/share/sigrok-firmware"
-
-# Use the upstream 0.97 firmware/bitstream set. This is the only supported
-# set of files in libsigrok >= 20170621.
-FWURL="https://github.com/DreamSourceLab/DSView/raw/886b847c21c606df3138ce7ad8f8e8c363ee758b/DSView/res"
-
-echo "Installing into: $FWDIR"
-
-mkdir -p $FWDIR
-
-$WGET $FWURL/DSLogic50.bin -O $FWDIR/dreamsourcelab-dslogic-fpga-5v.fw
-$WGET $FWURL/DSLogic33.bin -O $FWDIR/dreamsourcelab-dslogic-fpga-3v3.fw
-$WGET $FWURL/DSLogic.fw -O $FWDIR/dreamsourcelab-dslogic-fx2.fw
-
-$WGET $FWURL/DSCope.bin -O $FWDIR/dreamsourcelab-dscope-fpga.fw
-$WGET $FWURL/DSCope.fw -O $FWDIR/dreamsourcelab-dscope-fx2.fw
-
-$WGET $FWURL/DSLogicPro.bin -O $FWDIR/dreamsourcelab-dslogic-pro-fpga.fw
-$WGET $FWURL/DSLogicPro.fw -O $FWDIR/dreamsourcelab-dslogic-pro-fx2.fw
-
-$WGET $FWURL/DSLogicPlus.bin -O $FWDIR/dreamsourcelab-dslogic-plus-fpga.fw
-$WGET $FWURL/DSLogicPlus.fw -O $FWDIR/dreamsourcelab-dslogic-plus-fx2.fw
-
-$WGET $FWURL/DSLogicBasic.bin -O $FWDIR/dreamsourcelab-dslogic-basic-fpga.fw
-$WGET $FWURL/DSLogicBasic.fw -O $FWDIR/dreamsourcelab-dslogic-basic-fx2.fw
-

scipts/cppcheck/cppcheck-install.sh

@@ -0,0 +1,9 @@
+apt-get install -y wget g++ python3 tar bzip2 make libghc-regex-pcre-dev
+wget https://github.com/danmar/cppcheck/archive/2.14.1.tar.gz
+tar -xvf ./2.14.1.tar.gz
+rm ./2.14.1.tar.gz
+mkdir /usr/share/cppcheck
+cd ./cppcheck-2.14.1/
+make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function"
+make install FILESDIR=/usr/share/cppcheck
+cd ..

scipts/doxygen/doxygen-install.sh

@@ -0,0 +1,5 @@
+apt-get install -y wget tar bzip2 
+wget https://www.doxygen.nl/files/doxygen-1.11.0.linux.bin.tar.gz
+tar -xvf ./doxygen-1.11.0.linux.bin.tar.gz
+rm ./doxygen-1.11.0.linux.bin.tar.gz
+echo "export PATH=$PATH:./doxygen-1.11.0/bin/" >> ~/.bashrc

scipts/gcc-arm/arm-none-edabi-install.sh

@@ -1,4 +1,5 @@
+apt-get install -y wget tar bzip2 
 wget "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2"
-tar -jxf gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
-rm gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
-export PATH="/opt/gcc-arm-none-eabi-10.3-2021.10/bin:$PATH"
+tar -jxf ./*.tar.bz2
+rm ./*.tar.bz2
+echo "export PATH=$PATH:./gcc-arm-none-eabi-10.3-2021.10/bin/" >> ~/.bashrc