Skip to content

Commit

Permalink
Shuffle
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr committed Jan 20, 2025
1 parent ad30dd2 commit 84c9360
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 19 deletions.
24 changes: 12 additions & 12 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ set -ex

cd $(dirname $0)/src

# The duckdb sources are xz-compressed in the tarball to keep it under 5000000 bytes.
# This happens in the cleanup script.

if [ -f duckdb.tar.xz ]; then
if [ -d duckdb ]; then
echo "Ignoring duckdb.tar.gz because duckdb directory still exists"
rm duckdb.tar.xz
else
tar xJf duckdb.tar.xz
fi
fi

# The purpose of this is to avoid rebuilding duckdb in every CI/CD run.
# We set the DUCKDB_R_PREBUILT_ARCHIVE environment variable to a file path
# that contains a .tar of all object files.
Expand All @@ -27,15 +39,3 @@ if [ -f "${DUCKDB_R_PREBUILT_ARCHIVE}" ] && tar -xm -f ${DUCKDB_R_PREBUILT_ARCHI
else
cp include/to-tar.mk Makevars.duckdb
fi

# The duckdb sources are xz-compressed in the tarball to keep it under 5000000 bytes.
# This happens in the cleanup script.

if [ -f duckdb.tar.xz ]; then
if [ -d duckdb ]; then
echo "Ignoring duckdb.tar.gz because duckdb directory still exists"
rm duckdb.tar.xz
else
tar xJf duckdb.tar.xz
fi
fi
19 changes: 12 additions & 7 deletions configure.win
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ if [ "$(${R_HOME}/bin/Rscript --vanilla -e 'writeLines(format(getRversion() < "4
gunzip -k librstrtmgr.a.gz
fi

# The duckdb sources are xz-compressed in the tarball to keep it under 5000000 bytes.
# This happens in the cleanup script.

if [ -f duckdb.tar.xz ]; then
if [ -d duckdb ]; then
echo "Ignoring duckdb.tar.gz because duckdb directory still exists"
rm duckdb.tar.xz
else
tar xJf duckdb.tar.xz
fi
fi

# The purpose of this is to avoid rebuilding duckdb in every CI/CD run.
# We set the DUCKDB_R_PREBUILT_ARCHIVE environment variable to a file path
# that contains a .tar of all object files.
Expand All @@ -33,10 +45,3 @@ if [ -f "${DUCKDB_R_PREBUILT_ARCHIVE}" ] && tar -xm --force-local -f ${DUCKDB_R_
else
cp include/to-tar-win.mk Makevars.duckdb
fi

# The duckdb sources are xz-compressed in the tarball to keep it under 5000000 bytes.
# This happens in the cleanup script.

if [ -f duckdb.tar.xz ]; then
tar xJf duckdb.tar.xz
fi

0 comments on commit 84c9360

Please sign in to comment.