Skip to content

Commit e71a37f

Browse files
committed
fix: add post-build commands to copy generated files for multiple libraries
Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
1 parent 73cbf44 commit e71a37f

File tree

12 files changed

+54
-6
lines changed

12 files changed

+54
-6
lines changed

packages/base91/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@ set_target_properties(base91lib PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
3232
target_link_libraries(base91lib
3333
unofficial::base91::base91
3434
)
35+
36+
# Copy generated files to source directories
37+
add_custom_command(TARGET base91lib POST_BUILD
38+
COMMAND ${CMAKE_COMMAND} -E copy
39+
${CMAKE_CURRENT_BINARY_DIR}/base91lib.d.ts
40+
${CMAKE_CURRENT_SOURCE_DIR}/types/base91lib.d.ts
41+
COMMENT "Copying generated base91lib files to source directories"
42+
)

packages/base91/src/base91.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @ts-expect-error importing from a wasm file is resolved via a custom esbuild plugin
22
import load, { reset } from "../../../build/packages/base91/base91lib.wasm";
3-
import type { MainModule, CBasE91 } from "../../../build/packages/base91/base91lib.js";
3+
import type { MainModule, CBasE91 } from "../types/base91lib.js";
44
import { MainModuleEx } from "@hpcc-js/wasm-util";
55

66
// Ref: http://base91.sourceforge.net/#a5

packages/duckdb/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,11 @@ target_link_libraries(duckdblib
5252
PRIVATE $<IF:$<TARGET_EXISTS:duckdb>,duckdb,duckdb_static>
5353
PRIVATE nlohmann_json::nlohmann_json
5454
)
55+
56+
# Copy generated files to source directories
57+
add_custom_command(TARGET duckdblib POST_BUILD
58+
COMMAND ${CMAKE_COMMAND} -E copy
59+
${CMAKE_CURRENT_BINARY_DIR}/duckdblib.d.ts
60+
${CMAKE_CURRENT_SOURCE_DIR}/types/duckdblib.d.ts
61+
COMMENT "Copying generated duckdblib files to source directories"
62+
)

packages/duckdb/src/duckdb.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @ts-expect-error importing from a wasm file is resolved via a custom esbuild plugin
22
import load, { reset } from "../../../build/packages/duckdb/duckdblib.wasm";
3-
import type { MainModule, DuckDB as CPPDuckDB } from "../../../build/packages/duckdb/duckdblib.js";
3+
import type { MainModule, DuckDB as CPPDuckDB } from "../types/duckdblib.js";
44
import { MainModuleEx } from "@hpcc-js/wasm-util";
55

66
let g_duckdb: Promise<DuckDB>;

packages/expat/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@ set_target_properties(expatlib PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
3232
target_link_libraries(expatlib
3333
expat::expat
3434
)
35+
36+
# Copy generated files to source directories
37+
add_custom_command(TARGET expatlib POST_BUILD
38+
COMMAND ${CMAKE_COMMAND} -E copy
39+
${CMAKE_CURRENT_BINARY_DIR}/expatlib.d.ts
40+
${CMAKE_CURRENT_SOURCE_DIR}/types/expatlib.d.ts
41+
COMMENT "Copying generated expatlib files to source directories"
42+
)

packages/expat/src/expat.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @ts-expect-error importing from a wasm file is resolved via a custom esbuild plugin
22
import load, { reset } from "../../../build/packages/expat/expatlib.wasm";
3-
import type { MainModule, map_string_string } from "../../../build/packages/expat/expatlib.js";
3+
import type { MainModule, map_string_string } from "../types/expatlib.js";
44
import { MainModuleEx } from "@hpcc-js/wasm-util";
55

66
export type Attributes = { [key: string]: string };

packages/graphviz/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@ target_link_libraries(graphvizlib PRIVATE
8383
${EXPAT_LIBRARIES}
8484
)
8585

86+
# Copy generated files to source directories
87+
add_custom_command(TARGET graphvizlib POST_BUILD
88+
COMMAND ${CMAKE_COMMAND} -E copy
89+
${CMAKE_CURRENT_BINARY_DIR}/graphvizlib.d.ts
90+
${CMAKE_CURRENT_SOURCE_DIR}/types/graphvizlib.d.ts
91+
COMMENT "Copying generated graphvizlib files to source directories"
92+
)
93+
8694
# add_executable(graphvizlib-web
8795
# ${SRCS}
8896
# )

packages/graphviz/src/graphviz.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @ts-expect-error importing from a wasm file is resolved via a custom esbuild plugin
22
import load, { reset } from "../../../build/packages/graphviz/graphvizlib.wasm";
3-
import type { MainModule } from "../../../build/packages/graphviz/graphvizlib.js";
3+
import type { MainModule } from "../types/graphvizlib.js";
44
import { MainModuleEx } from "@hpcc-js/wasm-util";
55

66
/**

packages/llama/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,11 @@ target_link_libraries(llamalib
5454
PRIVATE ggml::ggml-cpu
5555
PRIVATE ${LLAMA_COMMON_LIBRARY}
5656
)
57+
58+
# Copy generated files to source directories
59+
add_custom_command(TARGET llamalib POST_BUILD
60+
COMMAND ${CMAKE_COMMAND} -E copy
61+
${CMAKE_CURRENT_BINARY_DIR}/llamalib.d.ts
62+
${CMAKE_CURRENT_SOURCE_DIR}/types/llamalib.d.ts
63+
COMMENT "Copying generated llamalib files to source directories"
64+
)

packages/llama/src/llama.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @ts-expect-error importing from a wasm file is resolved via a custom esbuild plugin
22
import load, { reset } from "../../../build/packages/llama/llamalib.wasm";
3-
import type { MainModule } from "../../../build/packages/llama/llamalib.js";
3+
import type { MainModule } from "../types/llamalib.js";
44
import { MainModuleEx } from "@hpcc-js/wasm-util";
55
import llamaMeta from "../../../vcpkg-overlays/llama-cpp/vcpkg.json" with { type: "json" };
66

0 commit comments

Comments
 (0)