Add amalgamation sources

marcboeker · Oct 6, 2023 · 80c7afa · 80c7afa
1 parent 7741bf2
commit 80c7afa
Show file tree

Hide file tree

Showing 25 changed files with 408,243 additions and 409,116 deletions.
diff --git a/.github/workflows/deps.yaml b/.github/workflows/deps.yaml
@@ -7,9 +7,7 @@ on:
       - master
     paths:
       - ".github/workflows/**"
-      - "duckdb.cpp"
-      - "duckdb.h"
-      - "duckdb.hpp"
+      - "lib/**"
 jobs:
   darwin_amd64:
     runs-on: macos-latest

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,4 @@
 .DS_Store
 run.sh
 duckdb/
-duckdb-src/
-/lib
 .idea
diff --git a/Makefile b/Makefile
@@ -27,10 +27,11 @@ deps.source:
 
 	git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
 	cd duckdb/ && python3 scripts/amalgamation.py --extended --splits=10 && cd ..
-	mkdir -p duckdb-src
 
+	rm -rf lib
+	mkdir lib
 	cd duckdb/src/amalgamation && for f in *; do \
-		echo '#ifdef GODUCKDB_FROM_SOURCE' > ../../../duckdb-src/$$f; cat $$f >> ../../../duckdb-src/$$f; echo '\n#endif' >> ../../../duckdb-src/$$f; \
+		echo '#ifdef GODUCKDB_FROM_SOURCE' > ../../../lib/$$f; cat $$f >> ../../../lib/$$f; echo '\n#endif' >> ../../../lib/$$f; \
 	done
 
 	cp duckdb/src/include/duckdb.h duckdb.h
@@ -39,27 +40,27 @@ deps.source:
 .PHONY: deps.darwin.amd64
 deps.darwin.amd64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "darwin" ]; then echo "Error: must run build on darwin"; false; fi
-	cd duckdb-src && g++ -std=c++11 -O3 --target=x86_64-apple-macos11 -DGODUCKDB_FROM_SOURCE -DNDEBUG -c *.cpp || true
-	ar rvs libduckdb.a duckdb-src/*.o
+	cd lib && g++ -std=c++11 -O3 --target=x86_64-apple-macos11 -DGODUCKDB_FROM_SOURCE -DNDEBUG -c *.cpp || true
+	ar rvs libduckdb.a lib/*.o
 	mv libduckdb.a deps/darwin_amd64/libduckdb.a
 
 .PHONY: deps.darwin.arm64
 deps.darwin.arm64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "darwin" ]; then echo "Error: must run build on darwin"; false; fi
-	cd duckdb-src && g++ -std=c++11 -O3 --target=arm64-apple-macos11 -DGODUCKDB_FROM_SOURCE -DNDEBUG -c *.cpp || true
-	ar rvs libduckdb.a duckdb-src/*.o
+	cd lib && g++ -std=c++11 -O3 --target=arm64-apple-macos11 -DGODUCKDB_FROM_SOURCE -DNDEBUG -c *.cpp || true
+	ar rvs libduckdb.a lib/*.o
 	mv libduckdb.a deps/darwin_arm64/libduckdb.a
 
 .PHONY: deps.linux.amd64
 deps.linux.amd64:
-	#if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "linux" ]; then echo "Error: must run build on linux"; false; fi
-	cd duckdb-src && g++ -std=c++11 -O3 -DGODUCKDB_FROM_SOURCE -DNDEBUG -c *.cpp || true
-	ar rvs libduckdb.a duckdb-src/*.o
+	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "linux" ]; then echo "Error: must run build on linux"; false; fi
+	cd lib && g++ -std=c++11 -O3 -DGODUCKDB_FROM_SOURCE -DNDEBUG -c *.cpp || true
+	ar rvs libduckdb.a lib/*.o
 	mv libduckdb.a deps/linux_amd64/libduckdb.a
 
 .PHONY: deps.linux.arm64
 deps.linux.arm64:
 	if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "linux" ]; then echo "Error: must run build on linux"; false; fi
-	cd duckdb-src && aarch64-linux-gnu-g++ -std=c++11 -O3 -DGODUCKDB_FROM_SOURCE -DNDEBUG -c *.cpp || true
-	aarch64-linux-gnu-gcc-ar rvs libduckdb.a duckdb-src/*.o
+	cd lib && aarch64-linux-gnu-g++ -std=c++11 -O3 -DGODUCKDB_FROM_SOURCE -DNDEBUG -c *.cpp || true
+	aarch64-linux-gnu-gcc-ar rvs libduckdb.a lib/*.o
 	mv libduckdb.a deps/linux_arm64/libduckdb.a
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,4 @@ @@
     .DS_Store
     run.sh
     duckdb/
-    duckdb-src/
-    /lib
     .idea