From 0e6bd2224f2901e986a0eb4aab97ab46319f6313 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Wed, 6 May 2020 19:38:49 -0700 Subject: [PATCH] Fixes issue 863 (#864) * Fixes issue 863 --- singleheader/amalgamate.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/singleheader/amalgamate.sh b/singleheader/amalgamate.sh index b7e125b4..9dc798fd 100755 --- a/singleheader/amalgamate.sh +++ b/singleheader/amalgamate.sh @@ -5,13 +5,16 @@ ######################################################################## set -e + SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" -PROJECTPATH=$(realpath "$SCRIPTPATH/.."); +PROJECTPATH=$SCRIPTPATH"/.." +echo "Project at "$PROJECTPATH + echo "We are about to amalgamate all simdjson files into one source file. " echo "See https://www.sqlite.org/amalgamation.html and https://en.wikipedia.org/wiki/Single_Compilation_Unit for rationale. " -if [ -z "$AMALGAMATE_SOURCE_PATH" ]; then AMALGAMATE_SOURCE_PATH=$(realpath "$SCRIPTPATH/../src"); fi -if [ -z "$AMALGAMATE_INCLUDE_PATH" ]; then AMALGAMATE_INCLUDE_PATH=$(realpath "$SCRIPTPATH/../include"); fi +if [ -z "$AMALGAMATE_SOURCE_PATH" ]; then AMALGAMATE_SOURCE_PATH="$SCRIPTPATH/../src"; fi +if [ -z "$AMALGAMATE_INCLUDE_PATH" ]; then AMALGAMATE_INCLUDE_PATH="$SCRIPTPATH/../include"; fi if [ -z "$AMALGAMATE_OUTPUT_PATH" ]; then AMALGAMATE_OUTPUT_PATH="$SCRIPTPATH"; fi # this list excludes the "src/generic headers"