Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes #1669

Merged
merged 3 commits into from
Mar 11, 2024
Merged

Minor fixes #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1abe838
Minor Makefile fixes
carlopi Mar 11, 2024
c569dfd
Temporarily patch Makefile
carlopi Mar 11, 2024
0e23ca5
script/generate_tpch_duckdb to be independent of local build
carlopi Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ check_format:
set_environment:
command -v emcc &> /dev/null && EXEC_ENVIRONMENT="" && echo '\033[1m=== Using native mode ===\033[0m' && echo 'Emscripten from' && which emcc || (EXEC_ENVIRONMENT=echo ${DOCKER_EXEC_ENVIRONMENT} && echo '\033[1m === Using docker environment === \033[0m')

build/data: build/duckdb_shell
build/data:
${ROOT_DIR}/scripts/generate_uni.sh
${ROOT_DIR}/scripts/generate_tpch_tbl.sh 0.01
${ROOT_DIR}/scripts/generate_tpch_tbl.sh 0.1
Expand Down Expand Up @@ -364,6 +364,9 @@ build_loadable:
cp .github/config/extension_config_wasm.cmake submodules/duckdb/extension/extension_config.cmake
DUCKDB_PLATFORM=wasm_${TARGET} DUCKDB_WASM_LOADABLE_EXTENSIONS=1 GEN=ninja ./scripts/wasm_build_lib.sh relsize ${TARGET}

build_loadable_unsigned: build_loadable
# need to propagate the unsigned flag

serve_loadable_base: wasmpack shell docs
yarn workspace @duckdb/duckdb-wasm-app build:release
cp -r build/extension_repository packages/duckdb-wasm-app/build/release/.
Expand Down Expand Up @@ -425,6 +428,7 @@ compile_commands:
.PHONY: clean
clean:
rm -rf build
rm -rf target
cd packages/duckdb-wasm-shell && rm -rf node_modules
rm -rf packages/duckdb-wasm-app/build
rm -rf submodules/duckdb/build
Expand Down
5 changes: 1 addition & 4 deletions scripts/generate_tpch_duckdb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ trap exit SIGINT
PROJECT_ROOT="$(cd $(dirname "$BASH_SOURCE[0]") && cd .. && pwd)" &> /dev/null
DUCKDB_DIR="${PROJECT_ROOT}/submodules/duckdb/"
DUCKDB_BUILD_DIR="${DUCKDB_DIR}/build/Release"
DUCKDB_SHELL="${DUCKDB_BUILD_DIR}/duckdb"
DUCKDB_SHELL="duckdb"
SCALE_FACTOR=${1:-0.01}
SCALE_FACTOR_DIR=${SCALE_FACTOR/./_}
TPCH_DIR=${PROJECT_ROOT}/data/tpch
Expand All @@ -16,9 +16,6 @@ TPCH_SF_OUT_DUCKDB=${TPCH_SF_OUT}/duckdb
TPCH_SF_OUT_DUCKDB_DB=${TPCH_SF_OUT_DUCKDB}/db
DUCKDB_SCRIPT_FILE=${TPCH_SF_OUT_DUCKDB}/script.sql

if [ ! -f ${DUCKDB_SHELL} ]; then
${PROJECT_ROOT}/scripts/build_duckdb_shell.sh
fi
chmod +x ${DUCKDB_SHELL}
mkdir -p ${TPCH_SF_OUT_DUCKDB}
rm -r ${TPCH_SF_OUT_DUCKDB}
Expand Down