From c3e5de6699e49dae3b5a8710cc8e8f2a84923e95 Mon Sep 17 00:00:00 2001
From: Rahul Sheth <rahul@snap.com>
Date: Wed, 22 May 2019 19:52:19 -0400
Subject: [PATCH] remove bash-specific amalgamation code

---
 amalgamate.sh | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/amalgamate.sh b/amalgamate.sh
index eea63d4..796ee02 100755
--- a/amalgamate.sh
+++ b/amalgamate.sh
@@ -3,44 +3,30 @@
 set -e
 
 mkdir -p amalgamation
-OUTPUT_PREFIX=amalgamation/miniz
 
-cat miniz.h > $OUTPUT_PREFIX.h
-cat miniz.c > $OUTPUT_PREFIX.c
-cat miniz_common.h >> $OUTPUT_PREFIX.h
-cat miniz_tdef.c >> $OUTPUT_PREFIX.c
-cat miniz_tdef.h >> $OUTPUT_PREFIX.h
-cat miniz_tinfl.c >> $OUTPUT_PREFIX.c
-cat miniz_tinfl.h >> $OUTPUT_PREFIX.h
-cat miniz_zip.c >> $OUTPUT_PREFIX.c
-cat miniz_zip.h >> $OUTPUT_PREFIX.h
+OUTPUT_PREFIX=_build/amalgamation
 
-
-sed -i '0,/#include "miniz.h"/{s/#include "miniz.h"/#include  "miniz.h"/}' $OUTPUT_PREFIX.c
-for i in miniz miniz_common miniz_tdef miniz_tinfl miniz_zip
-do
-	sed -i "s/#include \"$i.h\"//g" $OUTPUT_PREFIX.h
-	sed -i "s/#include \"$i.h\"//g" $OUTPUT_PREFIX.c
-done
+cmake -H. -B_build -DAMALGAMATE_SOURCES=ON -G"Unix Makefiles"
 
 echo "int main() { return 0; }" > main.c
 echo "Test compile with GCC..."
-gcc -pedantic -Wall main.c $OUTPUT_PREFIX.c -o test.out
+gcc -pedantic -Wall -I$OUTPUT_PREFIX main.c $OUTPUT_PREFIX/miniz.c -o test.out
 echo "Test compile with GCC ANSI..."
-gcc -ansi -pedantic -Wall main.c $OUTPUT_PREFIX.c -o test.out
+gcc -ansi -pedantic -Wall -I$OUTPUT_PREFIX main.c $OUTPUT_PREFIX/miniz.c -o test.out
 if command -v clang
 then
 		echo "Test compile with clang..."
-        clang -Wall -Wpedantic -fsanitize=unsigned-integer-overflow main.c $OUTPUT_PREFIX.c -o test.out
+        clang -Wall -Wpedantic -fsanitize=unsigned-integer-overflow -I$OUTPUT_PREFIX main.c $OUTPUT_PREFIX/miniz.c -o test.out
 fi
 for def in MINIZ_NO_STDIO MINIZ_NO_TIME MINIZ_NO_ARCHIVE_APIS MINIZ_NO_ARCHIVE_WRITING_APIS MINIZ_NO_ZLIB_APIS MINIZ_NO_ZLIB_COMPATIBLE_NAMES MINIZ_NO_MALLOC
 do
 	echo "Test compile with GCC and define $def..."
-	gcc -ansi -pedantic -Wall main.c $OUTPUT_PREFIX.c -o test.out -D${def}
+	gcc -ansi -pedantic -Wall -I$OUTPUT_PREFIX main.c $OUTPUT_PREFIX/miniz.c -o test.out -D${def}
 done
 rm test.out
 rm main.c
 
+cp $OUTPUT_PREFIX/miniz.* amalgamation/
 cp ChangeLog.md amalgamation/
 cp LICENSE amalgamation/
 cp readme.md amalgamation/