15 Commits

6 changed files with 8 additions and 89 deletions
-1
View File
@@ -1,2 +1 @@
a.out
build/
+3 -11
View File
@@ -1,11 +1,3 @@
git submodule update --init --recursive --remote
# Check what compiler we have
if type "musl-gcc" > /dev/null 2>&1; then
CC="musl-gcc"
else
echo "[WARN]: using gcc instead of musl-gcc (recommended)"
CC="gcc"
fi
$CC rtracker.c -o rtracker
git submodule init
git submodule update
musl-gcc rtracker.c -o rtracker
-69
View File
@@ -1,69 +0,0 @@
pause () {
read -p "Press enter to continue"
}
clear
echo "------- Multi build -------"
echo "This is build for:"
echo " - x86 + musl*"
echo " - arm + musl*"
echo ""
echo "* - alternative C library"
echo "---------------------------"
pause
clear
echo "------ Requirements ------"
echo "Please install this packages (Debian):"
echo ""
echo "docker qemu binfmt-support qemu-user-static"
echo "---------------------------"
pause
clear
echo "--------- Build -----------"
mkdir build
echo "[BUILD] BUILD FOR X86 ON ALPINE"
echo "[BUILD] START CONTAINER"
if [ "$(docker ps -a -q -f name=run_tracker_x86)" ]; then
docker start run_tracker_x86
else
docker run -d --name run_tracker_x86 alpine:latest tail -f /dev/null
fi
echo "[BUILD] INSTALL PACKAGES"
docker exec run_tracker_x86 apk add --no-cache git gcc musl-dev
echo "[BUILD] CLONE REPO && UPDATE"
docker exec run_tracker_x86 sh -c "git clone https://gitea.del.pw/justuser-31/run_tracker.git"
docker exec run_tracker_x86 sh -c "cd run_tracker && git pull"
echo "[BUILD] BUILD"
docker exec run_tracker_x86 sh -c "cd run_tracker && ./build.sh"
echo "[BUILD] COPY RESULT"
docker cp run_tracker_x86:/run_tracker/rtracker build/rtracker_x86
echo "[BUILD] STOP CONTAINER"
docker stop run_tracker_x86
echo "[BUILD] BUILD FOR ARM64 ON ALPINE"
echo "[BUILD] START CONTAINER"
if [ "$(docker ps -a -q -f name=run_tracker_arm64)" ]; then
docker start run_tracker_arm64
else
docker run --platform=linux/arm64/v8 -d --name run_tracker_arm64 arm64v8/alpine:latest tail -f /dev/null
fi
echo "[BUILD] INSTALL PACKAGES"
docker exec run_tracker_arm64 apk add --no-cache git gcc musl-dev
echo "[BUILD] CLONE REPO && UPDATE"
docker exec run_tracker_arm64 sh -c "git clone https://gitea.del.pw/justuser-31/run_tracker.git"
docker exec run_tracker_arm64 sh -c "cd run_tracker && git pull"
echo "[BUILD] BUILD"
docker exec run_tracker_arm64 sh -c "cd run_tracker && ./build.sh"
echo "[BUILD] COPY RESULT"
docker cp run_tracker_arm64:/run_tracker/rtracker build/rtracker_arm64
echo "[BUILD] STOP CONTAINER"
docker stop run_tracker_arm64
echo "---------------------------"
echo "Build ended, result should be in build path"
echo "---------------------------"
pause
Executable
BIN
View File
Binary file not shown.
+4 -7
View File
@@ -5,7 +5,7 @@
#include <stdarg.h>
#include "c_cross_pack/libs/threads.h"
#include "c_cross_pack/libs/time.h" //already included
//#include "c_cross_pack/libs/time.h" already included
#define CL_RED "\033[1;31m"
#define CL_YELLOW "\033[1;33m"
@@ -15,9 +15,6 @@
char comment[1000] = "";
char command[10000] = "";
char tick[4] = "";
char cross[3] = "";
#define OUT_LEN 1000 // 1000 items with 100 symbol len
int out_len = OUT_LEN;
// Output of command execution
@@ -115,16 +112,16 @@ int main(int argc, char **argv) {
start_thread(&thread_handle, loadAnim);
if (runCommand(command)) {
kill_thread(thread_handle);
printf("\r[%s%s%s] %s\n", CL_GREEN, tick, CL_NORMAL, comment);
printf("\r[%s🗸%s] %s\n", CL_GREEN, CL_NORMAL, comment);
if (forceOut == true) {
getOut();
}
} else {
kill_thread(thread_handle);
if (justTry) {
printf("\r[%s%s%s] %s\n", CL_GREEN, tick, CL_NORMAL, comment);
printf("\r[%s🗸%s] %s\n", CL_GREEN, CL_NORMAL, comment);
} else {
printf("\r[%s%s%s] %s\n", CL_RED, cross, CL_NORMAL, comment);
printf("\r[%s𐄂%s] %s\n", CL_RED, CL_NORMAL, comment);
// Get out of failed command
getOut();
return 1;