-
-
Notifications
You must be signed in to change notification settings - Fork 483
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bump janet version to 1.31.0 #2306
Conversation
Mmm, more build-related fun... Ok, I'm going through the logs and I see ultimately that:
via: https://github.com/nesbox/TIC-80/actions/runs/6223953191/job/16891060122?pr=2306#step:4:1692 Looking back earlier, I see:
via: https://github.com/nesbox/TIC-80/actions/runs/6223953191/job/16891060122?pr=2306#step:4:1535 All of the Windows builds seem to be affected in a similar manner -- I believe searching for "Interlocked" shows this. Found some info about "warning C4013". Here is some On first glance, this looks related to: janet-lang/janet@ffd79c6 Perhaps if we're lucky it might be a matter of just adding some header file info to some Janet source file like On a side note, I don't know how practical it is, but if we can somehow test changes that happen to Janet sooner with TIC-80, the context of the changes might be more fully in bakpakin's mind (and/or other folks' minds) so it might be easier to discuss TIC-80 build issues. Also, the sooner the detection, the less other folks will have had a chance to start relying on changes... |
Please ignore the following -- am investigating further. Leaving it for having a record.
@AlecTroemel Ok, I tried changing `state.c` a bit and attempted a local Windows build. That seems to have worked.
The change I made was: diff --git a/src/core/state.c b/src/core/state.c
index 4c976da..5f34b07 100644
--- a/src/core/state.c
+++ b/src/core/state.c
@@ -27,6 +27,10 @@
#include "util.h"
#endif
+#ifdef JANET_WINDOWS
+#include "windows.h"
+#endif
+
JANET_THREAD_LOCAL JanetVM janet_vm;
JanetVM *janet_local_vm(void) { I don't know if that's really an appropriate change (e.g. may be When you get a chance, would you mind updating the PR to see if the CI stuff works? Note that [1] I tried building janet 1.31.0 on Windows (outside of the context of TIC-80 and thus without the changes to |
@AlecTroemel Also, Janet's In summary, I believe I was able to build under Windows locally [1] with at least the following changes:
I'll give this another try from scratch and report back. Update: Unfortunately, it doesn't appear to be enough. It's odd because building Janet on its own in Windows is working here. Perhaps there is something different about invoking The following patch to Janet does seem to make things work though... diff --git a/src/core/state.c b/src/core/state.c
index 4c976da..b17fb9d 100644
--- a/src/core/state.c
+++ b/src/core/state.c
@@ -53,6 +53,10 @@ void janet_vm_load(JanetVM *from) {
janet_vm = *from;
}
+#ifdef JANET_WINDOWS
+#include "windows.h"
+#endif
+
/* Trigger suspension of the Janet vm by trying to
* exit the interpeter loop when convenient. You can optionally
* use NULL to interrupt the current VM when convenient */ [1] It was nice to have these notes. The footnote in that comment was handy too ;) |
@sogaiu i've updated the |
Thanks! |
this includes the work by @sogaiu to close issue #2285.
Full release changes:
https://github.com/janet-lang/janet/releases/tag/v1.31.0
https://github.com/janet-lang/janet/releases/tag/v1.30.0