Skip to content

Conversation

@mochaaP
Copy link
Contributor

@mochaaP mochaaP commented Oct 14, 2025

See the referenced commits in messages.

Split from #1187

fixup: 5a949ca ("CMake: Set _WIN32_WINNT=0x0601", quickjs-ng#900)
the original is -Ddisable_parser, invert that to make it less confusing
fixup: 8dda2a0 ("fixed hash_map_resize() - added Map/WeakMap in microbench")
fixup: 0a00011 ("Optimize {__proto__:null} object literal creation", quickjs-ng#1118)
fixup: 08db51a ("Add ref-counted string slices", quickjs-ng#1175)
skips building: qjs/qjsc cli, examples, tests, codegen
also removed -M during the test_fib.c codegen:

902cc2c ("Add native module support on Windows")
switched examples to dynamic import() instead of static import statement
and the lookup was deferred to runtime, thus we don't need to hint qjsc
this is a declared module and exclude it from bundling.
Fix unable to `import {fib} from './fib.so';` using qjs cli
@mochaaP
Copy link
Contributor Author

mochaaP commented Oct 14, 2025

last 2 commits require #1194

edit: dropped

libunicode.c Outdated
Comment on lines 32 to 36
#if __has_include(<codegen_libunicode-table.h>)
#include <codegen_libunicode-table.h>
#else
#include "libunicode-table.h"
#endif
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems unnecessary? The point of unicode_gen is to produce libunicode-table.h that then gets checked into git.

Us maintainers don't use meson so it's not necessary to have meson build any of it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the point of this is explained in #1187, some distributions may like to avoid pregenerated sources

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we could drop this change and keep it downstream, though.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say let's drop it please.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dropped

meson.build Outdated
examples = get_option('examples').disable_auto_if(meson.is_subproject())

if tests.allowed()
broken_test = disabler()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For my curiosity, what does that do / how does that work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if any target depends on a disabler, it will also become a disabler, which is a no-op

@mochaaP mochaaP force-pushed the mochaa-meson-update branch from 3c9f47a to f2aead8 Compare October 14, 2025 09:55
Copy link
Contributor

@bnoordhuis bnoordhuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a meson expert by any stretch but LGTM insofar I can judge that.

@saghul you want to take a look as well or should I go ahead and merge it?

Copy link
Contributor

@saghul saghul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with a question, does this PR depend on the qjsc changes?

$(QJSC) -e -o gen/hello.c examples/hello.js
$(QJSC) -e -o gen/hello_module.c -m examples/hello_module.js
$(QJSC) -e -o gen/test_fib.c -M examples/fib.so,fib -m examples/test_fib.js
$(QJSC) -e -o gen/test_fib.c -m examples/test_fib.js
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this change depend on the other PR changing qjsc?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@saghul saghul merged commit 2d680a9 into quickjs-ng:master Oct 16, 2025
254 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants