Create each distinct wasm build into its own dir, instead of all going to in jswasm/sqlite3.wasm, so that the build can now run in parallel.
FossilOrigin-Name: 47526a75f2ad85100b1eae7ab1cf9a9dddd4430a99f7a30aa0c16548d1db9d33
This commit is contained in:
stephan
+10
-9
@@ -46,6 +46,8 @@ MAKING_CLEAN = $(if $(filter %clean,$(MAKECMDGOALS)),1,0)
|
||||
.PHONY: clean distclean
|
||||
clean:
|
||||
-rm -f $(CLEAN_FILES)
|
||||
-rm -fr $(dir.fiddle-debug) $(dir.dout) $(dir.dout) $(dir.tmp)
|
||||
|
||||
distclean: clean
|
||||
-rm -f $(DISTCLEAN_FILES)
|
||||
|
||||
@@ -172,7 +174,6 @@ $(MKDIR.bld):
|
||||
@mkdir -p $@ $(dir.dout)
|
||||
|
||||
CLEAN_FILES += *~ $(dir.jacc)/*~ $(dir.api)/*~ $(dir.common)/*~ $(dir.fiddle)/*~ \
|
||||
$(dir.fiddle-debug)/* $(dir.dout)/* $(dir.tmp)/*
|
||||
|
||||
########################################################################
|
||||
# Set up sqlite3.c and sqlite3.h...
|
||||
@@ -210,7 +211,7 @@ endif
|
||||
# It's important that sqlite3.h be built to completion before any
|
||||
# other parts of the build run, thus we use .NOTPARALLEL to disable
|
||||
# parallel build of that file and its dependants.
|
||||
.NOTPARALLEL: $(sqlite3.h)
|
||||
#.NOTPARALLEL: $(sqlite3.h)
|
||||
$(sqlite3.h):
|
||||
$(MAKE) -C $(dir.top) sqlite3.c
|
||||
$(sqlite3.c): $(sqlite3.h)
|
||||
@@ -366,7 +367,7 @@ endif
|
||||
# info from $(bin.version-info) which differ from their runtime-emitted
|
||||
# version info (e.g. from sqlite3_libversion()).
|
||||
bin.version-info = $(dir.top)/version-info
|
||||
.NOTPARALLEL: $(bin.version-info)
|
||||
#.NOTPARALLEL: $(bin.version-info)
|
||||
$(bin.version-info): $(dir.tool)/version-info.c $(sqlite3.h) $(dir.top)/Makefile
|
||||
$(MAKE) -C $(dir.top) version-info
|
||||
|
||||
@@ -886,12 +887,12 @@ EXPORTED_FUNCTIONS.fiddle = $(dir.tmp)/EXPORTED_FUNCTIONS.fiddle
|
||||
# together. i.e. we're building $(sqlite3.wasm) multiple times, but
|
||||
# that's unavoidable (and harmless, but is a significant waste of
|
||||
# build time).
|
||||
$(sqlite3.wasm): $(sqlite3.js)
|
||||
$(sqlite3.mjs): $(sqlite3.js)
|
||||
$(sqlite3-64bit.wasm): $(sqlite3-64bit.js)
|
||||
$(sqlite3-64bit.mjs): $(sqlite3-64bit.js)
|
||||
$(dir.dout)/sqlite3-bundler-friendly.mjs: $(sqlite3.mjs)
|
||||
$(dir.dout)/sqlite3-node.mjs: $(sqlite3.mjs)
|
||||
#$(sqlite3.wasm): $(sqlite3.js)
|
||||
#$(sqlite3.mjs): $(sqlite3.js)
|
||||
#$(sqlite3-64bit.wasm): $(sqlite3-64bit.js)
|
||||
#$(sqlite3-64bit.mjs): $(sqlite3-64bit.js)
|
||||
#$(dir.dout)/sqlite3-bundler-friendly.mjs: $(sqlite3.mjs)
|
||||
#$(dir.dout)/sqlite3-node.mjs: $(sqlite3.mjs)
|
||||
#CLEAN_FILES += $(sqlite3.wasm)
|
||||
|
||||
# This block MUST come between the above definitions of
|
||||
|
||||
+100
-103
@@ -81,10 +81,8 @@ struct BuildDef {
|
||||
/**
|
||||
Base name of output JS and WASM files.
|
||||
*/
|
||||
const char *zWasmFile;
|
||||
const char *zJsOut; /* Name of generated sqlite3.js/.mjs */
|
||||
const char *zWasmOut; /* zJsOut w/ .wasm extension if it needs to
|
||||
be renamed. Do we still need this? */
|
||||
const char *zBaseName;
|
||||
const char *zReuseThis;
|
||||
const char *zCmppD; /* Extra -D... flags for c-pp */
|
||||
const char *zEmcc; /* Extra flags for emcc */
|
||||
const char *zEnv; /* emcc -sENVIRONMENT=X flag */
|
||||
@@ -107,11 +105,8 @@ typedef struct BuildDef BuildDef;
|
||||
|
||||
/* List of distinct library builds. See next comment block. */
|
||||
#define BuildDefs_map(E) \
|
||||
E(canonical) \
|
||||
E(esm)
|
||||
E(vanilla) E(vanilla64) E(esm) E(esm64)
|
||||
/*
|
||||
E(canonical64) \
|
||||
E(esm64) \
|
||||
E(bundler) \
|
||||
E(bundler64) \
|
||||
E(node) \
|
||||
@@ -133,58 +128,54 @@ struct BuildDefs {
|
||||
typedef struct BuildDefs BuildDefs;
|
||||
|
||||
const BuildDefs oBuildDefs = {
|
||||
.canonical = {
|
||||
.zWasmFile ="sqlite3",
|
||||
.zJsOut ="$(dir.dout)/sqlite3.js",
|
||||
.zWasmOut = 0,
|
||||
.zCmppD = "-Djust-testing",
|
||||
.zEmcc =0,
|
||||
.zEnv = "web,worker"
|
||||
/* MUST be non-NULL in the canonical build so it can be used as
|
||||
a default for all others. */,
|
||||
.flags = 0
|
||||
.vanilla = {
|
||||
/* This one's zBaseName and zEnv MUST be non-NULL so it can be
|
||||
used as a default for all others. */
|
||||
.zBaseName ="sqlite3",
|
||||
.zReuseThis = 0,
|
||||
.zCmppD = 0,
|
||||
.zEmcc = 0,
|
||||
.zEnv = "web,worker",
|
||||
.flags = 0
|
||||
},
|
||||
|
||||
.vanilla64 = {
|
||||
.zBaseName = "sqlite3",
|
||||
.zReuseThis = 0,
|
||||
.zCmppD = 0,
|
||||
.zEmcc = "-sMEMORY64=1",
|
||||
.zEnv = 0,
|
||||
.flags = LIBMODE_64BIT // | LIBMODE_NOT_IN_ALL
|
||||
},
|
||||
|
||||
.esm = {
|
||||
.zWasmFile="sqlite3",
|
||||
.zJsOut="$(sqlite3.mjs)",
|
||||
.zWasmOut=0,
|
||||
.zCmppD= "-Dtarget=es6-module",
|
||||
.zEmcc=0,
|
||||
.zEnv = 0,
|
||||
.flags= LIBMODE_ESM
|
||||
},
|
||||
#if 0
|
||||
|
||||
.canonical64 = {
|
||||
.zWasmFile="sqlite3-64bit",
|
||||
.zJsOut="$(sqlite3-64bit.js)",
|
||||
.zWasmOut=0,
|
||||
.zCmppD=0,
|
||||
.zEmcc="-sMEMORY64=1",
|
||||
.zEnv = 0,
|
||||
.flags= LIBMODE_NOT_IN_ALL | LIBMODE_64BIT
|
||||
.zBaseName = "sqlite3",
|
||||
.zReuseThis = 0,
|
||||
.zCmppD = "-Dtarget=es6-module",
|
||||
.zEmcc = 0,
|
||||
.zEnv = 0,
|
||||
.flags = LIBMODE_ESM
|
||||
},
|
||||
|
||||
.esm64 = {
|
||||
.zWasmFile="sqlite3",
|
||||
.zJsOut="$(sqlite3-64bit.mjs)",
|
||||
.zWasmOut=0,
|
||||
.zCmppD=0,
|
||||
.zEmcc="-sMEMORY64=1",
|
||||
.zEnv = 0,
|
||||
.flags= LIBMODE_NOT_IN_ALL | LIBMODE_64BIT
|
||||
.zBaseName = 0,
|
||||
.zReuseThis = 0,
|
||||
.zCmppD = "-Dtarget=es6-module",
|
||||
.zEmcc = "-sMEMORY64=1",
|
||||
.zEnv = 0,
|
||||
.flags = LIBMODE_ESM | LIBMODE_64BIT // | LIBMODE_NOT_IN_ALL
|
||||
},
|
||||
|
||||
#if 0
|
||||
|
||||
.bundler = {
|
||||
/* Core bundler-friendly build. Untested and "not really"
|
||||
** supported, but required by the downstream npm subproject.
|
||||
** Testing these would require special-purpose node-based tools and
|
||||
** custom test apps. Or we can pass them off as-is to the npm
|
||||
** subproject and they spot failures pretty quickly ;). */
|
||||
.zWasmFile="sqlite3",
|
||||
.zJsOut="$(dir.dout)/sqlite3-bundler-friendly.mjs",
|
||||
.zWasmOut=0,
|
||||
.zBaseName="sqlite3",
|
||||
.zReuseThis=0,
|
||||
.zCmppD="$(c-pp.D.sqlite3-esm) -Dtarget=es6-bundler-friendly",
|
||||
.zEmcc=0,
|
||||
.zEnv = 0,
|
||||
@@ -192,9 +183,8 @@ const BuildDefs oBuildDefs = {
|
||||
},
|
||||
|
||||
.bundler64 = {
|
||||
.zWasmFile="sqlite3",
|
||||
.zJsOut="$(dir.dout)/sqlite3-bundler-friendly-64bit.mjs",
|
||||
.zWasmOut=0,
|
||||
.zBaseName="sqlite3",
|
||||
.zReuseThis=0,
|
||||
.zCmppD="$(c-pp.D.sqlite3-esm) -Dtarget=es6-bundler-friendly",
|
||||
.zEmcc="-sMEMORY64=1",
|
||||
.zEnv = 0,
|
||||
@@ -203,9 +193,8 @@ const BuildDefs oBuildDefs = {
|
||||
|
||||
/* Entirely unsupported. */
|
||||
.node = {
|
||||
.zWasmFile="sqlite3",
|
||||
.zJsOut="$(dir.dout)/sqlite3-node.mjs",
|
||||
.zWasmOut="sqlite3-node.wasm",
|
||||
.zBaseName="sqlite3-node",
|
||||
.zReuseThis=0,
|
||||
.zCmppD="$(c-pp.D.sqlite3-bundler-friendly) -Dtarget=node",
|
||||
.zEmcc=0,
|
||||
.zEnv = "node"
|
||||
@@ -219,9 +208,8 @@ const BuildDefs oBuildDefs = {
|
||||
|
||||
/* Entirely unsupported. */
|
||||
.wasmfs = {
|
||||
.zWasmFile="sqlite3-wasmfs",
|
||||
.zJsOut="$(dir.wasmfs)/sqlite3-wasmfs.mjs",
|
||||
.zWasmOut="sqlite3-wasmfs.wasm",
|
||||
.zBaseName="sqlite3-wasmfs",
|
||||
.zReuseThis=0,
|
||||
.zCmppD="$(c-pp.D.sqlite3-bundler-friendly) -Dwasmfs",
|
||||
.zEmcc="-sEXPORT_ES6 -sUSE_ES6_IMPORT_META",
|
||||
.zEnv = 0,
|
||||
@@ -431,30 +419,27 @@ static void mk_prologue(void){
|
||||
** populating those files.
|
||||
*/
|
||||
static void mk_pre_post(char const *zBuildName,
|
||||
const char *zCmppD /* optional -D flags for c-pp for the
|
||||
** --pre/--post-js files. */,
|
||||
const char *zWasmOut ){
|
||||
BuildDef const * pB ){
|
||||
/* Very common printf() args combo. */
|
||||
|
||||
pf("%s# Begin --pre/--post flags for %s\n", zBanner, zBuildName);
|
||||
if( zCmppD && *zCmppD ){
|
||||
pf("c-pp.D.%s = %s\n", zBuildName, zCmppD);
|
||||
}
|
||||
pf("pre-post.%s.flags ?=\n", zBuildName);
|
||||
pf("c-pp.D.%s = %s\n", zBuildName, pB->zCmppD ? pB->zCmppD : "");
|
||||
|
||||
/* --pre-js=... */
|
||||
ps("\n# --pre-js=...");
|
||||
pf("pre-js.%s.js = $(dir.tmp)/pre-js.%s.js\n",
|
||||
zBuildName, zBuildName);
|
||||
pf("$(pre-js.%s.js): $(MAKEFILE_LIST) "
|
||||
"$(sqlite3-license-version.js)\n", zBuildName);
|
||||
if( 0==WASM_CUSTOM_INSTANTIATE || 0==zWasmOut ){
|
||||
if( 0==WASM_CUSTOM_INSTANTIATE ){
|
||||
pf("$(eval $(call SQLITE.CALL.C-PP.FILTER,$(pre-js.js.in),"
|
||||
"$(pre-js.%s.js),"
|
||||
C_PP_D_CUSTOM_INSTANTIATE "$(c-pp.D.%s)))\n",
|
||||
zBuildName, zBuildName);
|
||||
}else{
|
||||
#if 0
|
||||
fixme;
|
||||
/* This part is needed for builds which have to rename the wasm file
|
||||
in zJsOut so that the loader can find it. */
|
||||
in zReuseThis so that the loader can find it. */
|
||||
pf("pre-js.%s.js.intermediary = "
|
||||
"$(dir.tmp)/pre-js.%s.intermediary.js\n",
|
||||
zBuildName, zBuildName);
|
||||
@@ -467,9 +452,10 @@ static void mk_pre_post(char const *zBuildName,
|
||||
pf("\tcp $(pre-js.%s.js.intermediary) $@\n", zBuildName);
|
||||
pf("\t@echo 'sIMS.wasmFilename = \"%s\";' >> $@\n", zWasmOut)
|
||||
/* see api/pre-js.c-pp.js:Module.instantiateModule() */;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* --post-js=... */
|
||||
ps("\n# --post-js=...");
|
||||
pf("post-js.%s.js = $(dir.tmp)/post-js.%s.js\n",
|
||||
zBuildName, zBuildName);
|
||||
pf("post-jses.%s = "
|
||||
@@ -481,7 +467,7 @@ static void mk_pre_post(char const *zBuildName,
|
||||
"$(post-js.%s.js),$(c-pp.D.%s)))\n",
|
||||
zBuildName, zBuildName, zBuildName);
|
||||
|
||||
/* --extern-post-js=... */
|
||||
ps("\n# --extern-post-js=...");
|
||||
pf("extern-post-js.%s.js = $(dir.tmp)/extern-post-js.%s.js\n",
|
||||
zBuildName, zBuildName);
|
||||
pf("$(eval $(call SQLITE.CALL.C-PP.FILTER,$(extern-post-js.js.in),"
|
||||
@@ -489,8 +475,9 @@ static void mk_pre_post(char const *zBuildName,
|
||||
C_PP_D_CUSTOM_INSTANTIATE "$(c-pp.D.%s)))\n",
|
||||
zBuildName, zBuildName);
|
||||
|
||||
ps("\n# --pre/post misc...");
|
||||
/* Combined flags for use with emcc... */
|
||||
pf("pre-post.%s.flags += "
|
||||
pf("pre-post.%s.flags = "
|
||||
"--extern-pre-js=$(sqlite3-license-version.js) "
|
||||
"--pre-js=$(pre-js.%s.js) "
|
||||
"--post-js=$(post-js.%s.js) "
|
||||
@@ -507,6 +494,7 @@ static void mk_pre_post(char const *zBuildName,
|
||||
pf("# End --pre/--post flags for %s%s", zBuildName, zBanner);
|
||||
}
|
||||
|
||||
#if 0
|
||||
/*
|
||||
** Emits rules for the fiddle builds.
|
||||
*/
|
||||
@@ -561,34 +549,40 @@ static void mk_fiddle(void){
|
||||
pf("# End fiddle%s%s", zTail, zBanner);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
** Emits makefile code for one build of the library.
|
||||
*/
|
||||
void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
|
||||
const char * zWasmOut = "$(basename $@).wasm"
|
||||
/* The various targets named X.js or X.mjs (pB->zJsOut) also generate
|
||||
** X.wasm, and we need that part of the name to perform some
|
||||
/* The various targets named X.js or X.mjs also generate X.wasm,
|
||||
** and we need that part of the name to perform some
|
||||
** post-processing after Emscripten generates X.wasm. */;
|
||||
const char * zJsExt = (LIBMODE_ESM & pB->flags)
|
||||
? ".mjs" : ".js";
|
||||
assert( pB->zWasmFile );
|
||||
assert( pB->zJsOut );
|
||||
/* Very common printf() args combo. */
|
||||
char const * const zBaseName = pB->zBaseName
|
||||
? pB->zBaseName : oBuildDefs.vanilla.zBaseName;
|
||||
|
||||
assert( oBuildDefs.vanilla.zEnv );
|
||||
assert( zBaseName );
|
||||
|
||||
pf("%s# Begin build [%s]. flags=0x%02x\n", zBanner, zBuildName, pB->flags);
|
||||
pf("# zJsOut=%s\n# zCmppD=%s\n# zWasmOut=%s\n", pB->zJsOut,
|
||||
pf("# zCmppD=%s\n# zBaseName=%s\n",
|
||||
pB->zCmppD ? pB->zCmppD : "<none>",
|
||||
pB->zWasmOut ? pB->zWasmOut : "");
|
||||
pf("$(info Setting up build [%s]: %s)\n", zBuildName, pB->zJsOut);
|
||||
zBaseName);
|
||||
|
||||
assert( oBuildDefs.canonical.zEnv );
|
||||
pf("dir.dout.%s ?= $(dir.dout)/%s\n", zBuildName, zBuildName);
|
||||
pf("out.%s.base = $(dir.dout.%s)/%s\n",
|
||||
zBuildName, zBuildName, zBaseName);
|
||||
pf("out.%s.js = $(dir.dout.%s)/%s%s\n",
|
||||
zBuildName, zBuildName, zBaseName, zJsExt);
|
||||
pf("out.%s.wasm = $(dir.dout.%s)/%s.wasm\n",
|
||||
zBuildName, zBuildName, zBaseName);
|
||||
pf("$(info Setting up build [%s]: $(out.%s.js))\n", zBuildName, zBuildName );
|
||||
pf("emcc.environment.%s = %s\n", zBuildName,
|
||||
pB->zEnv ? pB->zEnv : oBuildDefs.canonical.zEnv);
|
||||
pf("emcc.flags.%s =\n", zBuildName);
|
||||
if( pB->zEmcc ){
|
||||
pf("emcc.flags.%s += %s\n", zBuildName, pB->zEmcc);
|
||||
}
|
||||
pB->zEnv ? pB->zEnv : oBuildDefs.vanilla.zEnv);
|
||||
pf("emcc.flags.%s = %s\n", zBuildName, pB->zEmcc ? pB->zEmcc : "");
|
||||
|
||||
pf("sqlite3-api.%s.c-pp.js = $(dir.tmp)/sqlite3-api.%s.c-pp%s\n",
|
||||
zBuildName, zBuildName, zJsExt);
|
||||
@@ -600,26 +594,29 @@ void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
|
||||
}
|
||||
pf("$(sqlite3-api.%s.c-pp.js): $(sqlite3-api.jses)\n"
|
||||
"\t@echo 'Making $@ ...'; \\\n"
|
||||
"\tmkdir -p $(dir.dout.%s); \\\n"
|
||||
"\tfor i in $(sqlite3-api.jses); do \\\n"
|
||||
"\t\techo \"/* BEGIN FILE: $$i */\"; \\\n"
|
||||
"\t\tcat $$i; \\\n"
|
||||
"\t\techo \"/* END FILE: $$i */\"; \\\n"
|
||||
"\tdone > $@\n",
|
||||
zBuildName);
|
||||
zBuildName, zBuildName);
|
||||
|
||||
pf("$(sqlite3-api.%s.js): $(sqlite3-api.%s.c-pp.js)\n"
|
||||
"$(eval $(call SQLITE.CALL.C-PP.FILTER,"
|
||||
pf("$(sqlite3-api.%s.js): $(sqlite3-api.%s.c-pp.js)\n",
|
||||
zBuildName, zBuildName);
|
||||
pf("$(eval $(call SQLITE.CALL.C-PP.FILTER,"
|
||||
"$(sqlite3-api.%s.c-pp.js), " /* $1 = src */
|
||||
"$(sqlite3-api.%s.js), " /* $2 = tgt */
|
||||
"$(c-pp.D.%s)" /* $3 = c-pp -Dx=Y flags */
|
||||
"))\n",
|
||||
zBuildName, zBuildName, zBuildName,
|
||||
zBuildName, zBuildName);
|
||||
zBuildName, zBuildName, zBuildName);
|
||||
|
||||
mk_pre_post(zBuildName, pB->zCmppD, pB->zWasmOut);
|
||||
mk_pre_post(zBuildName, pB);
|
||||
|
||||
/* target pB->zJsOut */
|
||||
pf("%s: $(MAKEFILE_LIST) $(sqlite3-wasm.cfiles) $(EXPORTED_FUNCTIONS.api) "
|
||||
/* target pB->zReuseThis */
|
||||
pf(zBanner
|
||||
"# Build $(out.%s.js)\n"
|
||||
"$(out.%s.js): $(MAKEFILE_LIST) $(sqlite3-wasm.cfiles) $(EXPORTED_FUNCTIONS.api) "
|
||||
"$(bin.mkwb) "
|
||||
"$(pre-post.%s.deps) "
|
||||
"$(sqlite3-api.ext.jses)"
|
||||
@@ -629,7 +626,7 @@ void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
|
||||
** are still compiling, which is especially helpful when running
|
||||
** builds with long build times (like -Oz). */
|
||||
"\n",
|
||||
pB->zJsOut, zBuildName);
|
||||
zBuildName, zBuildName, zBuildName);
|
||||
pf("\t@echo \"Building $@ ...\"\n");
|
||||
if( LIBMODE_UNSUPPORTED & pB->flags ){
|
||||
ps("\t@echo 'ACHTUNG: $@ is an unsupported build. "
|
||||
@@ -659,12 +656,11 @@ void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
|
||||
pf("\t@$(call SQLITE.CALL.WASM-OPT,%s)\n", zWasmOut);
|
||||
ps("\t@$(SQLITE.strip-createExportWrapper)");
|
||||
/*
|
||||
** The above $(bin.emcc) call will write pB->zJsOut, a.k.a. $@, and
|
||||
** will create a like-named .wasm file (pB->zWasmOut). That .wasm
|
||||
** file name gets hard-coded into $@ so we need to, for some cases,
|
||||
** patch zJsOut to use the name sqlite3.wasm instead. The resulting
|
||||
** .wasm file is identical for all builds for which pB->zEmcc is
|
||||
** empty.
|
||||
** The above $(bin.emcc) call will write out $@, and will create a
|
||||
** like-named .wasm file. That .wasm file name gets hard-coded into
|
||||
** $@ so we need to, for some cases, patch zReuseThis to use the name
|
||||
** sqlite3.wasm instead. The resulting .wasm file is identical for
|
||||
** all builds for which pB->zEmcc is empty.
|
||||
*/
|
||||
if( (LIBMODE_BUNDLER_FRIENDLY & pB->flags) ){
|
||||
#if 1
|
||||
@@ -672,12 +668,12 @@ void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
|
||||
zBuildName);
|
||||
#else
|
||||
fixme;
|
||||
pf("\t@echo 'Patching $@ for %s.wasm...'; \\\n", pB->zWasmFile);
|
||||
pf("\t@echo 'Patching $@ for %s.wasm...'; \\\n", zBaseName);
|
||||
pf("\t\trm -f %s; \\\n", zWasmOut);
|
||||
pf("\t\tsed -i -e 's/\"%s.wasm\"/\"%s.wasm\"/g' $@ || exit;\n",
|
||||
/* ^^^^^^ reminder: Mac/BSD sed has no -i flag but this
|
||||
** build process explicitly requires a Linux system. */
|
||||
zNM, pB->zWasmFile);
|
||||
zNM, zBaseName);
|
||||
pf("\t@ls -la $@\n");
|
||||
if( LIBMODE_BUNDLER_FRIENDLY & pB->flags ){
|
||||
/* Avoid a 3rd occurrence of the bug fixed by 65798c09a00662a3,
|
||||
@@ -695,10 +691,11 @@ void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
|
||||
}
|
||||
|
||||
if( LIBMODE_64BIT & pB->flags ){
|
||||
pf("64bit: %s\n", pB->zJsOut);
|
||||
}else if( 0==(LIBMODE_NOT_IN_ALL & pB->flags)
|
||||
&& 0==(LIBMODE_UNSUPPORTED & pB->flags) ){
|
||||
pf("all: %s\n", pB->zJsOut);
|
||||
pf("64bit: $(out.%s.js)\n", zBuildName);
|
||||
}
|
||||
if( 0==(LIBMODE_NOT_IN_ALL & pB->flags)
|
||||
&& 0==(LIBMODE_UNSUPPORTED & pB->flags) ){
|
||||
pf("all: $(out.%s.js)\n", zBuildName);
|
||||
}
|
||||
pf("# End build [%s]%s", zBuildName, zBanner);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
C Start\sreworking\sthe\swasm\sbuild\s(again)\swith\san\seye\stowards\ssimplifying\sit.\sCurrently\sonly\sthe\scanonical\sand\sesm\sbuilds\swork,\snot\sfiddle,\sspeedtest,\snor\sthe\sbundler\sstuff.
|
||||
D 2025-09-23T05:10:19.006
|
||||
C Create\seach\sdistinct\swasm\sbuild\sinto\sits\sown\sdir,\sinstead\sof\sall\sgoing\sto\sin\sjswasm/sqlite3.wasm,\sso\sthat\sthe\sbuild\scan\snow\srun\sin\sparallel.
|
||||
D 2025-09-23T06:31:24.072
|
||||
F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
@@ -578,7 +578,7 @@ F ext/session/sqlite3session.c 9cd47bfefb23c114b7a5d9ee5822d941398902f30516bf0dd
|
||||
F ext/session/sqlite3session.h 7404723606074fcb2afdc6b72c206072cdb2b7d8ba097ca1559174a80bc26f7a
|
||||
F ext/session/test_session.c 8766b5973a6323934cb51248f621c3dc87ad2a98f023c3cc280d79e7d78d36fb
|
||||
F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
|
||||
F ext/wasm/GNUmakefile 7053c5c34f2bb7d483c8e92835447326b27b40bb326d27cdc3c20efd02e11ef5
|
||||
F ext/wasm/GNUmakefile c3ed2f1449f6c9eb8a291c96b4e0b454d1c27bfa17ea416eacd09d48a01a840f
|
||||
F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
|
||||
F ext/wasm/README.md 66ace67ae98a45e4116f2ca5425b716887bcee4d64febee804ff6398e1ae9ec7
|
||||
F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
|
||||
@@ -639,7 +639,7 @@ F ext/wasm/index-dist.html 56132399702b15d70c474c3f1952541e25cb0922942868f70daf1
|
||||
F ext/wasm/index.html bcaa00eca521b372a6a62c7e7b17a870b0fcdf3e418a5921df1fd61e5344080d
|
||||
F ext/wasm/jaccwabyt/jaccwabyt.js bbac67bc7a79dca34afe6215fd16b27768d84e22273507206f888c117e2ede7d
|
||||
F ext/wasm/jaccwabyt/jaccwabyt.md 167fc0b624c9bc2c477846e336de9403842d81b1a24fc4d3b24317cb9eba734f
|
||||
F ext/wasm/mkwasmbuilds.c db0ddd41f3a6d7692af1f5be5b0f5fc286ebbfc9ea37f20c6e12ea6f7d8bbe4f
|
||||
F ext/wasm/mkwasmbuilds.c 21535d1742777a76dd00b53ec0e9566782318d0a9aec08f54eed0aa49b6423bc
|
||||
F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337
|
||||
F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96
|
||||
F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63
|
||||
@@ -2175,11 +2175,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
|
||||
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
|
||||
F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
|
||||
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
||||
P 3e2ea990ad76f9e68d514568f53eaa692a1eb11695fceb1bcc58cea00605fff9
|
||||
R 25d42b661484b8b607ad50c1c253dba3
|
||||
T *branch * wasm-rebuild-2025
|
||||
T *sym-wasm-rebuild-2025 *
|
||||
T -sym-trunk * Cancelled\sby\sbranch.
|
||||
P 102c4a35b86405273d1f7e9e34466c9deed7831099a8207b6f48746b998193f9
|
||||
R 507652776b7fcff767cc0772a4c41fe1
|
||||
U stephan
|
||||
Z 442c6f30179ffbc3ae701380b6b17efc
|
||||
Z aefc81491b4816a018bbebce8587a431
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
102c4a35b86405273d1f7e9e34466c9deed7831099a8207b6f48746b998193f9
|
||||
47526a75f2ad85100b1eae7ab1cf9a9dddd4430a99f7a30aa0c16548d1db9d33
|
||||
|
||||
Reference in New Issue
Block a user