Skip to content

Commit fb366be

Browse files
jeromegntantaman
authored andcommitted
use commit sha from env and prevent file being replaced every new commit
1 parent df9c3b4 commit fb366be

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

core/Makefile

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ TARGET_TEST=$(prefix)/test
8383
TARGET_FUZZ=$(prefix)/fuzz
8484
TARGET_TEST_ASAN=$(prefix)/test-asan
8585

86-
8786
# js/browser/wa-sqlite/Makefile, deps/sqlite/GNUMakefile, core/binding.gyp, core/Makefile
8887
ext_files=src/crsqlite.c \
8988
src/changes-vtab.c \
@@ -170,19 +169,23 @@ $(shell.c):
170169
$(sqlite3.c):
171170
cd $(sqlite_src) && make sqlite3.c
172171

173-
$(rs_lib_dbg_static_cpy): FORCE write_sha $(dbg_prefix)
172+
$(rs_lib_dbg_static_cpy): export CRSQLITE_COMMIT_SHA = $(shell git rev-parse HEAD)
173+
$(rs_lib_dbg_static_cpy): FORCE $(dbg_prefix)
174174
cd ./rs/$(bundle) && cargo rustc $(RS_TARGET) --features static,omit_load_extension$(libsql_feature) $(rs_build_flags)
175175
cp $(rs_lib_dbg_static) $(rs_lib_dbg_static_cpy)
176176

177-
$(rs_lib_static_cpy): FORCE write_sha $(prefix)
177+
$(rs_lib_static_cpy): export CRSQLITE_COMMIT_SHA = $(shell git rev-parse HEAD)
178+
$(rs_lib_static_cpy): FORCE $(prefix)
178179
cd ./rs/$(bundle) && cargo rustc $(RS_TARGET) --release --features static,omit_load_extension$(libsql_feature) $(rs_build_flags)
179180
cp $(rs_lib_static) $(rs_lib_static_cpy)
180181

181-
$(rs_lib_loadable_cpy): FORCE write_sha $(prefix)
182+
$(rs_lib_loadable_cpy): export CRSQLITE_COMMIT_SHA = $(shell git rev-parse HEAD)
183+
$(rs_lib_loadable_cpy): FORCE $(prefix)
182184
cd ./rs/$(bundle) && cargo $(rs_ndk) build $(RS_TARGET) --release --features loadable_extension$(libsql_feature) $(rs_build_flags)
183185
cp $(rs_lib_loadable) $(rs_lib_loadable_cpy)
184186

185-
$(rs_lib_dbg_loadable_cpy): FORCE write_sha $(dbg_prefix)
187+
$(rs_lib_dbg_loadable_cpy): export CRSQLITE_COMMIT_SHA = $(shell git rev-parse HEAD)
188+
$(rs_lib_dbg_loadable_cpy): FORCE $(dbg_prefix)
186189
cd ./rs/$(bundle) && cargo rustc $(RS_TARGET) --features loadable_extension$(libsql_feature) $(rs_build_flags)
187190
cp $(rs_lib_dbg_loadable) $(rs_lib_dbg_loadable_cpy)
188191

@@ -281,8 +284,3 @@ $(TARGET_FUZZ): $(prefix) $(TARGET_SQLITE3_EXTRA_C) src/fuzzer.cc $(ext_files)
281284
ubsan analyzer fuzz asan static
282285

283286
FORCE: ;
284-
285-
write_sha:
286-
@COMMIT_SHA=`git rev-parse HEAD` && \
287-
sed -i.bak "s/\"[^\"]*\"/\"$$COMMIT_SHA\"/" ./rs/core/src/sha.rs && \
288-
rm -f ./rs/core/src/sha.rs.bak

core/rs/core/src/sha.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// The sha of the commit that this version of crsqlite was built from.
2-
pub const SHA: &'static str = "da2e95270d76818cd487029ad3786e9463fa341b";
2+
pub const SHA: &'static str = core::env!("CRSQLITE_COMMIT_SHA");

0 commit comments

Comments
 (0)