diff --git a/resources/spd_logger_cfg.json b/resources/spd_logger_cfg.json deleted file mode 100644 index a3df2cf..0000000 --- a/resources/spd_logger_cfg.json +++ /dev/null @@ -1,40 +0,0 @@ -[ - { - "name": "info-sink", - "type": "daily_file_sink_mt", - "filename": "logs/infolog.log", - "max_files": 30, - "rotate_on_open": true, - "level": 2 - }, - { - "name": "debug-sink", - "type": "daily_file_sink_mt", - "filename": "logs/debuglog.log", - "max_files": 10, - "rotate_on_open": true, - "level": 0 - }, - { - "name": "terminal-sink", - "type": "stdout_color_sink_mt" - }, - { - "name": "ZCanReceiverHost", - "level": 0 - }, - { - "name": "ExtAPIService", - "level": 0 - }, - { - "name": "root", - "type": "logger", - "level": 2, - "sinks": [ - "terminal-sink", - "debug-sink", - "info-sink" - ] - } -] \ No newline at end of file diff --git a/src/configs/version.hpp b/src/configs/version.hpp index 8820105..674d705 100644 --- a/src/configs/version.hpp +++ b/src/configs/version.hpp @@ -1,2 +1,2 @@ #pragma once -#define VERSION "1.0" \ No newline at end of file +#define VERSION "1.0.0" \ No newline at end of file diff --git a/tools/packet.sh b/tools/packet.sh index f2961a4..5ef883b 100755 --- a/tools/packet.sh +++ b/tools/packet.sh @@ -1,16 +1,15 @@ #!/bin/bash # -# ./packet.sh v1 # +versionfile="src/configs/version.hpp" +version=$(grep -oP '#define VERSION\s*"\s*(\S+)\s*"' "$versionfile" | sed 's/#define VERSION\s*"//;s/"//') +echo "VERSION: $version" -if [ $# -ne 1 ]; then - echo "Usage: $0 version" - exit 1 -fi +./tools/build.sh -version=$1 -packetname=iflytoptdcan + +packetname=iflytoptdcan-$version-aarch64-linux-gnu workdir=$(pwd) echo "workdir: $workdir" @@ -26,12 +25,13 @@ cp -r ./resources/iflytoptdcan.service /tmp/$packetname/ echo "Version: $version" > /tmp/$packetname/version cd /tmp -tar -czvf $packetname-$version.tar.gz $packetname +tar -czvf $packetname.tar.gz $packetname cd $workdir -mv /tmp/$packetname-$version.tar.gz ./dist/ +mkdir -p ./dist +mv /tmp/$packetname.tar.gz ./dist/ echo "" echo "#" -echo "# Packet: dist/$packetname-$version.tar.gz" +echo "# Packet: dist/$packetname.tar.gz" echo "# "