1 files changed, 74 insertions, 42 deletions

diff --git a/other/analysis/gen-file.sh b/other/analysis/gen-file.sh
index 710e20d7..89144eff 100644
--- a/other/analysis/gen-file.sh
+++ b/other/analysis/gen-file.sh
@@ -1,48 +1,80 @@
-CPPFLAGS="-DMIN_LOGGER_LEVEL=LOG_TRACE -Iauto_tests -Itoxcore -Itoxav -Itoxencryptsave `pkg-config --cflags libsodium opus vpx`"
+#!/bin/sh
+
+CPPFLAGS="$CPPFLAGS -DMIN_LOGGER_LEVEL=LOGGER_LEVEL_TRACE"
+CPPFLAGS="$CPPFLAGS -isystem /usr/include/opus"
+CPPFLAGS="$CPPFLAGS -Iauto_tests"
+CPPFLAGS="$CPPFLAGS -Iother"
+CPPFLAGS="$CPPFLAGS -Iother/bootstrap_daemon/src"
+CPPFLAGS="$CPPFLAGS -Iother/fun"
+CPPFLAGS="$CPPFLAGS -Itesting"
+CPPFLAGS="$CPPFLAGS -Itoxcore"
+CPPFLAGS="$CPPFLAGS -Itoxav"
+CPPFLAGS="$CPPFLAGS -Itoxencryptsave"
+
+LDFLAGS="$LDFLAGS -lopus -lsodium -lvpx -lpthread -lconfig"
 
 put() {
   if [ "$SKIP_LINES" = "" ]; then
-    echo "#line 1 \"$1\"" >> test.c
+    echo "#line 1 \"$1\"" >> amalgamation.cc
+  fi
+  cat $1 >> amalgamation.cc
+}
+
+putmain() {
+  echo "namespace $(echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g') {" >> amalgamation.cc
+  if [ "$SKIP_LINES" = "" ]; then
+    echo "#line 1 \"$1\"" >> amalgamation.cc
   fi
-  cat $1 >> test.c
+  sed -e 's/^int main(/static &/' $1 >> amalgamation.cc
+  echo "} //  namespace $(echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g')" >> amalgamation.cc
+}
+
+callmain() {
+  echo "  call($(echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g')::main, argc, argv);" >> amalgamation.cc
 }
 
-:> test.c
-
-put toxcore/tox.c
-
-put toxcore/DHT.c
-put toxcore/LAN_discovery.c
-put toxcore/Messenger.c
-put toxcore/TCP_client.c
-put toxcore/TCP_connection.c
-put toxcore/TCP_server.c
-put toxcore/crypto_core.c
-put toxcore/crypto_core_mem.c
-put toxcore/friend_connection.c
-put toxcore/friend_requests.c
-put toxcore/group.c
-put toxcore/list.c
-put toxcore/logger.c
-put toxcore/network.c
-put toxcore/net_crypto.c
-put toxcore/onion.c
-put toxcore/onion_announce.c
-put toxcore/onion_client.c
-put toxcore/ping.c
-put toxcore/ping_array.c
-put toxcore/tox_api.c
-put toxcore/util.c
-
-# Not included yet, since there are too many issues with this code.
-#put toxav/audio.c
-#put toxav/bwcontroller.c
-#put toxav/groupav.c
-#put toxav/msi.c
-#put toxav/ring_buffer.c
-#put toxav/rtp.c
-#put toxav/toxav.c
-#put toxav/toxav_old.c
-#put toxav/video.c
-
-put toxencryptsave/toxencryptsave.c
+:> amalgamation.cc
+
+echo "#include <algorithm>" >> amalgamation.cc
+echo "#include <cstdio>" >> amalgamation.cc
+echo "#include <memory>" >> amalgamation.cc
+echo "#include <random>" >> amalgamation.cc
+
+echo "#define TOX_DEFINED" >> amalgamation.cc
+echo "typedef struct Messenger Tox;" >> amalgamation.cc
+
+put auto_tests/check_compat.h
+
+FIND_QUERY="find . '-(' -name '*.cc' -or -name '*.c' '-)'"
+FIND_QUERY="$FIND_QUERY -and -not -wholename './super_donators/*'"
+FIND_QUERY="$FIND_QUERY -and -not -wholename './toxav/*.cc'"
+FIND_QUERY="$FIND_QUERY -and -not -wholename './toxcore/*.cc'"
+FIND_QUERY="$FIND_QUERY -and -not -wholename './toxencryptsave/*.cc'"
+FIND_QUERY="$FIND_QUERY -and -not -name amalgamation.cc"
+FIND_QUERY="$FIND_QUERY -and -not -name av_test.c"
+FIND_QUERY="$FIND_QUERY -and -not -name dht_test.c"
+FIND_QUERY="$FIND_QUERY -and -not -name version_test.c"
+
+for i in $(eval $FIND_QUERY); do
+  if ! grep -q '^int main(' $i; then
+    put $i
+  fi
+done
+
+for i in $(eval $FIND_QUERY); do
+  if grep -q '^int main(' $i; then
+    putmain $i
+  fi
+done
+
+echo "static void call(int m(), int argc, char **argv) { m(); }" >> amalgamation.cc
+echo "static void call(int m(int, char **), int argc, char **argv) { m(argc, argv); }" >> amalgamation.cc
+
+echo "int main(int argc, char **argv) {" >> amalgamation.cc
+for i in $(eval $FIND_QUERY); do
+  if grep -q '^int main(' $i; then
+    callmain $i
+  fi
+done
+echo "  return 0;" >> amalgamation.cc
+echo "}" >> amalgamation.cc