From d54a231f91d7fc09c5da2095010bea3e30f43b44 Mon Sep 17 00:00:00 2001
From: Fabien Freling <public@ffreling.com>
Date: Fri, 18 Feb 2022 12:49:02 +0100
Subject: [PATCH] rename output bins

---
 .gitignore   | 2 +-
 build-cli.sh | 2 +-
 build-gui.sh | 2 +-
 justfile     | 6 ++++--
 src/Tupfile  | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 59fe97c..5a8f71c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.zip
-packing_*
+packing-*
 build.sh
 *.a
 
diff --git a/build-cli.sh b/build-cli.sh
index b2cd959..1b7459e 100755
--- a/build-cli.sh
+++ b/build-cli.sh
@@ -11,4 +11,4 @@ cd "src"
 (ar rcs libpacking.a a2.o bounding_box.o frame.o mapping.o mask.o pack.o png.o)
 (clang++ -c main_cli.cpp -o main_cli.o -Wall -Werror -std=c++17 -fcolor-diagnostics -g -O1 -I./3rd-party/stb)
 (clang++ -c png_impl.cpp -o png_impl.o -Wall -Werror -std=c++17 -fcolor-diagnostics -g -O1 -I./3rd-party/stb)
-(clang++ libpacking.a main_cli.o png_impl.o -o ../packing_cli -L. -lpacking)
+(clang++ libpacking.a main_cli.o png_impl.o -o ../packing-cli -L. -lpacking)
diff --git a/build-gui.sh b/build-gui.sh
index 7ffa62c..78c7220 100755
--- a/build-gui.sh
+++ b/build-gui.sh
@@ -11,4 +11,4 @@ cd "src"
 (ar rcs libpacking.a a2.o bounding_box.o frame.o mapping.o mask.o pack.o png.o)
 (cd 3rd-party/raylib-4.0.0/src && make CC=clang PLATFORM=PLATFORM_DESKTOP RAYLIB_MODULE_AUDIO=FALSE RAYLIB_MODULE_MODELS=FALSE)
 (clang++ -c main_gui.cpp -o main_gui.o -Wall -Werror -std=c++17 -fcolor-diagnostics -g -O1 -I./3rd-party/stb -I3rd-party/raylib-4.0.0/src)
-(clang++ libpacking.a main_gui.o -o ../packing_gui -L. -lpacking -L3rd-party/raylib-4.0.0 -lraylib -lGL -lc -lm -lpthread -ldl -lrt -lX11)
+(clang++ libpacking.a main_gui.o -o ../packing-gui -L. -lpacking -L3rd-party/raylib-4.0.0 -lraylib -lGL -lc -lm -lpthread -ldl -lrt -lX11)
diff --git a/justfile b/justfile
index be01ac2..277b697 100644
--- a/justfile
+++ b/justfile
@@ -1,6 +1,6 @@
 name := "freling_netatmo_algo"
-exe_cli := "./packing_cli"
-exe_gui := "./packing_gui"
+exe_cli := "./packing-cli"
+exe_gui := "./packing-gui"
 build_sh := "build.sh"
 
 params := "lenna.png 0 0 64 64 100 100 100 64 80 200 70 220"
@@ -44,4 +44,6 @@ callgrind: build-cli
     valgrind --tool=callgrind {{exe_cli}} {{params}}
 
 archive: #generate-build
+	git clean -xf src/
+	rm --force {{exe_cli}} {{exe_gui}}
 	git archive --add-file={{build_sh}} --output={{name}}.zip --prefix={{name}}/ HEAD
diff --git a/src/Tupfile b/src/Tupfile
index 0da7a88..458eb86 100644
--- a/src/Tupfile
+++ b/src/Tupfile
@@ -15,7 +15,7 @@ GUI_LINK_FLAGS = $(LINK_FLAGS) -L3rd-party/raylib-4.0.0 -lraylib -lGL -lc -lm -l
 : {objs} |> ^ AR %o^ ar rcs %o %f |> libpacking.a
 
 : foreach main_cli.cpp png_impl.cpp |> ^ CXX %f^ clang++ -c %f -o %o $(CPPFLAGS) |> %B.o {cli}
-: libpacking.a {cli} |> ^ LINK %o^ clang++ %f -o %o $(LINK_FLAGS) |> ../packing_cli
+: libpacking.a {cli} |> ^ LINK %o^ clang++ %f -o %o $(LINK_FLAGS) |> ../packing-cli
 
 : main_gui.cpp |> ^ CXX %f^ clang++ -c %f -o %o $(CPPFLAGS) $(GUI_FLAGS) |> %B.o {gui}
-: libpacking.a {gui} | 3rd-party/<raylib> |> ^ LINK %o^ clang++ %f -o %o $(GUI_LINK_FLAGS) |> ../packing_gui
+: libpacking.a {gui} | 3rd-party/<raylib> |> ^ LINK %o^ clang++ %f -o %o $(GUI_LINK_FLAGS) |> ../packing-gui