chore: Fix make_single_file to support core-only.

TokTok · Dec 19, 2023 · 38389f1 · 38389f1
1 parent 19d8f18
commit 38389f1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/other/docker/tcc/Dockerfile b/other/docker/tcc/Dockerfile
@@ -39,13 +39,25 @@ RUN tcc \
 
 COPY other/make_single_file /work/other/
 RUN \
- other/make_single_file \
+ other/make_single_file -core \
    auto_tests/auto_test_support.c \
    auto_tests/send_message_test.c \
    testing/misc_tools.c | \
  tcc - \
    -o send_message_test \
    -Wall -Werror \
    -bench -g \
-   $(pkg-config --cflags --libs libsodium opus vpx) \
+   $(pkg-config --cflags --libs libsodium) \
  && ./send_message_test | grep 'tox clients connected'
+
+RUN \
+ other/make_single_file \
+   auto_tests/auto_test_support.c \
+   auto_tests/toxav_basic_test.c \
+   testing/misc_tools.c | \
+ tcc - \
+   -o toxav_basic_test \
+   -Wall -Werror \
+   -bench -g \
+   $(pkg-config --cflags --libs libsodium opus vpx) \
+ && ./toxav_basic_test | grep 'Test successful'
diff --git a/other/make_single_file b/other/make_single_file
@@ -6,8 +6,11 @@
 #
 # Example:
 #
-#   other/make_single_file testing/misc_tools.c auto_tests/send_message_test.c | \
-#     tcc -o send_message_test - $(pkg-config --cflags --libs libsodium opus vpx)
+#   other/make_single_file auto_tests/toxav_basic_test.c auto_tests/auto_test_support.c testing/misc_tools.c | \
+#     tcc -o toxav_basic_test - $(pkg-config --cflags --libs libsodium opus vpx)
+#
+#   other/make_single_file -core auto_tests/send_message_test.c auto_tests/auto_test_support.c testing/misc_tools.c | \
+#     tcc -o send_message_test - $(pkg-config --cflags --libs libsodium)
 
 use strict;
 use warnings;
@@ -44,7 +47,7 @@ sub emit {
 
 if (@ARGV and $ARGV[0] eq "-core") {
    shift @ARGV;
-   for my $fn (<toxcore/*.c>, <third_party/cmp/*.c>) {
+   for my $fn (<toxcore/*.c>, <toxcore/*/*.c>, <third_party/cmp/*.c>) {
       emit(abs_path $fn);
    }
 } else {