From 517aeb89dcf7a4309d003d83148a60bdf1715373 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Tue, 27 Aug 2019 15:50:47 -0700 Subject: [PATCH 1/6] changed contrib project name for clarity --- contrib/{declib => single_file_decoder}/.gitignore | 0 contrib/{declib => single_file_decoder}/README.md | 0 contrib/{declib => single_file_decoder}/build.sh | 0 contrib/{declib => single_file_decoder}/combine.sh | 0 contrib/{declib => single_file_decoder}/examples/README.md | 0 contrib/{declib => single_file_decoder}/examples/emscripten.c | 0 contrib/{declib => single_file_decoder}/examples/shell.html | 0 contrib/{declib => single_file_decoder}/examples/simple.c | 0 contrib/{declib => single_file_decoder}/zstddeclib-in.c | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename contrib/{declib => single_file_decoder}/.gitignore (100%) rename contrib/{declib => single_file_decoder}/README.md (100%) rename contrib/{declib => single_file_decoder}/build.sh (100%) rename contrib/{declib => single_file_decoder}/combine.sh (100%) rename contrib/{declib => single_file_decoder}/examples/README.md (100%) rename contrib/{declib => single_file_decoder}/examples/emscripten.c (100%) rename contrib/{declib => single_file_decoder}/examples/shell.html (100%) rename contrib/{declib => single_file_decoder}/examples/simple.c (100%) rename contrib/{declib => single_file_decoder}/zstddeclib-in.c (100%) diff --git a/contrib/declib/.gitignore b/contrib/single_file_decoder/.gitignore similarity index 100% rename from contrib/declib/.gitignore rename to contrib/single_file_decoder/.gitignore diff --git a/contrib/declib/README.md b/contrib/single_file_decoder/README.md similarity index 100% rename from contrib/declib/README.md rename to contrib/single_file_decoder/README.md diff --git a/contrib/declib/build.sh b/contrib/single_file_decoder/build.sh similarity index 100% rename from contrib/declib/build.sh rename to contrib/single_file_decoder/build.sh diff --git a/contrib/declib/combine.sh b/contrib/single_file_decoder/combine.sh similarity index 100% rename from contrib/declib/combine.sh rename to contrib/single_file_decoder/combine.sh diff --git a/contrib/declib/examples/README.md b/contrib/single_file_decoder/examples/README.md similarity index 100% rename from contrib/declib/examples/README.md rename to contrib/single_file_decoder/examples/README.md diff --git a/contrib/declib/examples/emscripten.c b/contrib/single_file_decoder/examples/emscripten.c similarity index 100% rename from contrib/declib/examples/emscripten.c rename to contrib/single_file_decoder/examples/emscripten.c diff --git a/contrib/declib/examples/shell.html b/contrib/single_file_decoder/examples/shell.html similarity index 100% rename from contrib/declib/examples/shell.html rename to contrib/single_file_decoder/examples/shell.html diff --git a/contrib/declib/examples/simple.c b/contrib/single_file_decoder/examples/simple.c similarity index 100% rename from contrib/declib/examples/simple.c rename to contrib/single_file_decoder/examples/simple.c diff --git a/contrib/declib/zstddeclib-in.c b/contrib/single_file_decoder/zstddeclib-in.c similarity index 100% rename from contrib/declib/zstddeclib-in.c rename to contrib/single_file_decoder/zstddeclib-in.c From f61e8a231fb5a5f2872c70b2b0346b822673a88e Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Tue, 27 Aug 2019 16:01:39 -0700 Subject: [PATCH 2/6] minor script renaming, for clarity --- contrib/single_file_decoder/README.md | 5 ++++- .../{build.sh => build_test.sh} | 6 +++--- .../create_single_file_decoder.sh | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) rename contrib/single_file_decoder/{build.sh => build_test.sh} (85%) create mode 100755 contrib/single_file_decoder/create_single_file_decoder.sh diff --git a/contrib/single_file_decoder/README.md b/contrib/single_file_decoder/README.md index bf568be9c..159214e1b 100644 --- a/contrib/single_file_decoder/README.md +++ b/contrib/single_file_decoder/README.md @@ -7,7 +7,10 @@ Create `zstddeclib.c` from the Zstd source using: cd zstd/contrib/declib ./combine.sh -r ../../lib -r ../../lib/common -r ../../lib/decompress -o zstddeclib.c zstddeclib-in.c ``` -Then add the resulting file to your project (see the [example files](examples)). `build.sh` will run the above script then compile and test the library. +Then add the resulting file to your project (see the [example files](examples)). + +`create_single_file_decoder.sh` will run the above script, creating file `zstddeclib.c`. +`build_test.sh` will create the decoder, then compile and test the library. Why --- diff --git a/contrib/single_file_decoder/build.sh b/contrib/single_file_decoder/build_test.sh similarity index 85% rename from contrib/single_file_decoder/build.sh rename to contrib/single_file_decoder/build_test.sh index 9b85c551e..1b8e152da 100755 --- a/contrib/single_file_decoder/build.sh +++ b/contrib/single_file_decoder/build_test.sh @@ -10,13 +10,13 @@ OUT_FILE="tempbin" OUT_WASM="temp.wasm" # Amalgamate the sources -./combine.sh -r "$ZSTD_SRC_ROOT" -r "$ZSTD_SRC_ROOT/common" -r "$ZSTD_SRC_ROOT/decompress" -o zstddeclib.c zstddeclib-in.c +./create_single_file_decoder.sh # Did combining work? if [ $? -ne 0 ]; then - echo "Combine script: FAILED" + echo "Single file decoder creation script: FAILED" exit 1 fi -echo "Combine script: PASSED" +echo "Single file decoder creation script: PASSED" # Compile the generated output cc -Os -g0 -o $OUT_FILE examples/simple.c diff --git a/contrib/single_file_decoder/create_single_file_decoder.sh b/contrib/single_file_decoder/create_single_file_decoder.sh new file mode 100755 index 000000000..49f14cbd3 --- /dev/null +++ b/contrib/single_file_decoder/create_single_file_decoder.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +# Where to find the sources +ZSTD_SRC_ROOT="../../lib" + + +# Amalgamate the sources +./combine.sh -r "$ZSTD_SRC_ROOT" -r "$ZSTD_SRC_ROOT/common" -r "$ZSTD_SRC_ROOT/decompress" -o zstddeclib.c zstddeclib-in.c +# Did combining work? +if [ $? -ne 0 ]; then + echo "Combine script: FAILED" + exit 1 +fi +echo "Combine script: PASSED" From cd43f7d965b1a0fd4a260ac4c05f086e7ba21c4b Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Tue, 27 Aug 2019 16:04:12 -0700 Subject: [PATCH 3/6] added single_file_decoder to contrib/ tests --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index b89842904..acf50cfa3 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,7 @@ contrib: lib $(MAKE) -C contrib/pzstd all $(MAKE) -C contrib/seekable_format/examples all $(MAKE) -C contrib/largeNbDicts all + cd contrib/single_file_decoder/ ; ./build_test.sh .PHONY: cleanTabs cleanTabs: From 416157df8093fd4445259f0b7c57c7cc28bb2dc3 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Tue, 27 Aug 2019 16:38:21 -0700 Subject: [PATCH 4/6] try to debug issues on CirrusCI --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index acf50cfa3..887822a6b 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,7 @@ contrib: lib $(MAKE) -C contrib/pzstd all $(MAKE) -C contrib/seekable_format/examples all $(MAKE) -C contrib/largeNbDicts all - cd contrib/single_file_decoder/ ; ./build_test.sh + cd contrib/single_file_decoder/ ; ls ; sh ./build_test.sh .PHONY: cleanTabs cleanTabs: From 4b3a8fe1c4ac07da15545df947560a75cbf91e10 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Wed, 28 Aug 2019 13:23:48 -0700 Subject: [PATCH 5/6] fix create_ script for sh --- contrib/single_file_decoder/create_single_file_decoder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/single_file_decoder/create_single_file_decoder.sh b/contrib/single_file_decoder/create_single_file_decoder.sh index 5f6ba2977..ad976bb8b 100755 --- a/contrib/single_file_decoder/create_single_file_decoder.sh +++ b/contrib/single_file_decoder/create_single_file_decoder.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Where to find the sources ZSTD_SRC_ROOT="../../lib" From e7ad20c9dc8eeecd065391f2b1bf824c6fdd9285 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Wed, 28 Aug 2019 13:46:18 -0700 Subject: [PATCH 6/6] update test script --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 887822a6b..acf50cfa3 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,7 @@ contrib: lib $(MAKE) -C contrib/pzstd all $(MAKE) -C contrib/seekable_format/examples all $(MAKE) -C contrib/largeNbDicts all - cd contrib/single_file_decoder/ ; ls ; sh ./build_test.sh + cd contrib/single_file_decoder/ ; ./build_test.sh .PHONY: cleanTabs cleanTabs: