Skip to content

Commit 22dd5ea

Browse files
committed
fix dump paths
1 parent b4bcd80 commit 22dd5ea

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

pglite-REL_17_4_WASM/pg_main.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,13 @@ __attribute__ ((export_name("pgl_backend")))
396396
#endif
397397
setenv("PGUSER", PGUSER, 1);
398398

399+
PDEBUG("--------- setting configuration ---------------------");
400+
if (!SelectConfigFiles(userDoption, "postgres"))
401+
puts("config error");
402+
else
403+
PDEBUG("cfg ok");
404+
405+
399406
AsyncPostgresSingleUserMain(single_argc, single_argv, PGUSER, async_restart);
400407

401408

wasm-build.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,20 @@ export PGROOT=${PGROOT:-/tmp/pglite}
2424
export WEBROOT=${WEBROOT:-/tmp/web}
2525

2626
export PG_BUILD=${BUILD:-/tmp/sdk/build}
27-
export PGL_BUILD_NATIVE=${PG_BUILD}/pglite-native
28-
export PGL_BUILD_DUMPS=${PG_BUILD}/dumps
27+
export PG_BUILD_DUMPS=${PG_BUILD}/dumps
28+
export PGL_BUILD_NATIVE=${PG_BUILD}/pglite-native
29+
2930

3031

3132
export PG_DIST=${DIST:-/tmp/sdk/dist}
32-
export PG_DIST_EXT=${PG_DIST}/extensions-emsdk
33+
export PG_DIST_EXT=${PG_DIST}/extensions-emsdk
3334

34-
export PGL_DIST_JS=${PG_DIST}/pglite-js
35-
export PGL_DIST_LINK=${PG_DIST}/pglite-link
35+
export PGL_DIST_JS=${PG_DIST}/pglite-js
36+
export PGL_DIST_LINK=${PG_DIST}/pglite-link
3637

37-
export PGL_DIST_NATIVE=${PG_DIST}/pglite-native
38-
export PGL_DIST_C=${PG_DIST}/pglite-native
39-
export PGL_DIST_WEB=${PG_DIST}/pglite-web
38+
export PGL_DIST_NATIVE=${PG_DIST}/pglite-native
39+
export PGL_DIST_C=${PG_DIST}/pglite-native
40+
export PGL_DIST_WEB=${PG_DIST}/pglite-web
4041

4142

4243
export DEBUG=${DEBUG:-true}
@@ -94,7 +95,7 @@ export PG_EXTRA=${PG_BUILD}/extra-${BUILD}
9495

9596

9697
# default to user writeable paths in /tmp/ .
97-
DIST_ALL="${PGROOT}/bin ${PG_DIST} ${PG_DIST_EXT} ${PGL_DIST_JS} ${PGL_BUILD_DUMPS} ${PGL_BUILD_NATIVE}"
98+
DIST_ALL="${PGROOT}/bin ${PG_DIST} ${PG_DIST_EXT} ${PG_BUILD_DUMPS} ${PGL_DIST_JS} ${PGL_BUILD_NATIVE}"
9899
DIST_ALL="$DIST_ALL ${PGL_DIST_LINK} ${PGL_DIST_NATIVE} ${PGL_DIST_WEB} ${PGL_DIST_C}"
99100
DIST_ALL="$DIST_ALL ${PG_EXTRA}"
100101

wasm-build/getsyms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def dbg(*argv, **kw):
2525
SECTION = "exports"
2626
WAY = "-> "
2727

28-
with open(os.environ.get("PGDUMP", "dump.postgres"), "r") as pgdump:
28+
with open(os.environ.get("PGDUMP", "/tmp/sdk/dist/pglite-link/exports/pgcore.exports"), "r") as pgdump:
2929
for line in pgdump.readlines():
3030
line = line.strip(";\n\r")
3131
if line:
@@ -37,7 +37,7 @@ def dbg(*argv, **kw):
3737
SECTION = "imports"
3838
WAY = "<- "
3939

40-
with open(os.environ.get("OBJDUMP", "dump.wasm-objdump"), "r") as wasmdump:
40+
with open(os.environ.get("OBJDUMP", "/tmp/dump.wasm-objdump"), "r") as wasmdump:
4141
for line in wasmdump.readlines():
4242
line = line.strip()
4343

0 commit comments

Comments
 (0)